Merge pull request #6636 from symless/v1-dev

v1.11.1

.cirrus.yml

@@ -1,63 +0,0 @@
-gcp_credentials: ENCRYPTED[d3110e2399b82e1d2adb6f9294917064a448a4d102c42c5023815723841db4ff7aa1d0df64a44281ed25b3adbeb08eff]
-
-windows_task:
-  gce_instance:
-    image_project: buildcluster-237411
-    image_name: windows2019-vs2017-ramdisk
-    platform: windows
-    zone: us-central1-a
-    type: n1-highcpu-16
-    disk: 32
-    use_ssd: true
-
-  env: 
-    BONJOUR_SDK_HOME: C:\Program Files\Bonjour SDK\
-    CMAKE_PREFIX_PATH: C:\Qt\5.9.5\msvc2017_64
-    CIRRUS_WORKING_DIR: D:\
-
-  build_script:
-    - .\CI\Windows\build.bat
-
-ubuntu1604_task:
-  use_compute_credits: true
-  container:
-    dockerfile: CI/ubuntu1604.Dockerfile
-  build_script: 
-    - pwd; ls -la
-    - chmod +x ./CI/build.sh
-    - ./CI/build.sh
-
-ubuntu1804_task:
-  use_compute_credits: true
-  container:
-    dockerfile: CI/ubuntu1804.Dockerfile
-  build_script: 
-    - pwd; ls -la
-    - chmod +x ./CI/build.sh
-    - ./CI/build.sh
-
-ubuntu1904_task:
-  use_compute_credits: true
-  container:
-    dockerfile: CI/ubuntu1904.Dockerfile
-  build_script: 
-    - pwd; ls -la
-    - chmod +x ./CI/build.sh
-    - ./CI/build.sh
-
-macos_task:
-    use_compute_credits: true
-    osx_instance:
-        image: mojave-xcode-10.2
-        
-    env:
-        PATH: /usr/local/opt/qt/bin:$PATH
-
-    install_script:
-        - brew install qt
-        - brew install openssl@1.1
-    build_script:
-        - mkdir build
-        - cd build
-        - cmake  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CONFIGURATION_TYPES=$CMAKE_BUILD_TYPE ..
-        - make

CI/ubuntu1604.Dockerfile

@@ -11,8 +11,9 @@ FROM ubuntu:16.04
 RUN \
   sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts && \
-  apt-get install -y debhelper devscripts
+  apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends && \
+  rm -rf /var/lib/apt/lists/*
   
 # Set environment variables.
 ENV HOME /root

CI/ubuntu1804.Dockerfile

@@ -11,8 +11,10 @@ FROM ubuntu:18.04
 RUN \
   sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts && \
-  apt-get install -y debhelper devscripts
+  apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends && \
+  rm -rf /var/lib/apt/lists/*
+
 
 # Set environment variables.
 ENV HOME /root

CI/ubuntu1904.Dockerfile

@@ -11,8 +11,9 @@ FROM ubuntu:19.04
 RUN \
   sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev && \
+  apt-get install -y git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts && \
-  apt-get install -y debhelper devscripts
+  apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends && \
+  rm -rf /var/lib/apt/lists/*
   
 # Set environment variables.
 ENV HOME /root

ChangeLog

@@ -1,3 +1,20 @@
+v1.11.1-stable
+===========
+
+Bug fixes:
+
+- #6622 Language files not updated during build
+- #6611 Mismatched TLS SHA fingerprint types
+- #6608 TLS certificate is not created on Windows
+- #6593 Non-ASCII characters replaced with ? on client
+- #4288 Using print screen key also sends alt key
+- #4 Quote chars broken on US-International keyboard
+
+Enhancements:
+
+- #6632 Support for building with LibreSSL
+- #6396 Black and white icons for macOS toolbar
+
 v1.11.0-stable
 ==============
 
@@ -18,7 +35,6 @@ Enhancements:
 Features:
 - #6518 Key combination that will force a server restart
 
-
 v1.10.3-stable
 ==============
 

azure-pipelines.yml

@@ -0,0 +1,210 @@
+trigger:
+- master
+
+jobs: 
+- job: LinuxRHEL
+  pool: 
+    vmImage: 'ubuntu-16.04'
+  strategy:
+    matrix:
+      centos7:
+        image: symless/centos-sudo:7
+
+  container: $[ variables['image'] ]
+
+  steps:
+  - script: |
+      sudo yum -y update
+      sudo yum -y install epel-release boost-static git libXtst-devel qt5-qtbase-devel qt5-qtdeclarative-devel libcurl-devel openssl-devel avahi-compat-libdns_sd-devel autoconf automake gcc gcc-c++ make rpm-build redhat-rpm-config rpm-sign qt5-qttools-devel
+      sudo yum -y install cmake3 #for some reason this needs to be seperate otherwise it wont install
+    displayName: 'Install Pakages'
+    
+  - script: |
+      mkdir build
+      cd build
+      cmake3 ..
+      make
+    displayName: 'Build'
+
+- job: LinuxDeb
+  pool: 
+    vmImage: 'ubuntu-16.04'
+  strategy:
+    matrix:
+      ubuntu16:
+        image: symless/ubuntu-sudo:16.04
+      ubuntu18:
+        image: symless/ubuntu-sudo:18.04
+      ubuntu19:
+        image: symless/ubuntu-sudo:19.04
+      debian9:
+        image: symless/debian-sudo:stretch
+
+  container: $[ variables['image'] ]
+
+  steps:
+  - script: |
+      sudo ln -snf /usr/share/zoneinfo/Europe/London /etc/localtime
+      sudo bash -c "echo 'Europe/London' > /etc/timezone"
+    displayName: 'Sort out timezones for updates'
+  - script: |
+      sudo DEBIAN_FRONTEND=noninteractive 
+      sudo apt-get -y update
+      sudo apt-get -y upgrade
+      sudo apt-get -y install git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts
+      sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies
+    displayName: 'Install Pakages'
+  - script: |
+      mkdir build
+      cd build
+      cmake ..
+      make
+    displayName: 'Build'
+
+- job: MacOS
+  strategy:
+    matrix:
+      sierra:
+        image: macOS-10.13
+      mojave:
+        image: macOS-10.14
+
+  pool: 
+    vmImage: $[ variables['image'] ]
+
+  variables:
+    QT_PATH: '/usr/local/opt/qt/bin'
+
+  steps:
+  - task: CmdLine@2
+    inputs:
+      script: 'brew install qt'
+    displayName: 'Installing QT'
+
+  - task: CmdLine@2
+    inputs:
+      script: |
+        export PATH="$(QT_PATH):$PATH"
+        mkdir build
+        cd build 
+        cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release ..
+    displayName: 'Cmake'
+
+  - task: CmdLine@2
+    inputs:
+      script: |
+        cd build
+        make
+    displayName: 'Compiling'
+
+- job: Windows
+  strategy:
+    matrix:
+      vs2019:
+        image: windows-2019
+
+  pool: 
+    vmImage: $[ variables['image'] ]
+
+  variables:
+    QT_VERSION: '5.12.6'
+    QLI_VERSION: '2019.05.26.1'
+    QLI_OUT_DIR: '.\deps\Qt'
+    QLI_BASE_URL: 'http://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/'
+    QT_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64'
+    QT_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017'
+    BONJOUR_SDK_DIR: 'deps\BonjourSDK'
+    ENV_BAT: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd'
+
+  steps:
+#As the official installer is rather 'slow' use an unofficial installer QLI
+  - task: PowerShell@2
+    inputs:
+      targetType: 'inline'
+      script: |
+        New-Item -Force -ItemType Directory -Path ".\deps\"
+        $client = new-object System.Net.WebClient
+        $client.DownloadFile("https://github.com/nelsonjchen/qli-installer/archive/v$(QLI_VERSION).zip","deps\qli.zip")
+    displayName: 'Downloading QLI v$(QLI_VERSION)'
+
+  - task: PowerShell@2
+    inputs:
+      targetType: 'inline'
+      script: |
+        New-Item -Force -ItemType Directory -Path ".\deps\"
+        $client = new-object System.Net.WebClient
+        $client.DownloadFile("https://binaries.symless.com/bonjour/BonjourSDK.zip",".\deps\bonjoursdk.zip")
+        $client.DownloadFile("https://binaries.symless.com/bonjour/Bonjour64.msi",".\deps\Bonjour64.msi")
+    displayName: 'Downloading Bonjour SKD'
+
+  - task: ExtractFiles@1
+    inputs:
+      archiveFilePatterns: './deps/*.zip'
+      destinationFolder: './deps/'
+      cleanDestinationFolder: false
+    displayName: 'Extracting zips'
+
+  - task: PowerShell@2
+    inputs:
+      targetType: 'inline'
+      script: 'pip install -r .\deps\qli-installer-$(QLI_VERSION)\requirements.txt'
+    displayName: 'Install QLI requirements'
+
+  - task: PowerShell@2
+    inputs:
+      targetType: 'inline'
+      script: |
+        Get-ChildItem '.\deps'
+        msiexec.exe /i ${pwd}\deps\Bonjour64.msi INSTALLDIR="${pwd}\deps\Bonjour" /qb
+    displayName: 'Installing bonjour SDK'
+
+  - task: PythonScript@0
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: '.\deps\qli-installer-$(QLI_VERSION)\qli-installer.py'
+      arguments: '$(QT_VERSION) windows desktop win64_msvc2017_64'
+    displayName: 'Installing QT $(QT_VERSION) x64'
+
+  - script: |
+      call "$(ENV_BAT)" -arch=x64
+      set BONJOUR_SDK_HOME=%cd%\$(BONJOUR_SDK_DIR)
+      mkdir build64
+      cd build64
+      cmake -G "Visual Studio 16 2019" -A x64 -V -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$(QT_PATH) ..
+    displayName: 'Cmake x64'
+
+  - task: MSBuild@1
+    inputs:
+      solution: 'build64/synergy-core.sln'
+      msbuildVersion: '16.0'
+      msbuildArchitecture: 'x64'
+      platform: 'x64'
+      configuration: 'Release'
+      msbuildArguments: '/m'
+      maximumCpuCount: true
+    displayName: 'Compiling x64'
+
+  - task: PythonScript@0
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: '.\deps\qli-installer-$(QLI_VERSION)\qli-installer.py'
+      arguments: '$(QT_VERSION) windows desktop win32_msvc2017'
+    displayName: 'Installing QT $(QT_VERSION) x32'
+
+  - script: |
+      call "$(ENV_BAT)" -arch=x86
+      set BONJOUR_SDK_HOME=%cd%\$(BONJOUR_SDK_DIR)
+      mkdir build32
+      cd build32
+      cmake -G "Visual Studio 16 2019" -A Win32 -V -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$(QT_PATH_32) ..
+    displayName: 'Cmake x86'
+  - task: MSBuild@1
+    inputs:
+      solution: 'build32/synergy-core.sln'
+      msbuildVersion: '16.0'
+      msbuildArchitecture: 'x86'
+      platform: 'Win32'
+      configuration: 'Release'
+      msbuildArguments: '/m'
+      maximumCpuCount: true
+    displayName: 'Compiling x86'

cmake/Version.cmake

@@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.4)
 
 set (SYNERGY_VERSION_MAJOR 1)
 set (SYNERGY_VERSION_MINOR 11)
-set (SYNERGY_VERSION_PATCH 0)
+set (SYNERGY_VERSION_PATCH 1)
 set (SYNERGY_VERSION_STAGE "stable")
 
 #

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /src/gui/res/lang/gui_en.ts
+    translation: /src/gui/res/lang/gui_%locale%.ts

src/gui/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.4)
 
-find_package (Qt5 COMPONENTS Core Widgets Network)
+find_package (Qt5 COMPONENTS Core Widgets Network LinguistTools)
 set (CMAKE_AUTOMOC ON)
 set (CMAKE_AUTORCC ON)
 set (CMAKE_AUTOUIC ON)
@@ -10,6 +10,14 @@ file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h)
 file (GLOB LEGACY_GUI_UI_FILES src/*.ui)
 file (GLOB LEGACY_ACTIVATION_FILES src/*Activation* src/*License*)
 file (GLOB LEGACY_ZEROCONF_FILES src/Zeroconf*)
+file (GLOB LEGACY_LANGUAGE_FILES res/lang/*.ts)
+
+qt5_add_translation(QM_FILES ${LEGACY_LANGUAGE_FILES})
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    file (GLOB LEGACY_GUI_MAC_SOURCE_FILES src/*.mm)
+    list (APPEND LEGACY_GUI_SOURCE_FILES ${LEGACY_GUI_MAC_SOURCE_FILES})
+endif()
 
 if (SYNERGY_ENTERPRISE)
     list (REMOVE_ITEM LEGACY_GUI_SOURCE_FILES ${LEGACY_ACTIVATION_FILES})
@@ -26,6 +34,7 @@ add_executable (synergy WIN32
     ${LEGACY_GUI_UI_FILES}
     ${LEGACY_GUI_RC_FILES}
     res/Synergy.qrc
+    ${QM_FILES}
 )
 
 include_directories (./src)

src/gui/gui.pro

@@ -118,6 +118,48 @@ HEADERS += src/MainWindow.h \
     ../lib/shared/EditionType.h \
     ../lib/shared/SerialKey.h \
     src/LicenseManager.h
+TRANSLATIONS = res/lang/gui_ar-SA.ts \
+    res/lang/gui_bg-BG.ts \
+    res/lang/gui_ca-ES.ts \
+    res/lang/gui_cs-CZ.ts \
+    res/lang/gui_cy-GB.ts \
+    res/lang/gui_da-DK.ts \
+    res/lang/gui_de-DE.ts \
+    res/lang/gui_el-GR.ts \
+    res/lang/gui_es-ES.ts \
+    res/lang/gui_et-EE.ts \
+    res/lang/gui_fi-FI.ts \
+    res/lang/gui_fr-FR.ts \
+    res/lang/gui_gl-ES.ts \
+    res/lang/gui_he-IL.ts \
+    res/lang/gui_hr-HR.ts \
+    res/lang/gui_hu-HU.ts \
+    res/lang/gui_id-ID.ts \
+    res/lang/gui_it-IT.ts \
+    res/lang/gui_ja-JP.ts \
+    res/lang/gui_ko-KR.ts \
+    res/lang/gui_lt-LT.ts \
+    res/lang/gui_lv-LV.ts \
+    res/lang/gui_mr-IN.ts \
+    res/lang/gui_nl-NL.ts \
+    res/lang/gui_no-NO.ts \
+    res/lang/gui_pl-PL.ts \
+    res/lang/gui_pt-BR.ts \
+    res/lang/gui_pt-PT.ts \
+    res/lang/gui_ro-RO.ts \
+    res/lang/gui_ru-RU.ts \
+    res/lang/gui_sk-SK.ts \
+    res/lang/gui_sl-SI.ts \
+    res/lang/gui_sq-AL.ts \
+    res/lang/gui_sr-SP.ts \
+    res/lang/gui_sv-SE.ts \
+    res/lang/gui_th-TH.ts \
+    res/lang/gui_tr-TR.ts \
+    res/lang/gui_uk-UA.ts \
+    res/lang/gui_ur-IN.ts \
+    res/lang/gui_vi-VN.ts \
+    res/lang/gui_zh-CN.ts \
+    res/lang/gui_zh-TW.ts
 RESOURCES += res/Synergy.qrc
 RC_FILE = res/win/Synergy.rc
 macx { 
@@ -127,6 +169,8 @@ macx {
     QSYNERGY_ICON.path = Contents/Resources
     QMAKE_BUNDLE_DATA += QSYNERGY_ICON
     LIBS += $$MACX_LIBS
+    HEADERS += src/OSXHelpers.h
+    SOURCES += src/OSXHelpers.mm
 }
 unix:!macx:LIBS += -ldns_sd
 debug { 

src/gui/res/Synergy.qrc

@@ -7,53 +7,16 @@
         <file>icons/16x16/warning.png</file>
         <file>icons/256x256/synergy.ico</file>
         <file>image/about.png</file>
-        <file>lang/gui_ar.qm</file>
-        <file>lang/gui_bg-BG.qm</file>
-        <file>lang/gui_ca-AD.qm</file>
-        <file>lang/gui_cs-CZ.qm</file>
-        <file>lang/gui_cy.qm</file>
-        <file>lang/gui_da.qm</file>
-        <file>lang/gui_de.qm</file>
-        <file>lang/gui_es.qm</file>
-        <file>lang/gui_fi.qm</file>
-        <file>lang/gui_fr.qm</file>
-        <file>lang/gui_grk.qm</file>
-        <file>lang/gui_he.qm</file>
-        <file>lang/gui_hr-HR.qm</file>
-        <file>lang/gui_hu-HU.qm</file>
-        <file>lang/gui_id.qm</file>
-        <file>lang/gui_it.qm</file>
-        <file>lang/gui_ja-JP.qm</file>
-        <file>lang/gui_ko.qm</file>
-        <file>lang/gui_lt.qm</file>
-        <file>lang/gui_lv.qm</file>
-        <file>lang/gui_nl-NL.qm</file>
-        <file>lang/gui_no.qm</file>
-        <file>lang/gui_pes-IR.qm</file>
-        <file>lang/gui_pl-PL.qm</file>
-        <file>lang/gui_pt-BR.qm</file>
-        <file>lang/gui_pt-PT.qm</file>
-        <file>lang/gui_ro.qm</file>
-        <file>lang/gui_ru.qm</file>
-        <file>lang/gui_si.qm</file>
-        <file>lang/gui_sk-SK.qm</file>
-        <file>lang/gui_sl-SI.qm</file>
-        <file>lang/gui_sq-AL.qm</file>
-        <file>lang/gui_sr.qm</file>
-        <file>lang/gui_sv.qm</file>
-        <file>lang/gui_th-TH.qm</file>
-        <file>lang/gui_tr-TR.qm</file>
-        <file>lang/gui_uk.qm</file>
-        <file>lang/gui_ur.qm</file>
-        <file>lang/gui_mr.qm</file>
-        <file>lang/gui_vi.qm</file>
-        <file>lang/gui_zh-CN.qm</file>
-        <file>lang/gui_zh-TW.qm</file>
         <file>lang/Languages.xml</file>
         <file>icons/16x16/money.png</file>
         <file>image/spinning-wheel.gif</file>
         <file>icons/16x16/padlock.png</file>
         <file>icons/16x16/synergy-transfering.png</file>
-        <file>icons/16x16/auto-config.png</file>
+        <file>icons/64x64/synergy-dark-transfering.png</file>
+        <file>icons/64x64/synergy-dark-disconnected.png</file>
+        <file>icons/64x64/synergy-dark-connected.png</file>
+        <file>icons/64x64/synergy-light-transfering.png</file>
+        <file>icons/64x64/synergy-light-disconnected.png</file>
+        <file>icons/64x64/synergy-light-connected.png</file>
     </qresource>
 </RCC>

src/gui/res/lang/Languages.xml

@@ -1,46 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
-<languages>
+<languages>
-  <language ietfCode="en" name="English" />
+  <language ietfCode="en" name="English" />
-	<language ietfCode="ca-AD" name="Català (Andorra)" />
+	<language ietfCode="ca-ES" name="Català (Andorra)" />
-	<language ietfCode="cs-CZ" name="Čeština" />
+	<language ietfCode="cs-CZ" name="Čeština" />
-	<language ietfCode="cy" name="Cymraeg" />
+	<language ietfCode="cy-GB" name="Cymraeg" />
-	<language ietfCode="da" name="Dansk" />
+	<language ietfCode="da-DK" name="Dansk" />
-	<language ietfCode="de" name="Deutsch" />
+	<language ietfCode="de-DE" name="Deutsch" />
-	<language ietfCode="es" name="Español" />
+	<language ietfCode="es-ES" name="Español" />
-	<language ietfCode="fr" name="Français" />
+	<language ietfCode="fr-FR" name="Français" />
-	<language ietfCode="hr-HR" name="Hrvatski" />
+	<language ietfCode="hr-HR" name="Hrvatski" />
-	<language ietfCode="id" name="Indonesia" />
+	<language ietfCode="id-ID" name="Indonesia" />
-	<language ietfCode="it" name="Italiano" />
+	<language ietfCode="it-IT" name="Italiano" />
-	<language ietfCode="lv" name="Latvijas" />
+	<language ietfCode="lv-LV" name="Latvijas" />
-	<language ietfCode="lt" name="Lietuvos" />
+	<language ietfCode="lt-LT" name="Lietuvos" />
-	<language ietfCode="hu-HU" name="Magyar" />
+	<language ietfCode="hu-HU" name="Magyar" />
-	<language ietfCode="nl-NL" name="Nederlands" />
+	<language ietfCode="nl-NL" name="Nederlands" />
-	<language ietfCode="no" name="Norsk" />
+	<language ietfCode="no-NO" name="Norsk" />
-	<language ietfCode="pl-PL" name="Polski" />
+	<language ietfCode="pl-PL" name="Polski" />
-	<language ietfCode="pt-PT" name="Português" />
+	<language ietfCode="pt-PT" name="Português" />
-	<language ietfCode="pt-BR" name="Português (Brasil)" />
+	<language ietfCode="pt-BR" name="Português (Brasil)" />
-	<language ietfCode="ro" name="Română" />
+	<language ietfCode="ro-RO" name="Română" />
-	<language ietfCode="sq-AL" name="Shqiptar" />
+	<language ietfCode="sq-AL" name="Shqiptar" />
-	<language ietfCode="sl-SI" name="Slovenščina" />
+	<language ietfCode="sl-SI" name="Slovenščina" />
-	<language ietfCode="sk-SK" name="Slovenčina" />
+	<language ietfCode="sk-SK" name="Slovenčina" />
-	<language ietfCode="fi" name="Suomi" />
+	<language ietfCode="fi-FI" name="Suomi" />
-	<language ietfCode="sv" name="Svenska" />
+	<language ietfCode="sv-SE" name="Svenska" />
-	<language ietfCode="vi" name="Tiếng Việt" />
+	<language ietfCode="vi-VN" name="Tiếng Việt" />
-	<language ietfCode="tr-TR" name="Türkçe" />
+	<language ietfCode="tr-TR" name="Türkçe" />
-	<language ietfCode="bg-BG" name="български" />
+	<language ietfCode="bg-BG" name="български" />
-	<language ietfCode="ru" name="Русский" />
+	<language ietfCode="ru-RU" name="Русский" />
-	<language ietfCode="sr" name="српски" />
+	<language ietfCode="sr-SP" name="српски" />
-	<language ietfCode="uk" name="Український" />
+	<language ietfCode="uk-UA" name="Український" />
-	<language ietfCode="grk" name="Ελληνικά" />
+	<language ietfCode="el-GR" name="Ελληνικά" />
-	<language ietfCode="he" name="עברית" />
+	<language ietfCode="he-IL" name="עברית" />
-	<language ietfCode="ar" name="العربية" />
+	<language ietfCode="ar-SA" name="العربية" />
-	<language ietfCode="pes-IR" name="فارسی" />
+	<language ietfCode="ur-IN" name="اردو" />
-	<language ietfCode="ur" name="اردو" />
+	<language ietfCode="th-TH" name="ภาษาไทย" />
-	<language ietfCode="mr" name="मराठी" />
+	<language ietfCode="zh-CN" name="中文 (简体)" />
-	<language ietfCode="si" name="Sඉන්හල" />
+	<language ietfCode="zh-TW" name="中文 (繁體)" />
-	<language ietfCode="th-TH" name="ภาษาไทย" />
+	<language ietfCode="ja-JP" name="日本語" />
-	<language ietfCode="zh-CN" name="中文 (简体)" />
+	<language ietfCode="ko-KR" name="한국어" />
-	<language ietfCode="zh-TW" name="中文 (繁體)" />
+</languages>
-	<language ietfCode="ja-JP" name="日本語" />
-	<language ietfCode="ko" name="한국어" />
-</languages>

src/gui/res/lang/gui_af-ZA.qm

@@ -1 +0,0 @@
-<ｸdﾊ<>箆!ｿ`｡ｽﾝ

src/gui/res/lang/gui_is-IS.qm

@@ -1 +0,0 @@
-<ｸdﾊ<>箆!ｿ`｡ｽﾝ