From 19731a8c7a1239ab090dc272ca7bec4b37bf2ad5 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Fri, 22 May 2020 17:34:19 +0800 Subject: [PATCH 01/11] Add Japanese translation for submenus. --- include/text_options_strings.h.in | 99 +++++++++++++++++-------------- 1 file changed, 55 insertions(+), 44 deletions(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 7580ec9e..8601e27f 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -5,12 +5,23 @@ // Menu title strings +/* +#if defined(VERSION_JP) || defined(VERSION_SH) +#define TEXT_OPT_OPTIONS _("オプション") +#define TEXT_OPT_CAMERA _("カメラ") +#define TEXT_OPT_CONTROLS _("コントロール") +#define TEXT_OPT_VIDEO _("ディスプレイ") +#define TEXT_OPT_AUDIO _("サウンド") +#define TEXT_OPT_CHEATS _("チート") +#else +*/ #define TEXT_OPT_OPTIONS _("OPTIONS") #define TEXT_OPT_CAMERA _("CAMERA") #define TEXT_OPT_CONTROLS _("CONTROLS") #define TEXT_OPT_VIDEO _("DISPLAY") #define TEXT_OPT_AUDIO _("SOUND") #define TEXT_OPT_CHEATS _("CHEATS") +//#endif // Markers @@ -29,53 +40,53 @@ // Option strings -#define TEXT_OPT_BUTTON1 _("Ｒ OPTIONS") -#define TEXT_OPT_BUTTON2 _("Ｒ RETURN") -#define TEXT_OPT_ENABLED _("ENABLED") -#define TEXT_OPT_DISABLED _("DISABLED") -#define TEXT_OPT_CAMX _("CAMERA X SENSITIVITY") -#define TEXT_OPT_CAMY _("CAMERA Y SENSITIVITY") -#define TEXT_OPT_INVERTX _("INVERT X AXIS") -#define TEXT_OPT_INVERTY _("INVERT Y AXIS") -#define TEXT_OPT_CAMC _("CAMERA CENTRE AGGRESSION") -#define TEXT_OPT_CAMP _("CAMERA PAN LEVEL") -#define TEXT_OPT_CAMD _("CAMERA DECELERATION") -#define TEXT_OPT_ANALOGUE _("ANALOGUE CAMERA") -#define TEXT_OPT_MOUSE _("MOUSE LOOK") -#define TEXT_OPT_TEXFILTER _("TEXTURE FILTERING") -#define TEXT_OPT_FSCREEN _("FULLSCREEN") -#define TEXT_OPT_NEAREST _("NEAREST") -#define TEXT_OPT_LINEAR _("LINEAR") -#define TEXT_OPT_MVOLUME _("MASTER VOLUME") -#define TEXT_OPT_VSYNC _("VERTICAL SYNC") -#define TEXT_OPT_DOUBLE _("DOUBLE") -#define TEXT_RESET_WINDOW _("RESET WINDOW") +#define TEXT_OPT_BUTTON1 _("Ｒ オプション") +#define TEXT_OPT_BUTTON2 _("Ｒ もどる") +#define TEXT_OPT_ENABLED _("オン") +#define TEXT_OPT_DISABLED _("オフ") +#define TEXT_OPT_CAMX _("Xカメラかんど") +#define TEXT_OPT_CAMY _("Yカメラかんど") +#define TEXT_OPT_INVERTX _("Xじくはんてん") +#define TEXT_OPT_INVERTY _("Yじくはんてん") +#define TEXT_OPT_CAMC _("カメラちゅうしんアグレッション") +#define TEXT_OPT_CAMP _("カメラパンレベル") +#define TEXT_OPT_CAMD _("カメラげんそくど") +#define TEXT_OPT_ANALOGUE _("アナログカメラ") +#define TEXT_OPT_MOUSE _("マウスしてんせいぎょ") +#define TEXT_OPT_TEXFILTER _("テクスチャフィルタリング") +#define TEXT_OPT_FSCREEN _("フルスクリーン") +#define TEXT_OPT_NEAREST _("さいきんてん") +#define TEXT_OPT_LINEAR _("リニア") +#define TEXT_OPT_MVOLUME _("マスターおんりょう") +#define TEXT_OPT_VSYNC _("すいちょくどうき") +#define TEXT_OPT_DOUBLE _("２ばいそく") +#define TEXT_RESET_WINDOW _("ウィンドウリセット") #define TEXT_OPT_HUD _("HUD") -#define TEXT_BIND_A _("A BUTTON") -#define TEXT_BIND_B _("B BUTTON") -#define TEXT_BIND_START _("START BUTTON") -#define TEXT_BIND_L _("L TRIGGER") -#define TEXT_BIND_R _("R TRIGGER") -#define TEXT_BIND_Z _("Z TRIGGER") -#define TEXT_BIND_C_UP _("C-UP") -#define TEXT_BIND_C_DOWN _("C-DOWN") -#define TEXT_BIND_C_LEFT _("C-LEFT") -#define TEXT_BIND_C_RIGHT _("C-RIGHT") -#define TEXT_BIND_UP _("STICK UP") -#define TEXT_BIND_DOWN _("STICK DOWN") -#define TEXT_BIND_LEFT _("STICK LEFT") -#define TEXT_BIND_RIGHT _("STICK RIGHT") +#define TEXT_BIND_A _("Aボタン") +#define TEXT_BIND_B _("Bボタン") +#define TEXT_BIND_START _("スタートボタン") +#define TEXT_BIND_L _("Lトリガー") +#define TEXT_BIND_R _("Rトリガー") +#define TEXT_BIND_Z _("Zトリガー") +#define TEXT_BIND_C_UP _("Cボタン うえ") +#define TEXT_BIND_C_DOWN _("Cボタン した") +#define TEXT_BIND_C_LEFT _("Cボタン ひだり") +#define TEXT_BIND_C_RIGHT _("Cボタン みぎ") +#define TEXT_BIND_UP _("アナログスティック うえ") +#define TEXT_BIND_DOWN _("アナログスティック した") +#define TEXT_BIND_LEFT _("アナログスティック ひだり") +#define TEXT_BIND_RIGHT _("アナログスティック みぎ") -#define TEXT_OPT_CHEAT1 _("ENABLE CHEATS") -#define TEXT_OPT_CHEAT2 _("MOONJUMP (PRESS L)") -#define TEXT_OPT_CHEAT3 _("INVINCIBLE MARIO") -#define TEXT_OPT_CHEAT4 _("INFINITE LIVES") -#define TEXT_OPT_CHEAT5 _("SUPER SPEED") -#define TEXT_OPT_CHEAT6 _("SUPER RESPONSIVE CONTROLS") -#define TEXT_OPT_CHEAT7 _("EXIT COURSE AT ANY TIME") -#define TEXT_OPT_CHEAT8 _("HUGE MARIO") -#define TEXT_OPT_CHEAT9 _("TINY MARIO") +#define TEXT_OPT_CHEAT1 _("チートゆうこう") +#define TEXT_OPT_CHEAT2 _("ムーンジャンプ (Lボタンで)") +#define TEXT_OPT_CHEAT3 _("むてき") +#define TEXT_OPT_CHEAT4 _("ライフむげん") +#define TEXT_OPT_CHEAT5 _("ちょうこうそくか") +#define TEXT_OPT_CHEAT6 _("ちょうこうかんどコントロール") +#define TEXT_OPT_CHEAT7 _("いつでもコースからでられる") +#define TEXT_OPT_CHEAT8 _("きょだいマリオ") +#define TEXT_OPT_CHEAT9 _("ミニマリオ") #else // VERSION From b6001e4acf79983364514af4caef62be6e2bda86 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Thu, 4 Jun 2020 08:45:14 +0800 Subject: [PATCH 02/11] Add Deadzone option. --- include/text_options_strings.h.in | 1 + 1 file changed, 1 insertion(+) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 8601e27f..12cd9b07 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -77,6 +77,7 @@ #define TEXT_BIND_DOWN _("アナログスティック した") #define TEXT_BIND_LEFT _("アナログスティック ひだり") #define TEXT_BIND_RIGHT _("アナログスティック みぎ") +#define TEXT_OPT_DEADZONE _("アナログスティック デッドゾーン") #define TEXT_OPT_CHEAT1 _("チートゆうこう") #define TEXT_OPT_CHEAT2 _("ムーンジャンプ (Lボタンで)") From 2108cbd804fba89d1a99d44dec8d32f0fda00078 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Thu, 4 Jun 2020 08:52:21 +0800 Subject: [PATCH 03/11] Reapply Japanese translation. --- include/text_options_strings.h.in | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 12cd9b07..eee91ef2 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -5,23 +5,12 @@ // Menu title strings -/* -#if defined(VERSION_JP) || defined(VERSION_SH) -#define TEXT_OPT_OPTIONS _("オプション") -#define TEXT_OPT_CAMERA _("カメラ") -#define TEXT_OPT_CONTROLS _("コントロール") -#define TEXT_OPT_VIDEO _("ディスプレイ") -#define TEXT_OPT_AUDIO _("サウンド") -#define TEXT_OPT_CHEATS _("チート") -#else -*/ #define TEXT_OPT_OPTIONS _("OPTIONS") #define TEXT_OPT_CAMERA _("CAMERA") #define TEXT_OPT_CONTROLS _("CONTROLS") #define TEXT_OPT_VIDEO _("DISPLAY") #define TEXT_OPT_AUDIO _("SOUND") #define TEXT_OPT_CHEATS _("CHEATS") -//#endif // Markers @@ -134,6 +123,7 @@ #define TEXT_BIND_DOWN _("Stick Down") #define TEXT_BIND_LEFT _("Stick Left") #define TEXT_BIND_RIGHT _("Stick Right") +#define TEXT_OPT_DEADZONE _("Stick Deadzone") #define TEXT_OPT_CHEAT1 _("Enable cheats") #define TEXT_OPT_CHEAT2 _("Moonjump (Press L)") From 03f1bcb4b003721779d57e538371ab973cde1698 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Fri, 5 Jun 2020 09:20:17 +0800 Subject: [PATCH 04/11] Add Rumble option translation. --- include/text_options_strings.h.in | 1 + 1 file changed, 1 insertion(+) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index eee91ef2..644996f0 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -67,6 +67,7 @@ #define TEXT_BIND_LEFT _("アナログスティック ひだり") #define TEXT_BIND_RIGHT _("アナログスティック みぎ") #define TEXT_OPT_DEADZONE _("アナログスティック デッドゾーン") +#define TEXT_OPT_RUMBLE _("しんどうのつよさ") #define TEXT_OPT_CHEAT1 _("チートゆうこう") #define TEXT_OPT_CHEAT2 _("ムーンジャンプ (Lボタンで)") From 42763a75f1e5d716988ce2f1737817223550ffbc Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Fri, 5 Jun 2020 10:33:15 +0800 Subject: [PATCH 05/11] Fix building. --- include/text_options_strings.h.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 95ad7ca4..82de5dd1 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -79,9 +79,6 @@ #define TEXT_OPT_CHEAT8 _("きょだいマリオ") #define TEXT_OPT_CHEAT9 _("ミニマリオ") -#else // VERSION - - #else // VERSION // Markers From 02a90166ff51b84cd5f9241ba580a06574eb17c5 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Mon, 22 Jun 2020 20:33:51 +0800 Subject: [PATCH 06/11] Apply for latest nightly. --- include/text_options_strings.h.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 82de5dd1..92079a50 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -49,8 +49,10 @@ #define TEXT_OPT_MVOLUME _("マスターおんりょう") #define TEXT_OPT_VSYNC _("すいちょくどうき") #define TEXT_OPT_DOUBLE _("２ばいそく") -#define TEXT_RESET_WINDOW _("ウィンドウリセット") #define TEXT_OPT_HUD _("HUD") +#define TEXT_OPT_THREEPT _("3ポイント") +#define TEXT_OPT_APPLY _("てきようする") +#define TEXT_OPT_RESETWND _("ウィンドウリセット") #define TEXT_BIND_A _("Aボタン") #define TEXT_BIND_B _("Bボタン") @@ -75,7 +77,7 @@ #define TEXT_OPT_CHEAT4 _("ライフむげん") #define TEXT_OPT_CHEAT5 _("ちょうこうそくか") #define TEXT_OPT_CHEAT6 _("ちょうこうかんどコントロール") -#define TEXT_OPT_CHEAT7 _("いつでもコースからでられる") +#define TEXT_OPT_CHEAT7 _("いつでもコースからでる") #define TEXT_OPT_CHEAT8 _("きょだいマリオ") #define TEXT_OPT_CHEAT9 _("ミニマリオ") From bdec9506f5be28fdf8b32be2282ecf4cbe3afe27 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Mon, 22 Jun 2020 20:44:11 +0800 Subject: [PATCH 07/11] More.. --- include/text_options_strings.h.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 92079a50..01d0544a 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -40,6 +40,7 @@ #define TEXT_OPT_CAMC _("カメラちゅうしんアグレッション") #define TEXT_OPT_CAMP _("カメラパンレベル") #define TEXT_OPT_CAMD _("カメラげんそくど") +#define TEXT_OPT_CAMON _("フリーカメラ") #define TEXT_OPT_ANALOGUE _("アナログカメラ") #define TEXT_OPT_MOUSE _("マウスしてんせいぎょ") #define TEXT_OPT_TEXFILTER _("テクスチャフィルタリング") @@ -47,6 +48,9 @@ #define TEXT_OPT_NEAREST _("さいきんてん") #define TEXT_OPT_LINEAR _("リニア") #define TEXT_OPT_MVOLUME _("マスターおんりょう") +#define TEXT_OPT_MUSVOLUME _("BGMおんりょう") +#define TEXT_OPT_SFXVOLUME _("SEおんりょう") +#define TEXT_OPT_ENVVOLUME _("かんきょうおんりょう") #define TEXT_OPT_VSYNC _("すいちょくどうき") #define TEXT_OPT_DOUBLE _("２ばいそく") #define TEXT_OPT_HUD _("HUD") @@ -61,7 +65,7 @@ #define TEXT_BIND_R _("Rトリガー") #define TEXT_BIND_Z _("Zトリガー") #define TEXT_BIND_C_UP _("Cボタン うえ") -#define TEXT_BIND_C_DOWN _("Cボタン した") +#define TEXT_BIND_C_DOWN _("ボタン した") #define TEXT_BIND_C_LEFT _("Cボタン ひだり") #define TEXT_BIND_C_RIGHT _("Cボタン みぎ") #define TEXT_BIND_UP _("アナログスティック うえ") @@ -74,7 +78,7 @@ #define TEXT_OPT_CHEAT1 _("チートゆうこう") #define TEXT_OPT_CHEAT2 _("ムーンジャンプ (Lボタンで)") #define TEXT_OPT_CHEAT3 _("むてき") -#define TEXT_OPT_CHEAT4 _("ライフむげん") +#define TEXT_OPT_CHEAT4 _("むげんライフ") #define TEXT_OPT_CHEAT5 _("ちょうこうそくか") #define TEXT_OPT_CHEAT6 _("ちょうこうかんどコントロール") #define TEXT_OPT_CHEAT7 _("いつでもコースからでる") From 4dbd6ffebf0aff557ab0c0ab17e51def7db68c9b Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Mon, 22 Jun 2020 20:49:29 +0800 Subject: [PATCH 08/11] Add new strings from nightly again. --- include/text_options_strings.h.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 01d0544a..73870d05 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -104,6 +104,7 @@ #define TEXT_OPT_CAMC _("Camera Centre Aggression") #define TEXT_OPT_CAMP _("Camera Pan Level") #define TEXT_OPT_CAMD _("Camera Deceleration") +#define TEXT_OPT_CAMON _("Free Camera") #define TEXT_OPT_ANALOGUE _("Analogue Camera") #define TEXT_OPT_MOUSE _("Mouse Look") #define TEXT_OPT_TEXFILTER _("Texture Filtering") @@ -111,10 +112,15 @@ #define TEXT_OPT_NEAREST _("Nearest") #define TEXT_OPT_LINEAR _("Linear") #define TEXT_OPT_MVOLUME _("Master Volume") +#define TEXT_OPT_MUSVOLUME _("Music Volume") +#define TEXT_OPT_SFXVOLUME _("Sfx Volume") +#define TEXT_OPT_ENVVOLUME _("Env Volume") #define TEXT_OPT_VSYNC _("Vertical Sync") #define TEXT_OPT_DOUBLE _("Double") -#define TEXT_RESET_WINDOW _("Reset Window") #define TEXT_OPT_HUD _("HUD") +#define TEXT_OPT_THREEPT _("Three-point") +#define TEXT_OPT_APPLY _("Apply") +#define TEXT_OPT_RESETWND _("Reset Window") #define TEXT_BIND_A _("A Button") #define TEXT_BIND_B _("B Button") From 9d917d199cf4c52a4faec8d06f7a1b27c3af60fd Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Mon, 22 Jun 2020 20:55:46 +0800 Subject: [PATCH 09/11] Fix half-width character 3. --- include/text_options_strings.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 73870d05..fe909874 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -54,7 +54,7 @@ #define TEXT_OPT_VSYNC _("すいちょくどうき") #define TEXT_OPT_DOUBLE _("２ばいそく") #define TEXT_OPT_HUD _("HUD") -#define TEXT_OPT_THREEPT _("3ポイント") +#define TEXT_OPT_THREEPT _("３ポイント") #define TEXT_OPT_APPLY _("てきようする") #define TEXT_OPT_RESETWND _("ウィンドウリセット") From 82a412a2cfd8bfd2f5a1182cb237168963922202 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Tue, 18 Aug 2020 14:25:15 +0800 Subject: [PATCH 10/11] Fix Japanese text again... --- include/text_options_strings.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index 1d069af9..cd3a6858 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -52,7 +52,7 @@ #define TEXT_OPT_SFXVOLUME _("SEおんりょう") #define TEXT_OPT_ENVVOLUME _("かんきょうおんりょう") #define TEXT_OPT_VSYNC _("すいちょくどうき") -#define TEXT_OPT_DOUBLE _("２ばいそく") +#define TEXT_OPT_AUTO _("オート") #define TEXT_OPT_HUD _("HUD") #define TEXT_OPT_THREEPT _("３ポイント") #define TEXT_OPT_APPLY _("てきようする") From ee9107c1a95090402c0830c5f9f90181289ff3c0 Mon Sep 17 00:00:00 2001 From: yksoft1 Date: Tue, 18 Aug 2020 14:51:03 +0800 Subject: [PATCH 11/11] Fix building again...... --- include/text_options_strings.h.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index cd3a6858..2f49f52c 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -116,4 +116,7 @@ #define TEXT_OPT_SFXVOLUME _("Sfx Volume") #define TEXT_OPT_ENVVOLUME _("Env Volume") #define TEXT_OPT_VSYNC _("Vertical Sync") + +#endif // VERSION + #endif // TEXT_OPTIONS_STRINGS_H