Merge remote-tracking branch 'origin/1.15' into 1.15

src/main/resources/assets/controlling/lang/ja_jp.json

@@ -0,0 +1,12 @@
+{
+  "options.search": "検索",
+  "options.showAll": "全てを表示",
+  "options.showConflicts": "競合を表示",
+  "options.showNone": "未割り当てを表示",
+  "options.availableKeys": "利用可能なキー",
+  "options.sort": "並べ替え",
+  "options.category": "カテゴリー",
+  "options.key": "キー",
+  "options.toggleFree": "トグルフリー",
+  "options.confirmReset": "クリックしてリセットを承諾します！"
+}

src/main/resources/assets/controlling/lang/zh_cn.json

@@ -1,10 +1,12 @@
 {
   "options.search": "搜索",
-  "options.showAll": "显示全部",
-  "options.showConflicts": "显示冲突部分",
-  "options.showNone": "显示未绑定部分",
+  "options.showAll": "显示所有键位",
+  "options.showConflicts": "显示冲突键位",
+  "options.showNone": "显示未绑定键位",
   "options.availableKeys": "可用的快捷键",
-  "options.sort": "种类",
-  "options.category": "范畴",
-  "options.key": "键"
-}
+  "options.sort": "排序",
+  "options.category": "搜索分类",
+  "options.key": "搜索键位",
+  "options.toggleFree": "自由切换",
+  "options.confirmReset": "点击确认重置！"
+}

src/main/resources/assets/controlling/lang/zh_tw.json

@@ -0,0 +1,12 @@
+{
+  "options.search": "搜尋",
+  "options.showAll": "顯示全部",
+  "options.showConflicts": "顯示衝突",
+  "options.showNone": "顯示未綁定",
+  "options.availableKeys": "可用按鍵",
+  "options.sort": "排序",
+  "options.category": "分類",
+  "options.key": "按鍵",
+  "options.toggleFree": "免切換",
+  "options.confirmReset": "按一下以確定重設！"
+}