Merge pull request #6653 from symless/v1-6622-build-translations
Fixed problems with translations
This commit is contained in:
Jnewbon
GitHub
commit
887158186a
6 changed files with 100 additions and 19 deletions
|
|
@ -26,19 +26,15 @@ jobs:
|
|||
make
|
||||
displayName: 'Build'
|
||||
|
||||
- job: LinuxDeb
|
||||
- job: LinuxDeb1
|
||||
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'] ]
|
||||
|
||||
|
|
@ -47,13 +43,15 @@ jobs:
|
|||
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 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
|
||||
|
|
@ -61,11 +59,50 @@ jobs:
|
|||
make
|
||||
displayName: 'Build'
|
||||
|
||||
- job: LinuxDeb2
|
||||
pool:
|
||||
vmImage: 'ubuntu-16.04'
|
||||
strategy:
|
||||
matrix:
|
||||
ubuntu16:
|
||||
image: symless/ubuntu-sudo:16.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 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: |
|
||||
sudo DEBIAN_FRONTEND=noninteractive
|
||||
sudo apt-get -y install wget
|
||||
wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh
|
||||
sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh
|
||||
sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license --prefix=/
|
||||
displayName: 'Installing CMake 3.14'
|
||||
|
||||
- script: |
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
make
|
||||
displayName: 'Build'
|
||||
|
||||
- job: MacOS
|
||||
strategy:
|
||||
matrix:
|
||||
sierra:
|
||||
image: macOS-10.13
|
||||
mojave:
|
||||
image: macOS-10.14
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ file (GLOB LEGACY_ACTIVATION_FILES src/*Activation* src/*License*)
|
|||
file (GLOB LEGACY_ZEROCONF_FILES src/Zeroconf*)
|
||||
file (GLOB LEGACY_LANGUAGE_FILES res/lang/*.ts)
|
||||
|
||||
configure_file(res/Languages.qrc res/Languages.qrc)
|
||||
|
||||
set_source_files_properties(${LEGACY_LANGUAGE_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/res/lang")
|
||||
|
||||
qt5_add_translation(QM_FILES ${LEGACY_LANGUAGE_FILES})
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
|
|
@ -34,6 +38,7 @@ add_executable (synergy WIN32
|
|||
${LEGACY_GUI_UI_FILES}
|
||||
${LEGACY_GUI_RC_FILES}
|
||||
res/Synergy.qrc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/res/Languages.qrc
|
||||
${QM_FILES}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
lupdate -noobsolete gui.pro -ts gui.ts
|
||||
lupdate -noobsolete gui.pro -ts gui.ts res/lang/*.ts
|
||||
46
src/gui/res/Languages.qrc
Normal file
46
src/gui/res/Languages.qrc
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
<RCC>
|
||||
<qresource prefix="/res">
|
||||
<file>lang/gui_ar-SA.qm</file>
|
||||
<file>lang/gui_lv-LV.qm</file>
|
||||
<file>lang/gui_bg-BG.qm</file>
|
||||
<file>lang/gui_mr-IN.qm</file>
|
||||
<file>lang/gui_ca-ES.qm</file>
|
||||
<file>lang/gui_nl-NL.qm</file>
|
||||
<file>lang/gui_cs-CZ.qm</file>
|
||||
<file>lang/gui_no-NO.qm</file>
|
||||
<file>lang/gui_cy-GB.qm</file>
|
||||
<file>lang/gui_pl-PL.qm</file>
|
||||
<file>lang/gui_da-DK.qm</file>
|
||||
<file>lang/gui_pt-BR.qm</file>
|
||||
<file>lang/gui_de-DE.qm</file>
|
||||
<file>lang/gui_pt-PT.qm</file>
|
||||
<file>lang/gui_el-GR.qm</file>
|
||||
<file>lang/gui_ro-RO.qm</file>
|
||||
<file>lang/gui_ru-RU.qm</file>
|
||||
<file>lang/gui_es-ES.qm</file>
|
||||
<file>lang/gui_sk-SK.qm</file>
|
||||
<file>lang/gui_et-EE.qm</file>
|
||||
<file>lang/gui_sl-SI.qm</file>
|
||||
<file>lang/gui_fi-FI.qm</file>
|
||||
<file>lang/gui_sq-AL.qm</file>
|
||||
<file>lang/gui_fr-FR.qm</file>
|
||||
<file>lang/gui_sr-SP.qm</file>
|
||||
<file>lang/gui_gl-ES.qm</file>
|
||||
<file>lang/gui_sv-SE.qm</file>
|
||||
<file>lang/gui_he-IL.qm</file>
|
||||
<file>lang/gui_th-TH.qm</file>
|
||||
<file>lang/gui_hr-HR.qm</file>
|
||||
<file>lang/gui_tr-TR.qm</file>
|
||||
<file>lang/gui_hu-HU.qm</file>
|
||||
<file>lang/gui_uk-UA.qm</file>
|
||||
<file>lang/gui_id-ID.qm</file>
|
||||
<file>lang/gui_ur-IN.qm</file>
|
||||
<file>lang/gui_it-IT.qm</file>
|
||||
<file>lang/gui_vi-VN.qm</file>
|
||||
<file>lang/gui_ja-JP.qm</file>
|
||||
<file>lang/gui_zh-CN.qm</file>
|
||||
<file>lang/gui_ko-KR.qm</file>
|
||||
<file>lang/gui_zh-TW.qm</file>
|
||||
<file>lang/gui_lt-LT.qm</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
@ -18,5 +18,6 @@
|
|||
<file>icons/64x64/synergy-light-transfering.png</file>
|
||||
<file>icons/64x64/synergy-light-disconnected.png</file>
|
||||
<file>icons/64x64/synergy-light-connected.png</file>
|
||||
<file>icons/16x16/auto-config.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
|
|
@ -156,11 +156,7 @@
|
|||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</span></p></body></html></string>
|
||||
<string>My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
|
@ -205,11 +201,7 @@ p, li { white-space: pre-wrap; }
|
|||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</span></p></body></html></string>
|
||||
<string>You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
|
|
|||
Loading…
Reference in a new issue