--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts	Tue Jul 24 19:31:37 2018 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts	Tue Jul 24 19:34:04 2018 +0200
@@ -2335,7 +2335,7 @@
     <name>QGroupBox</name>
     <message>
         <source>Team Members</source>
-        <translation>チーム　メンバーズ</translation>
+        <translation>チーム&#x3000;メンバーズ</translation>
     </message>
     <message>
         <source>Fort</source>
@@ -2884,7 +2884,7 @@
     </message>
     <message>
         <source>Start server</source>
-        <translation>サーバー　スタート</translation>
+        <translation>サーバー&#x3000;スタート</translation>
     </message>
     <message>
         <source>Connect</source>
@@ -3468,34 +3468,6 @@
 <context>
     <name>binds (keys)</name>
     <message>
-        <source>Axis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Up)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Down)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Left)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Right)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3780,7 +3752,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DPad</source>
+        <source>D-pad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Axis %1 %2</source>
+        <extracomment>Game controller axis direction. %1 = axis number, %2 = direction</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button %1</source>
+        <extracomment>Game controller button. %1 = button number</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D-pad %1 %2</source>
+        <extracomment>Game controller D-pad button. %1 = D-pad number, %2 = direction</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>