From a17f3168cc68574369f1b669fe1b4118e4843525 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 5 Apr 2018 04:46:00 +0200 Subject: fir Linux build --- cmake/opentrack-i18n.cmake | 5 +++- compat/tr.cpp | 2 +- proto-libevdev/*.hpp | 0 proto-libevdev/ftnoir_protocol_libevdev.cpp | 2 +- proto-libevdev/lang/nl_NL.ts | 22 +++++++++++++--- proto-libevdev/lang/ru_RU.ts | 22 +++++++++++++--- proto-libevdev/lang/stub.ts | 22 +++++++++++++--- proto-libevdev/lang/zh_CN.ts | 41 +++++++++++++++++++++++++++++ qxt-mini/lang/zh_CN.ts | 4 +++ 9 files changed, 105 insertions(+), 15 deletions(-) create mode 100644 proto-libevdev/*.hpp create mode 100644 proto-libevdev/lang/zh_CN.ts create mode 100644 qxt-mini/lang/zh_CN.ts diff --git a/cmake/opentrack-i18n.cmake b/cmake/opentrack-i18n.cmake index 64c86f8f..19589971 100644 --- a/cmake/opentrack-i18n.cmake +++ b/cmake/opentrack-i18n.cmake @@ -2,6 +2,7 @@ function(otr_i18n_for_target_directory n) set(k "opentrack-${n}") get_property(lupdate-binary TARGET "${Qt5_LUPDATE_EXECUTABLE}" PROPERTY IMPORTED_LOCATION) + set(target-names "") foreach(i ${opentrack_all-translations}) set(t "${CMAKE_CURRENT_SOURCE_DIR}/lang/${i}.ts") @@ -24,10 +25,12 @@ function(otr_i18n_for_target_directory n) COMMENT "Running lupdate for ${n}/${i}") set_property(SOURCE ${input} PROPERTY GENERATED TRUE) set(target-name "i18n-lang-${i}-module-${n}") - add_custom_target(${target-name} DEPENDS "${t2}" "${t}") + list(APPEND target-names "${target-name}") + add_custom_target(${target-name} DEPENDS "${t2}" "${t}" COMMENT "Translation strings for ${n}") set_property(GLOBAL APPEND PROPERTY "opentrack-ts-files-${i}" "${t2}") set_property(GLOBAL APPEND PROPERTY "opentrack-ts-module-${n}" "${target-name}") endforeach() + add_custom_target("i18n-module-${n}" DEPENDS ${target-names}) endfunction() function(otr_merge_translations) diff --git a/compat/tr.cpp b/compat/tr.cpp index b3349435..d9d811ed 100644 --- a/compat/tr.cpp +++ b/compat/tr.cpp @@ -10,7 +10,7 @@ TR&TR::operator=(const TR& other) if (this == &other) return *this; - TR::~TR(); + this->~TR(); return *new (this) TR; } diff --git a/proto-libevdev/*.hpp b/proto-libevdev/*.hpp new file mode 100644 index 00000000..e69de29b diff --git a/proto-libevdev/ftnoir_protocol_libevdev.cpp b/proto-libevdev/ftnoir_protocol_libevdev.cpp index 6bf9b511..4536204d 100644 --- a/proto-libevdev/ftnoir_protocol_libevdev.cpp +++ b/proto-libevdev/ftnoir_protocol_libevdev.cpp @@ -107,7 +107,7 @@ module_status evdev::initialize() { char buf[128] {}; (void) strerror_r(errno, buf, sizeof(buf)); - return error(_("Can't open /dev/uinput: %1").arg(buf)); + return error(tr("Can't open /dev/uinput: %1").arg(buf)); } return status_ok(); diff --git a/proto-libevdev/lang/nl_NL.ts b/proto-libevdev/lang/nl_NL.ts index 503c6938..90ed636a 100644 --- a/proto-libevdev/lang/nl_NL.ts +++ b/proto-libevdev/lang/nl_NL.ts @@ -4,24 +4,38 @@ UICLibevdevControls - VJoy - Make sure rw for /dev/input/uinput! - OK - Cancel + + evdev + + Virtual joystick for Linux + + + + Can't open /dev/uinput: %1 + + + + + evdevDll + + libevdev joystick receiver + + + diff --git a/proto-libevdev/lang/ru_RU.ts b/proto-libevdev/lang/ru_RU.ts index 9e78d930..cdf8920d 100644 --- a/proto-libevdev/lang/ru_RU.ts +++ b/proto-libevdev/lang/ru_RU.ts @@ -4,24 +4,38 @@ UICLibevdevControls - VJoy - Make sure rw for /dev/input/uinput! - OK - Cancel + + evdev + + Can't open /dev/uinput: %1 + + + + Virtual joystick for Linux + + + + + evdevDll + + libevdev joystick receiver + + + diff --git a/proto-libevdev/lang/stub.ts b/proto-libevdev/lang/stub.ts index ae9cf4cc..ae2e5c96 100644 --- a/proto-libevdev/lang/stub.ts +++ b/proto-libevdev/lang/stub.ts @@ -4,24 +4,38 @@ UICLibevdevControls - VJoy - Make sure rw for /dev/input/uinput! - OK - Cancel + + evdev + + Can't open /dev/uinput: %1 + + + + Virtual joystick for Linux + + + + + evdevDll + + libevdev joystick receiver + + + diff --git a/proto-libevdev/lang/zh_CN.ts b/proto-libevdev/lang/zh_CN.ts new file mode 100644 index 00000000..ae2e5c96 --- /dev/null +++ b/proto-libevdev/lang/zh_CN.ts @@ -0,0 +1,41 @@ + + + + + UICLibevdevControls + + VJoy + + + + Make sure rw for /dev/input/uinput! + + + + OK + + + + Cancel + + + + + evdev + + Can't open /dev/uinput: %1 + + + + Virtual joystick for Linux + + + + + evdevDll + + libevdev joystick receiver + + + + diff --git a/qxt-mini/lang/zh_CN.ts b/qxt-mini/lang/zh_CN.ts new file mode 100644 index 00000000..6401616d --- /dev/null +++ b/qxt-mini/lang/zh_CN.ts @@ -0,0 +1,4 @@ + + + + -- cgit v1.2.3