piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Mark wiimote extension strings for translation.

Browse Source 
Update French, Polish, and Korean languages thanks to Pascal, Baszta, and Siegfried, resp.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6849 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-01-14 18:25:25 +00:00
parent fb1ebd8022
commit 8ad402cdde
24 changed files with 3378 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp
View File

@ -49,7 +49,7 @@ static const u16 classic_dpad_bitmasks[] =
Classic::PAD_UP, Classic::PAD_DOWN, Classic::PAD_LEFT, Classic::PAD_RIGHT
};
Classic::Classic() : Attachment( "Classic" )
Classic::Classic() : Attachment( _trans("Classic") )
{
// buttons
groups.push_back( m_buttons = new Buttons( "Buttons" ) );

27
Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp
View File

@ -18,7 +18,8 @@ static const u16 drum_pad_bitmasks[] =
static const char* const drum_pad_names[] =
{
"Red","Yellow","Blue","Green","Orange","Bass"
_trans("Red"), _trans("Yellow"), _trans("Blue"),
_trans("Green"), _trans("Orange"), _trans("Bass")
};
static const u16 drum_button_bitmasks[] =
@ -27,24 +28,24 @@ static const u16 drum_button_bitmasks[] =
Drums::BUTTON_PLUS,
};
Drums::Drums() : Attachment( "Drums" )
Drums::Drums() : Attachment(_trans("Drums"))
{
// pads
groups.push_back( m_pads = new Buttons( "Pads" ) );
for ( unsigned int i = 0; i < sizeof(drum_pad_names)/sizeof(*drum_pad_names); ++i )
m_pads->controls.push_back( new ControlGroup::Input( drum_pad_names[i] ) );
groups.push_back(m_pads = new Buttons(_trans("Pads")));
for (unsigned int i = 0; i < sizeof(drum_pad_names)/sizeof(*drum_pad_names); ++i)
m_pads->controls.push_back(new ControlGroup::Input(drum_pad_names[i]));
// stick
groups.push_back( m_stick = new AnalogStick( "Stick" ) );
groups.push_back(m_stick = new AnalogStick("Stick"));
// buttons
groups.push_back( m_buttons = new Buttons( "Buttons" ) );
m_buttons->controls.push_back( new ControlGroup::Input("-") );
m_buttons->controls.push_back( new ControlGroup::Input("+") );
groups.push_back(m_buttons = new Buttons("Buttons"));
m_buttons->controls.push_back(new ControlGroup::Input("-"));
m_buttons->controls.push_back(new ControlGroup::Input("+"));
// set up register
// id
memcpy( &reg[0xfa], drums_id, sizeof(drums_id) );
memcpy(&reg[0xfa], drums_id, sizeof(drums_id));
}
void Drums::GetState(u8* const data, const bool focus)
@ -57,7 +58,7 @@ void Drums::GetState(u8* const data, const bool focus)
// stick
{
u8 x, y;
m_stick->GetState( &x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0 );
m_stick->GetState(&x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0);
ddata->sx = x;
ddata->sy = y;
@ -70,9 +71,9 @@ void Drums::GetState(u8* const data, const bool focus)
if (focus)
{
// buttons
m_buttons->GetState( &ddata->bt, drum_button_bitmasks );
m_buttons->GetState(&ddata->bt, drum_button_bitmasks);
// pads
m_pads->GetState( &ddata->bt, drum_pad_bitmasks );
m_pads->GetState(&ddata->bt, drum_pad_bitmasks);
}
// flip button bits

38
Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp
View File

@ -32,33 +32,33 @@ static const u16 guitar_strum_bitmasks[] =
Guitar::BAR_DOWN,
};
Guitar::Guitar() : Attachment( "Guitar" )
Guitar::Guitar() : Attachment(_trans("Guitar"))
{
// frets
groups.push_back( m_frets = new Buttons( "Frets" ) );
for ( unsigned int i = 0; i < sizeof(guitar_fret_names)/sizeof(*guitar_fret_names); ++i )
m_frets->controls.push_back( new ControlGroup::Input( guitar_fret_names[i] ) );
groups.push_back(m_frets = new Buttons(_trans("Frets")));
for (unsigned int i = 0; i < sizeof(guitar_fret_names)/sizeof(*guitar_fret_names); ++i)
m_frets->controls.push_back(new ControlGroup::Input(guitar_fret_names[i]));
// strum
groups.push_back( m_strum = new Buttons( "Strum" ) );
m_strum->controls.push_back( new ControlGroup::Input("Up") );
m_strum->controls.push_back( new ControlGroup::Input("Down") );
groups.push_back(m_strum = new Buttons(_trans("Strum")));
m_strum->controls.push_back(new ControlGroup::Input("Up"));
m_strum->controls.push_back(new ControlGroup::Input("Down"));
// buttons
groups.push_back( m_buttons = new Buttons( "Buttons" ) );
m_buttons->controls.push_back( new ControlGroup::Input("-") );
m_buttons->controls.push_back( new ControlGroup::Input("+") );
groups.push_back(m_buttons = new Buttons("Buttons"));
m_buttons->controls.push_back(new ControlGroup::Input("-"));
m_buttons->controls.push_back(new ControlGroup::Input("+"));
// stick
groups.push_back( m_stick = new AnalogStick( "Stick" ) );
groups.push_back(m_stick = new AnalogStick(_trans("Stick")));
// whammy
groups.push_back( m_whammy = new Triggers( "Whammy" ) );
m_whammy->controls.push_back( new ControlGroup::Input("Bar") );
groups.push_back(m_whammy = new Triggers(_trans("Whammy")));
m_whammy->controls.push_back(new ControlGroup::Input(_trans("Bar")));
// set up register
// id
memcpy( &reg[0xfa], guitar_id, sizeof(guitar_id) );
memcpy(&reg[0xfa], guitar_id, sizeof(guitar_id));
}
void Guitar::GetState(u8* const data, const bool focus)
@ -71,7 +71,7 @@ void Guitar::GetState(u8* const data, const bool focus)
// stick
{
u8 x, y;
m_stick->GetState( &x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0 );
m_stick->GetState(&x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0);
gdata->sx = x;
gdata->sy = y;
@ -82,17 +82,17 @@ void Guitar::GetState(u8* const data, const bool focus)
// whammy bar
u8 whammy;
m_whammy->GetState( &whammy, 0x1F );
m_whammy->GetState(&whammy, 0x1F);
gdata->whammy = whammy;
if (focus)
{
// buttons
m_buttons->GetState( &gdata->bt, guitar_button_bitmasks );
m_buttons->GetState(&gdata->bt, guitar_button_bitmasks);
// frets
m_frets->GetState( &gdata->bt, guitar_fret_bitmasks );
m_frets->GetState(&gdata->bt, guitar_fret_bitmasks);
// strum
m_strum->GetState( &gdata->bt, guitar_strum_bitmasks );
m_strum->GetState(&gdata->bt, guitar_strum_bitmasks);
}
// flip button bits

2
Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
View File

@ -27,7 +27,7 @@ static const u8 nunchuk_button_bitmasks[] =
Nunchuk::BUTTON_Z,
};
Nunchuk::Nunchuk(UDPWrapper *wrp) : Attachment("Nunchuk") , m_udpWrap(wrp)
Nunchuk::Nunchuk(UDPWrapper *wrp) : Attachment(_trans("Nunchuk")) , m_udpWrap(wrp)
{
// buttons
groups.push_back(m_buttons = new Buttons("Buttons"));

20
Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
View File

@ -21,31 +21,31 @@ static const u16 turntable_button_bitmasks[] =
static const char* const turntable_button_names[] =
{
"Green Left", "Red Left", "Blue Left",
"Green Right", "Red Right", "Blue Right",
"-", "+", "Euphoria",
_trans("Green Left"), _trans("Red Left"), _trans("Blue Left"),
_trans("Green Right"), _trans("Red Right"), _trans("Blue Right"),
"-", "+", _trans("Euphoria"),
};
Turntable::Turntable() : Attachment("Turntable")
Turntable::Turntable() : Attachment(_trans("Turntable"))
{
// buttons
groups.push_back(m_buttons = new Buttons("Buttons"));
for (unsigned int i = 0; i < sizeof(turntable_button_names)/sizeof(*turntable_button_names); ++i)
m_buttons->controls.push_back(new ControlGroup::Input( turntable_button_names[i]));
m_buttons->controls.push_back(new ControlGroup::Input(turntable_button_names[i]));
// turntables
groups.push_back(m_left_table = new Slider("Table Left"));
groups.push_back(m_right_table = new Slider("Table Right"));
groups.push_back(m_left_table = new Slider(_trans("Table Left")));
groups.push_back(m_right_table = new Slider(_trans("Table Right")));
// stick
groups.push_back(m_stick = new AnalogStick("Stick"));
// effect dial
groups.push_back(m_effect_dial = new Triggers("Effect"));
m_effect_dial->controls.push_back(new ControlGroup::Input("Dial"));
groups.push_back(m_effect_dial = new Triggers(_trans("Effect")));
m_effect_dial->controls.push_back(new ControlGroup::Input(_trans("Dial")));
// crossfade
groups.push_back(m_crossfade = new Slider("Crossfade"));
groups.push_back(m_crossfade = new Slider(_trans("Crossfade")));
// set up register
// id

26
Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -238,25 +238,25 @@ Wiimote::Wiimote( const unsigned int index )
m_buttons->controls.push_back(new ControlGroup::Input( named_buttons[i]));
// ir
groups.push_back(m_ir = new Cursor("IR"));
groups.push_back(m_ir = new Cursor(_trans("IR")));
// swing
groups.push_back(m_swing = new Force("Swing"));
groups.push_back(m_swing = new Force(_trans("Swing")));
// tilt
groups.push_back(m_tilt = new Tilt("Tilt"));
groups.push_back(m_tilt = new Tilt(_trans("Tilt")));
// udp
groups.push_back(m_udp = new UDPWrapper(m_index, "UDP Wiimote"));
groups.push_back(m_udp = new UDPWrapper(m_index, _trans("UDP Wiimote")));
// shake
groups.push_back(m_shake = new Buttons("Shake"));
groups.push_back(m_shake = new Buttons(_trans("Shake")));
m_shake->controls.push_back(new ControlGroup::Input("X"));
m_shake->controls.push_back(new ControlGroup::Input("Y"));
m_shake->controls.push_back(new ControlGroup::Input("Z"));
// extension
groups.push_back(m_extension = new Extension("Extension"));
groups.push_back(m_extension = new Extension(_trans("Extension")));
m_extension->attachments.push_back(new WiimoteEmu::None());
m_extension->attachments.push_back(new WiimoteEmu::Nunchuk(m_udp));
m_extension->attachments.push_back(new WiimoteEmu::Classic());
@ -264,11 +264,11 @@ Wiimote::Wiimote( const unsigned int index )
m_extension->attachments.push_back(new WiimoteEmu::Drums());
m_extension->attachments.push_back(new WiimoteEmu::Turntable());
m_extension->settings.push_back(new ControlGroup::Setting("Motion Plus", 0, 0, 1));
m_extension->settings.push_back(new ControlGroup::Setting(_trans("Motion Plus"), 0, 0, 1));
// rumble
groups.push_back(m_rumble = new ControlGroup("Rumble"));
m_rumble->controls.push_back(new ControlGroup::Output("Motor"));
groups.push_back(m_rumble = new ControlGroup(_trans("Rumble")));
m_rumble->controls.push_back(new ControlGroup::Output(_trans("Motor")));
// dpad
groups.push_back(m_dpad = new Buttons("D-Pad"));
@ -276,10 +276,10 @@ Wiimote::Wiimote( const unsigned int index )
m_dpad->controls.push_back(new ControlGroup::Input(named_directions[i]));
// options
groups.push_back( m_options = new ControlGroup("Options"));
m_options->settings.push_back(new ControlGroup::Setting("Background Input", false));
m_options->settings.push_back(new ControlGroup::Setting("Sideways Wiimote", false));
m_options->settings.push_back(new ControlGroup::Setting("Upright Wiimote", false));
groups.push_back( m_options = new ControlGroup(_trans("Options")));
m_options->settings.push_back(new ControlGroup::Setting(_trans("Background Input"), false));
m_options->settings.push_back(new ControlGroup::Setting(_trans("Sideways Wiimote"), false));
m_options->settings.push_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false));
#ifdef USE_WIIMOTE_EMU_SPEAKER
// set up speaker stuff

4
Source/Core/DolphinWX/Src/InputConfigDiag.cpp
View File

@ -71,7 +71,7 @@ PadSettingExtension::PadSettingExtension(wxWindow* const parent, ControllerEmu::
e = extension->attachments.end();
for (; i!=e; ++i)
((wxChoice*)wxcontrol)->Append(WXSTR_FROM_STR((*i)->GetName()));
((wxChoice*)wxcontrol)->Append(WXTSTR_FROM_CSTR((*i)->GetName().c_str()));
UpdateGUI();
}
@ -1015,8 +1015,6 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin
m_update_timer = new wxTimer(this, -1);
Connect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(InputConfigDialog::UpdateBitmaps), (wxObject*)0, this);
m_update_timer->Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS);
}
bool InputConfigDialog::Destroy()