Merge branch 'master' of https://github.com/probonopd/goldendict into Temp

.travis.yml

@@ -0,0 +1,44 @@
+language: cpp
+compiler: gcc
+sudo: require
+dist: trusty
+
+before_install:
+  # sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
+  - sudo apt-get update -qq
+
+install:
+  - |
+    sudo apt-get -y install git pkg-config build-essential qt5-qmake \
+    libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev \
+    qtdeclarative5-dev libqtwebkit-dev libxtst-dev liblzo2-dev libbz2-dev \
+    libao-dev libavutil-dev libavformat-dev libtiff5-dev libeb16-dev \
+    libqt5webkit5-dev libqt5svg5-dev libqt5x11extras5-dev qttools5-dev \
+    qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libopencc-dev liblzma-dev doxygen cmake
+  # source /opt/qt*/bin/qt*-env.sh
+
+script:
+  - git clone https://github.com/BYVoid/OpenCC
+  - cd OpenCC/
+  - make PREFIX=/usr -j$(nproc)
+  - sudo make install
+  - cd ..
+  - qmake CONFIG+=release PREFIX=/usr CONFIG+=old_hunspell CONFIG+=zim_support # CONFIG+=chinese_conversion_support
+  - make -j$(nproc)
+  - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
+  - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+  - chmod a+x linuxdeployqt-continuous-x86_64.AppImage
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file
+  - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage
+
+after_success:
+  - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+  - # curl --upload-file GoldenDict*.AppImage https://transfer.sh/GoldenDict-git.$(git rev-parse --short HEAD)-x86_64.AppImage
+  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - bash upload.sh GoldenDict*.AppImage*
+  
+branches:
+  except:
+    - # Do not build tags that we create when we upload to GitHub Releases
+    - /^(?i:continuous)/

redist/goldendict.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Categories=Office;Dictionary;Education;Qt
+Categories=Office;Dictionary;Education;Qt;
 Name=GoldenDict
 GenericName=Multiformat Dictionary
 Comment=GoldenDict