diff options
| -rw-r--r-- | cmake/opentrack-i18n.cmake | 5 | ||||
| -rw-r--r-- | compat/tr.cpp | 2 | ||||
| -rw-r--r-- | proto-libevdev/*.hpp | 0 | ||||
| -rw-r--r-- | proto-libevdev/ftnoir_protocol_libevdev.cpp | 2 | ||||
| -rw-r--r-- | proto-libevdev/lang/nl_NL.ts | 22 | ||||
| -rw-r--r-- | proto-libevdev/lang/ru_RU.ts | 22 | ||||
| -rw-r--r-- | proto-libevdev/lang/stub.ts | 22 | ||||
| -rw-r--r-- | proto-libevdev/lang/zh_CN.ts | 41 | ||||
| -rw-r--r-- | qxt-mini/lang/zh_CN.ts | 4 | 
9 files changed, 105 insertions, 15 deletions
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 --- /dev/null +++ b/proto-libevdev/*.hpp 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 @@  <context>      <name>UICLibevdevControls</name>      <message> -        <location filename="../ftnoir_libevdev_controls.ui" line="+17"/>          <source>VJoy</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+16"/>          <source>Make sure rw for /dev/input/uinput!</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+32"/>          <source>OK</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+25"/>          <source>Cancel</source>          <translation type="unfinished"></translation>      </message>  </context> +<context> +    <name>evdev</name> +    <message> +        <source>Virtual joystick for Linux</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <source>Can't open /dev/uinput: %1</source> +        <translation type="unfinished"></translation> +    </message> +</context> +<context> +    <name>evdevDll</name> +    <message> +        <source>libevdev joystick receiver</source> +        <translation type="unfinished"></translation> +    </message> +</context>  </TS> 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 @@  <context>      <name>UICLibevdevControls</name>      <message> -        <location filename="../ftnoir_libevdev_controls.ui" line="+17"/>          <source>VJoy</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+16"/>          <source>Make sure rw for /dev/input/uinput!</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+32"/>          <source>OK</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+25"/>          <source>Cancel</source>          <translation type="unfinished"></translation>      </message>  </context> +<context> +    <name>evdev</name> +    <message> +        <source>Can't open /dev/uinput: %1</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <source>Virtual joystick for Linux</source> +        <translation type="unfinished"></translation> +    </message> +</context> +<context> +    <name>evdevDll</name> +    <message> +        <source>libevdev joystick receiver</source> +        <translation type="unfinished"></translation> +    </message> +</context>  </TS> 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 @@  <context>      <name>UICLibevdevControls</name>      <message> -        <location filename="../ftnoir_libevdev_controls.ui" line="+17"/>          <source>VJoy</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+16"/>          <source>Make sure rw for /dev/input/uinput!</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+32"/>          <source>OK</source>          <translation type="unfinished"></translation>      </message>      <message> -        <location line="+25"/>          <source>Cancel</source>          <translation type="unfinished"></translation>      </message>  </context> +<context> +    <name>evdev</name> +    <message> +        <source>Can't open /dev/uinput: %1</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <source>Virtual joystick for Linux</source> +        <translation type="unfinished"></translation> +    </message> +</context> +<context> +    <name>evdevDll</name> +    <message> +        <source>libevdev joystick receiver</source> +        <translation type="unfinished"></translation> +    </message> +</context>  </TS> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +<context> +    <name>UICLibevdevControls</name> +    <message> +        <source>VJoy</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <source>Make sure rw for /dev/input/uinput!</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <source>OK</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <source>Cancel</source> +        <translation type="unfinished"></translation> +    </message> +</context> +<context> +    <name>evdev</name> +    <message> +        <source>Can't open /dev/uinput: %1</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <source>Virtual joystick for Linux</source> +        <translation type="unfinished"></translation> +    </message> +</context> +<context> +    <name>evdevDll</name> +    <message> +        <source>libevdev joystick receiver</source> +        <translation type="unfinished"></translation> +    </message> +</context> +</TS> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS>  | 
