4 files changed, 91 insertions, 4 deletions
diff --git a/tracker-linux-joystick/ftnoir_tracker_linux_joystick.cpp b/tracker-linux-joystick/ftnoir_tracker_linux_joystick.cpp
index 8fa600e7..54d9b059 100644
--- a/tracker-linux-joystick/ftnoir_tracker_linux_joystick.cpp
+++ b/tracker-linux-joystick/ftnoir_tracker_linux_joystick.cpp
@@ -78,8 +78,8 @@ void joystick::data(double *data)
             if (k < 0 || k >= 8)
                 data[i] = 0;
             else
-                data[i] = clamp(axes[k] * limits[i] / AXIS_MAX,
-                                -limits[i], limits[i]);
+                data[i] = std::clamp(axes[k] * limits[i] / AXIS_MAX,
+                                     -limits[i], limits[i]);
         }
     }
 }
diff --git a/tracker-linux-joystick/lang/de_DE.ts b/tracker-linux-joystick/lang/de_DE.ts
new file mode 100644
index 00000000..9f03ffe9
--- /dev/null
+++ b/tracker-linux-joystick/lang/de_DE.ts
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+<context>
+    <name>UILinuxJoystickControls</name>
+    <message>
+        <source>Tracker settings</source>
+        <translation>Tracker-Einstellungen</translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation>Gerät</translation>
+    </message>
+    <message>
+        <source>Mapping</source>
+        <translation>Abbildung</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Ausgeschaltet</translation>
+    </message>
+    <message>
+        <source>Joystick axis #1</source>
+        <translation>Joystick-Achse #1</translation>
+    </message>
+    <message>
+        <source>Joystick axis #2</source>
+        <translation>Joystick-Achse #2</translation>
+    </message>
+    <message>
+        <source>Joystick axis #3</source>
+        <translation>Joystick-Achse #3</translation>
+    </message>
+    <message>
+        <source>Joystick axis #4</source>
+        <translation>Joystick-Achse #4</translation>
+    </message>
+    <message>
+        <source>Joystick axis #5</source>
+        <translation>Joystick-Achse #5</translation>
+    </message>
+    <message>
+        <source>Joystick axis #6</source>
+        <translation>Joystick-Achse #6</translation>
+    </message>
+    <message>
+        <source>Joystick axis #7</source>
+        <translation>Joystick-Achse #7</translation>
+    </message>
+    <message>
+        <source>Joystick axis #8</source>
+        <translation>Joystick-Achse #8</translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <source>Z</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <source>Yaw</source>
+        <translation>Gieren</translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation>Nicken</translation>
+    </message>
+    <message>
+        <source>Roll</source>
+        <translation>Rollen</translation>
+    </message>
+</context>
+<context>
+    <name>joystickDll</name>
+    <message>
+        <source>Linux Joystick input</source>
+        <translation>Linux-Joystick-Eingabe</translation>
+    </message>
+</context>
+</TS>
diff --git a/tracker-linux-joystick/lang/zh_CN.ts b/tracker-linux-joystick/lang/zh_CN.ts
index 12dc1400..e7813c3a 100644
--- a/tracker-linux-joystick/lang/zh_CN.ts
+++ b/tracker-linux-joystick/lang/zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>UILinuxJoystickControls</name>
     <message>
diff --git a/tracker-linux-joystick/linux_joystick.cpp b/tracker-linux-joystick/linux_joystick.cpp
index 49718b52..2374451b 100644
--- a/tracker-linux-joystick/linux_joystick.cpp
+++ b/tracker-linux-joystick/linux_joystick.cpp
@@ -3,6 +3,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QVariant>
+#include <QRegularExpression>
 
 // Discovery is done by searching for devices in the sys file system.
 //
@@ -16,7 +17,7 @@ std::tuple<QString, QString> sysfsDeviceToJsDev(QFileInfo device) {
     QString symlink = device.symLinkTarget();
     QString js_dev = QString("/dev/input/%1").arg(device.fileName());
 
-    QRegExp sep(QString("[:.%1]").arg(QDir::separator()));
+    QRegularExpression sep(QString("[:.%1]").arg(QDir::separator()));
     QString device_id = symlink.section(sep, -6, -5);
     return ret(js_dev, device_id);
 }