From d0f05291e7eee2c58f9beaa85e4f8933965773f2 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 6 Aug 2013 23:48:52 -0400 Subject: [PATCH 001/267] Add wiimote support to netplay. --- .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 11 +- .../Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h | 1 + .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 1 - .../Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 2 - Source/Core/Core/Src/NetPlayClient.cpp | 189 +++++++++++++----- Source/Core/Core/Src/NetPlayClient.h | 5 +- Source/Core/Core/Src/NetPlayProto.h | 11 +- Source/Core/Core/Src/NetPlayServer.cpp | 125 +++++++++++- Source/Core/Core/Src/NetPlayServer.h | 5 + Source/Core/DolphinWX/Src/NetWindow.cpp | 38 +++- Source/Core/DolphinWX/Src/NetWindow.h | 5 +- 11 files changed, 317 insertions(+), 76 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index eb5ebc2be5..94e7d88cd6 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -27,6 +27,7 @@ inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } #include "MatrixMath.h" #include "../../Movie.h" +#include "NetPlayClient.h" namespace { @@ -339,7 +340,7 @@ bool Wiimote::Step() m_rumble->controls[0]->control_ref->State(m_rumble_on); // when a movie is active, this button status update is disabled (moved), because movies only record data reports. - if(!(Movie::IsPlayingInput() || Movie::IsRecordingInput())) + if(!(Movie::IsPlayingInput() || Movie::IsRecordingInput()) || NetPlay::IsNetPlayRunning()) { UpdateButtonsStatus(has_focus); } @@ -397,7 +398,7 @@ void Wiimote::UpdateButtonsStatus(bool has_focus) void Wiimote::GetCoreData(u8* const data) { // when a movie is active, the button update happens here instead of Wiimote::Step, to avoid potential desync issues. - if(Movie::IsPlayingInput() || Movie::IsRecordingInput()) + if(Movie::IsPlayingInput() || Movie::IsRecordingInput() || NetPlay::IsNetPlayRunning()) { UpdateButtonsStatus(HAS_FOCUS); } @@ -770,6 +771,12 @@ void Wiimote::Update() } } } + if (NetPlay::IsNetPlayRunning()) + { + NetPlay_GetWiimoteData(m_index, data, rptf.size); + if (rptf.core) + m_status.buttons = *(wm_core*)(data + rptf.core); + } if (!Movie::IsPlayingInput()) { Movie::CheckWiimoteStatus(m_index, data, rptf, m_reg_ir.mode); diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h index 2fd471978e..9ed58f8b48 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h @@ -158,6 +158,7 @@ private: void WriteData(const wm_write_data* const wd); void SendReadDataReply(ReadRequest& _request); void SpeakerData(wm_speaker_data* sd); + bool NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size); // control groups Buttons *m_buttons, *m_dpad, *m_shake; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 9bef545257..a2d5768039 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -494,7 +494,6 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() for (unsigned int i = 0; i < m_WiiMotes.size(); i++) if (m_WiiMotes[i].IsConnected()) { - NetPlay_WiimoteUpdate(i); Wiimote::Update(i); } m_last_ticks = now; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 9386682106..4adec84469 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -862,8 +862,6 @@ void CWII_IPC_HLE_WiiMote::SendCommandToACL(u8 _Ident, u8 _Code, u8 _CommandLeng void CWII_IPC_HLE_WiiMote::ReceiveL2capData(u16 scid, const void* _pData, u32 _Size) { - if (NetPlay_WiimoteInput(m_ConnectionHandle & 0xFF, scid, _pData, _Size)) - return; // Allocate DataFrame u8 DataFrame[1024]; diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index e10cc25186..cefb0ebe16 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -16,6 +16,7 @@ // for wiimote/ OSD messages #include "Core.h" #include "ConfigManager.h" +#include "HW/WiimoteEmu/WiimoteEmu.h" std::mutex crit_netplay_client; static NetPlayClient * netplay_client = NULL; @@ -26,6 +27,7 @@ NetSettings g_NetPlaySettings; NetPlayClient::Player::Player() { memset(pad_map, -1, sizeof(pad_map)); + memset(wiimote_map, -1, sizeof(wiimote_map)); } // called from ---GUI--- thread @@ -35,6 +37,8 @@ std::string NetPlayClient::Player::ToString() const ss << name << '[' << (char)(pid+'0') << "] : " << revision << " |"; for (unsigned int i=0; i<4; ++i) ss << (pad_map[i]>=0 ? (char)(pad_map[i]+'1') : '-'); + for (unsigned int i=0; i<4; ++i) + ss << (wiimote_map[i]>=0 ? (char)(wiimote_map[i]+'1') : '-'); ss << " | " << ping << "ms"; return ss.str(); } @@ -215,6 +219,23 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) } break; + case NP_MSG_WIIMOTE_MAPPING : + { + PlayerId pid; + packet >> pid; + + { + std::lock_guard lkp(m_crit.players); + Player& player = m_players[pid]; + + for (unsigned int i=0; i<4; ++i) + packet >> player.wiimote_map[i]; + } + + m_dialog->Update(); + } + break; + case NP_MSG_PAD_DATA : { PadMapping map = 0; @@ -227,6 +248,27 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) } break; + case NP_MSG_WIIMOTE_DATA : + { + PadMapping map = 0; + NetWiimote nw; + u8 size; + packet >> map >> size; + + nw.size = size; + u8* data = new u8[size]; + for (unsigned int i = 0; i < size; ++i) + packet >> data[i]; + nw.data.assign(data,data+size); + delete[] data; + + // trusting server for good map value (>=0 && <4) + // add to pad buffer + m_wiimote_buffer[(unsigned)map].Push(nw); + } + break; + + case NP_MSG_PAD_BUFFER : { u32 size = 0; @@ -392,11 +434,34 @@ void NetPlayClient::SendPadState(const PadMapping local_nb, const NetPad& np) m_socket.Send(spac); } +// called from ---CPU--- thread +void NetPlayClient::SendWiimoteState(const PadMapping local_nb, const NetWiimote& nw) +{ + // send to server + sf::Packet spac; + spac << (MessageId)NP_MSG_WIIMOTE_DATA; + spac << local_nb; // local pad num + u8 size = nw.size; + spac << size; + for (unsigned int i = 0; i < size; ++i) + spac << nw.data.data()[i]; + + std::lock_guard lks(m_crit.send); + m_socket.Send(spac); +} + // called from ---GUI--- thread bool NetPlayClient::StartGame(const std::string &path) { std::lock_guard lkg(m_crit.game); + //wtf? + if (m_target_buffer_size > 100) + { + m_target_buffer_size = 20; + NOTICE_LOG(NETPLAY,"WHYYYYYYYYYYYY"); + } + // tell server i started the game sf::Packet spac; spac << (MessageId)NP_MSG_START_GAME; @@ -423,10 +488,10 @@ bool NetPlayClient::StartGame(const std::string &path) m_dialog->BootGame(path); // temporary - NetWiimote nw; - for (unsigned int i = 0; i<4; ++i) - for (unsigned int f = 0; f<2; ++f) - m_wiimote_buffer[i].Push(nw); + //NetWiimote nw; + //for (unsigned int i = 0; i<4; ++i) + //for (unsigned int f = 0; f<2; ++f) + //m_wiimote_buffer[i].Push(nw); return true; } @@ -449,7 +514,7 @@ void NetPlayClient::ClearBuffers() while (m_wiimote_buffer[i].Size()) m_wiimote_buffer[i].Pop(); - m_wiimote_input[i].clear(); + m_wiimote_input[i].data.clear(); } } @@ -509,55 +574,77 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat return true; } -// called from ---CPU--- thread -void NetPlayClient::WiimoteInput(int _number, u16 _channelID, const void* _pData, u32 _Size) -{ - //// in game mapping for this local wiimote - unsigned int in_game_num = m_local_player->pad_map[_number]; // just using gc pad_map for now - - // does this local pad map in game? - if (in_game_num < 4) - { - m_wiimote_input[_number].resize(m_wiimote_input[_number].size() + 1); - m_wiimote_input[_number].back().assign((char*)_pData, (char*)_pData + _Size); - m_wiimote_input[_number].back().channel = _channelID; - } -} // called from ---CPU--- thread -void NetPlayClient::WiimoteUpdate(int _number) +bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) { { std::lock_guard lkp(m_crit.players); // in game mapping for this local wiimote - unsigned int in_game_num = m_local_player->pad_map[_number]; // just using gc pad_map for now + unsigned int in_game_num = m_local_player->wiimote_map[_number]; // does this local pad map in game? if (in_game_num < 4) { - m_wiimote_buffer[in_game_num].Push(m_wiimote_input[_number]); + static u8 previousSize = 0; - // TODO: send it + if (previousSize != size && m_wiimote_buffer[in_game_num].Size() > 0) + { + // Reporting mode changed, so previous buffer is no good. + m_wiimote_buffer[_number].Clear(); + } + + //m_wiimote_input[in_game_num].data.resize(m_wiimote_input[_number].size + 1); + m_wiimote_input[in_game_num].data.assign(data, data + size); + m_wiimote_input[in_game_num].size = size; + while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size) + { + // add to buffer + m_wiimote_buffer[in_game_num].Push(m_wiimote_input[in_game_num]); - m_wiimote_input[_number].clear(); + // send + SendWiimoteState(_number, m_wiimote_input[_number]); + } + previousSize = size; } } // unlock players - if (0 == m_wiimote_buffer[_number].Size()) + NetWiimote nw; + while (!m_wiimote_buffer[_number].Pop(nw)) { - //PanicAlert("PANIC"); - return; + // wait for receiving thread to push some data + Common::SleepCurrentThread(1); + if (false == m_is_running) + return false; } - NetWiimote nw; - m_wiimote_buffer[_number].Pop(nw); + // This is either a desync, or the reporting mode changed. No way to really be sure... + if (size != nw.size) + { + // Clear the buffer and wait for new input, in case it was just the reporting mode changing as expected. + do + { + m_wiimote_buffer[_number].Pop(nw); + Common::SleepCurrentThread(1); + if (false == m_is_running) + return false; - NetWiimote::const_iterator - i = nw.begin(), e = nw.end(); - for ( ; i!=e; ++i) - Core::Callback_WiimoteInterruptChannel(_number, i->channel, &(*i)[0], (u32)i->size() + RPT_SIZE_HACK); + // TODO: break if this runs too long; it probably desynced if it runs for longer than the buffer size + } while (nw.size != size); + + // If it still mismatches, it surely desynced + if (size != nw.size) + { + PanicAlert("Netplay has desynced. There is no way to handle this. Self destructing in 3...2...1..."); + StopGame(); + return false; + } + } + + memcpy(data, nw.data.data(), size); + return true; } // called from ---GUI--- thread and ---NETPLAY--- thread (client side) @@ -586,12 +673,9 @@ bool NetPlayClient::StopGame() u8 NetPlayClient::GetPadNum(u8 numPAD) { // TODO: i don't like that this loop is running everytime there is rumble - unsigned int i = 0; - for (; i<4; ++i) + for (unsigned int i = 0; i<4; ++i) if (numPAD == m_local_player->pad_map[i]) - break; - - return i; + return i; } // stuff hacked into dolphin @@ -608,6 +692,16 @@ bool CSIDevice_GCController::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u return false; } +bool WiimoteEmu::Wiimote::NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size) +{ + std::lock_guard lk(crit_netplay_client); + + if (netplay_client) + return netplay_client->WiimoteUpdate(wiimote, data, size); + else + return false; +} + bool CSIDevice_GCSteeringWheel::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u32 *PADStatus) { return CSIDevice_GCController::NetPlay_GetInput(numPAD, PadStatus, PADStatus); @@ -652,26 +746,15 @@ u8 CSIDevice_DanceMat::NetPlay_GetPadNum(u8 numPAD) return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); } -// called from ---CPU--- thread -// wiimote update / used for frame counting -//void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number) -void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int) -{ - //CritLocker crit(crit_netplay_client); - - //if (netplay_client) - // netplay_client->WiimoteUpdate(_number); -} - // called from ---CPU--- thread // int CWII_IPC_HLE_WiiMote::NetPlay_GetWiimoteNum(int _number) { - //CritLocker crit(crit_netplay_client); +// std::lock_guard lk(crit_netplay_client); - //if (netplay_client) - // return netplay_client->GetPadNum(_number); // just using gcpad mapping for now - //else +// if (netplay_client) +// return netplay_client->GetPadNum(_number+4); +// else return _number; } diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index d44a4c84b8..625c20b951 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -68,8 +68,7 @@ public: void SendChatMessage(const std::string& msg); // Send and receive pads values - void WiimoteInput(int _number, u16 _channelID, const void* _pData, u32 _Size); - void WiimoteUpdate(int _number); + bool WiimoteUpdate(int _number, u8* data, u8 size); bool GetNetPads(const u8 pad_nb, const SPADStatus* const, NetPad* const netvalues); u8 GetPadNum(u8 numPAD); @@ -93,6 +92,7 @@ protected: PlayerId pid; std::string name; PadMapping pad_map[4]; + PadMapping wiimote_map[4]; std::string revision; u32 ping; }; @@ -119,6 +119,7 @@ protected: private: void SendPadState(const PadMapping local_nb, const NetPad& np); + void SendWiimoteState(const PadMapping local_nb, const NetWiimote& nw); unsigned int OnData(sf::Packet& packet); PlayerId m_pid; diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h index 84e2b420fd..b1c4c481d9 100644 --- a/Source/Core/Core/Src/NetPlayProto.h +++ b/Source/Core/Core/Src/NetPlayProto.h @@ -16,14 +16,13 @@ struct NetSettings u8 m_Controllers[4]; }; -struct Rpt : public std::vector +struct NetWiimote { - u16 channel; + u8 size; + std::vector data; }; -typedef std::vector NetWiimote; - -#define NETPLAY_VERSION "Dolphin NetPlay 2013-08-05" +#define NETPLAY_VERSION "Dolphin NetPlay 2013-08-06 now with wiimote(TM)" // messages enum @@ -38,7 +37,7 @@ enum NP_MSG_PAD_BUFFER = 0x62, NP_MSG_WIIMOTE_DATA = 0x70, - NP_MSG_WIIMOTE_MAPPING = 0x71, // just using pad mapping for now + NP_MSG_WIIMOTE_MAPPING = 0x71, NP_MSG_START_GAME = 0xA0, NP_MSG_CHANGE_GAME = 0xA1, diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 505e6a8f76..5eb5288c15 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -7,6 +7,7 @@ NetPlayServer::Client::Client() { memset(pad_map, -1, sizeof(pad_map)); + memset(wiimote_map, -1, sizeof(wiimote_map)); } // called from ---GUI--- thread @@ -16,6 +17,8 @@ std::string NetPlayServer::Client::ToString() const ss << name << '[' << (char)(pid+'0') << "] : " << revision << " |"; for (unsigned int i=0; i<4; ++i) ss << (pad_map[i]>=0 ? (char)(pad_map[i]+'1') : '-'); + for (unsigned int i=0; i<4; ++i) + ss << (wiimote_map[i]>=0 ? (char)(wiimote_map[i]+'1') : '-'); ss << '|'; return ss.str(); } @@ -311,6 +314,27 @@ bool NetPlayServer::GetPadMapping(const int pid, int map[]) return true; } +bool NetPlayServer::GetWiimoteMapping(const int pid, int map[]) +{ + std::lock_guard lkp(m_crit.players); + std::map::const_iterator + i = m_players.begin(), + e = m_players.end(); + for (; i!=e; ++i) + if (pid == i->second.pid) + break; + + // player not found + if (i == e) + return false; + + // get pad mapping + for (unsigned int m = 0; m<4; ++m) + map[m] = i->second.wiimote_map[m]; + + return true; +} + // called from ---GUI--- thread bool NetPlayServer::SetPadMapping(const int pid, const int map[]) { @@ -351,6 +375,46 @@ bool NetPlayServer::SetPadMapping(const int pid, const int map[]) return true; } +// called from ---GUI--- thread +bool NetPlayServer::SetWiimoteMapping(const int pid, const int map[]) +{ + std::lock_guard lkg(m_crit.game); + if (m_is_running) + return false; + + std::lock_guard lkp(m_crit.players); + std::map::iterator + i = m_players.begin(), + e = m_players.end(); + for (; i!=e; ++i) + if (pid == i->second.pid) + break; + + // player not found + if (i == e) + return false; + + Client& player = i->second; + + // set pad mapping + for (unsigned int m = 0; m<4; ++m) + { + player.wiimote_map[m] = (PadMapping)map[m]; + + // remove duplicate mappings + for (i = m_players.begin(); i!=e; ++i) + for (unsigned int p = 0; p<4; ++p) + if (p != m || i->second.pid != pid) + if (player.wiimote_map[m] == i->second.wiimote_map[p]) + i->second.wiimote_map[p] = -1; + } + + std::lock_guard lks(m_crit.send); + UpdateWiimoteMapping(); // sync pad mappings with everyone + + return true; +} + // called from ---NETPLAY--- thread void NetPlayServer::UpdatePadMapping() { @@ -369,6 +433,24 @@ void NetPlayServer::UpdatePadMapping() } +// called from ---NETPLAY--- thread +void NetPlayServer::UpdateWiimoteMapping() +{ + std::map::const_iterator + i = m_players.begin(), + e = m_players.end(); + for (; i!=e; ++i) + { + sf::Packet spac; + spac << (MessageId)NP_MSG_WIIMOTE_MAPPING; + spac << i->second.pid; + for (unsigned int pm = 0; pm<4; ++pm) + spac << i->second.wiimote_map[pm]; + SendToClients(spac); + } + +} + // called from ---GUI--- thread and ---NETPLAY--- thread void NetPlayServer::AdjustPadBufferSize(unsigned int size) { @@ -431,12 +513,12 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) map = player.pad_map[(unsigned)map]; else map = -1; - + // if not, they are hacking, so disconnect them // this could happen right after a pad map change, but that isn't implemented yet if (map < 0) return 1; - + // relay to clients sf::Packet spac; @@ -449,6 +531,45 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) } break; + case NP_MSG_WIIMOTE_DATA : + { + // if this is pad data from the last game still being received, ignore it + if (player.current_game != m_current_game) + break; + + PadMapping map = 0; + u8 size; + packet >> map >> size; + u8* data = new u8[size]; + for (unsigned int i = 0; i < size; ++i) + packet >> data[i]; + + // check if client's pad indeed maps in game + if (map >= 0 && map < 4) + map = player.wiimote_map[(unsigned)map]; + else + map = -1; + + // if not, they are hacking, so disconnect them + // this could happen right after a pad map change, but that isn't implemented yet + if (map < 0) + return 1; + + // relay to clients + sf::Packet spac; + spac << (MessageId)NP_MSG_WIIMOTE_DATA; + spac << map; // in game mapping + spac << size; + for (unsigned int i = 0; i < size; ++i) + spac << data[i]; + + delete[] data; + + std::lock_guard lks(m_crit.send); + SendToClients(spac, player.pid); + } + break; + case NP_MSG_PONG : { const u32 ping = m_ping_timer.GetTimeElapsed(); diff --git a/Source/Core/Core/Src/NetPlayServer.h b/Source/Core/Core/Src/NetPlayServer.h index 95f98e2a73..1d3735277d 100644 --- a/Source/Core/Core/Src/NetPlayServer.h +++ b/Source/Core/Core/Src/NetPlayServer.h @@ -40,6 +40,9 @@ public: bool GetPadMapping(const int pid, int map[]); bool SetPadMapping(const int pid, const int map[]); + bool GetWiimoteMapping(const int pid, int map[]); + bool SetWiimoteMapping(const int pid, const int map[]); + void AdjustPadBufferSize(unsigned int size); bool is_connected; @@ -58,6 +61,7 @@ private: PlayerId pid; std::string name; PadMapping pad_map[4]; + PadMapping wiimote_map[4]; std::string revision; sf::SocketTCP socket; @@ -70,6 +74,7 @@ private: unsigned int OnDisconnect(sf::SocketTCP& socket); unsigned int OnData(sf::Packet& packet, sf::SocketTCP& socket); void UpdatePadMapping(); + void UpdateWiimoteMapping(); NetSettings m_settings; diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 1c8f0549b9..86650b3588 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -106,11 +106,11 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" - " - Manually set the exact number of controllers to be used to [Standard Controller]\n" + " - Manually set the exact number of wiimotes to be used to [Emulated Wiimote]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" - "Wiimote support has not been implemented!\n" + "Wiimote support is probably terrible. Don't use it.\n" "\n" "The host must have the chosen TCP port open/forwarded!\n"), wxDefaultPosition, wxDefaultSize); @@ -560,6 +560,7 @@ void NetPlayDiag::OnChangeGame(wxCommandEvent&) void NetPlayDiag::OnConfigPads(wxCommandEvent&) { int mapping[4]; + int wiimotemapping[4]; // get selected player id int pid = m_player_lbox->GetSelection(); @@ -569,11 +570,13 @@ void NetPlayDiag::OnConfigPads(wxCommandEvent&) if (false == netplay_server->GetPadMapping(pid, mapping)) return; + if (false == netplay_server->GetWiimoteMapping(pid, wiimotemapping)) + return; - PadMapDiag pmd(this, mapping); + PadMapDiag pmd(this, mapping, wiimotemapping); pmd.ShowModal(); - if (false == netplay_server->SetPadMapping(pid, mapping)) + if (false == netplay_server->SetPadMapping(pid, mapping) || false == netplay_server->SetWiimoteMapping(pid, wiimotemapping)) PanicAlertT("Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)"); } @@ -605,9 +608,9 @@ void ChangeGameDiag::OnPick(wxCommandEvent& event) EndModal(wxID_OK); } -PadMapDiag::PadMapDiag(wxWindow* const parent, int map[]) +PadMapDiag::PadMapDiag(wxWindow* const parent, int map[], int wiimotemap[]) : wxDialog(parent, wxID_ANY, _("Configure Pads"), wxDefaultPosition, wxDefaultSize) - , m_mapping(map) + , m_mapping(map), m_wiimapping(wiimotemap) { wxBoxSizer* const h_szr = new wxBoxSizer(wxHORIZONTAL); @@ -627,6 +630,11 @@ PadMapDiag::PadMapDiag(wxWindow* const parent, int map[]) for (unsigned int i=1; i<5; ++i) pad_names[i] = wxString(_("Pad ")) + (wxChar)(wxT('0')+i); + wxString wiimote_names[5]; + wiimote_names[0] = _("None"); + for (unsigned int i=1; i < 5; ++i) + wiimote_names[i] = wxString(_("Wiimote ")) + (wxChar)(wxT('0')+i); + for (unsigned int i=0; i<4; ++i) { wxChoice* const pad_cbox = m_map_cbox[i] @@ -642,6 +650,21 @@ PadMapDiag::PadMapDiag(wxWindow* const parent, int map[]) h_szr->Add(v_szr, 1, wxTOP | wxEXPAND, 20); } + for (unsigned int i=0; i<4; ++i) + { + wxChoice* const wiimote_cbox = m_map_cbox[i+4] + = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, wiimote_names); + wiimote_cbox->Select(m_wiimapping[i] + 1); + + wiimote_cbox->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &PadMapDiag::OnAdjust, this); + + wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); + v_szr->Add(new wxStaticText(this,wxID_ANY, wiimote_names[i + 1]), 1, wxALIGN_CENTER_HORIZONTAL); + v_szr->Add(wiimote_cbox, 1); + + h_szr->Add(v_szr, 1, wxTOP | wxEXPAND, 20); + } + h_szr->AddSpacer(20); wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); @@ -657,5 +680,8 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event) { (void)event; for (unsigned int i=0; i<4; ++i) + { m_mapping[i] = m_map_cbox[i]->GetSelection() - 1; + m_wiimapping[i] = m_map_cbox[i+4]->GetSelection() - 1; + } } diff --git a/Source/Core/DolphinWX/Src/NetWindow.h b/Source/Core/DolphinWX/Src/NetWindow.h index 543c164994..89bf66fee2 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.h +++ b/Source/Core/DolphinWX/Src/NetWindow.h @@ -124,13 +124,14 @@ private: class PadMapDiag : public wxDialog { public: - PadMapDiag(wxWindow* const parent, int map[]); + PadMapDiag(wxWindow* const parent, int map[], int wiimotemap[]); private: void OnAdjust(wxCommandEvent& event); - wxChoice* m_map_cbox[4]; + wxChoice* m_map_cbox[8]; int* const m_mapping; + int* const m_wiimapping; }; #endif // _NETWINDOW_H_ From 011bcfee347d0ec913fe502f5f93ff3286883418 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 7 Aug 2013 10:10:40 -0400 Subject: [PATCH 002/267] Misc netplay cleanup. --- .../Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 2 +- .../Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h | 1 - Source/Core/Core/Src/NetPlayClient.cpp | 73 ++++--------------- Source/Core/Core/Src/NetPlayServer.cpp | 1 + 4 files changed, 15 insertions(+), 62 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 4adec84469..9b57f96a2c 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -265,7 +265,7 @@ void CWII_IPC_HLE_WiiMote::ExecuteL2capCmd(u8* _pData, u32 _Size) _dbg_assert_msg_(WII_IPC_WIIMOTE, DoesChannelExist(pHeader->dcid), "L2CAP: SendACLPacket to unknown channel %i", pHeader->dcid); CChannelMap::iterator itr= m_Channel.find(pHeader->dcid); - const int number = NetPlay_GetWiimoteNum(m_ConnectionHandle & 0xFF); + const int number = m_ConnectionHandle & 0xFF; if (itr != m_Channel.end()) { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h index 691fc84011..397841a2f0 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -56,7 +56,6 @@ public: void ReceiveL2capData(u16 scid, const void* _pData, u32 _Size); // From wiimote int NetPlay_GetWiimoteNum(int _number); - bool NetPlay_WiimoteInput(int _number, u16 _channelID, const void* _pData, u32& _Size); void EventConnectionAccepted(); void EventDisconnect(); diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index cefb0ebe16..6a8086869a 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -263,7 +263,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) delete[] data; // trusting server for good map value (>=0 && <4) - // add to pad buffer + // add to wiimote buffer m_wiimote_buffer[(unsigned)map].Push(nw); } break; @@ -455,13 +455,6 @@ bool NetPlayClient::StartGame(const std::string &path) { std::lock_guard lkg(m_crit.game); - //wtf? - if (m_target_buffer_size > 100) - { - m_target_buffer_size = 20; - NOTICE_LOG(NETPLAY,"WHYYYYYYYYYYYY"); - } - // tell server i started the game sf::Packet spac; spac << (MessageId)NP_MSG_START_GAME; @@ -487,12 +480,6 @@ bool NetPlayClient::StartGame(const std::string &path) // boot game m_dialog->BootGame(path); - // temporary - //NetWiimote nw; - //for (unsigned int i = 0; i<4; ++i) - //for (unsigned int f = 0; f<2; ++f) - //m_wiimote_buffer[i].Push(nw); - return true; } @@ -584,7 +571,7 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) // in game mapping for this local wiimote unsigned int in_game_num = m_local_player->wiimote_map[_number]; - // does this local pad map in game? + // does this local wiimote map in game? if (in_game_num < 4) { static u8 previousSize = 0; @@ -594,8 +581,7 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) // Reporting mode changed, so previous buffer is no good. m_wiimote_buffer[_number].Clear(); } - - //m_wiimote_input[in_game_num].data.resize(m_wiimote_input[_number].size + 1); + m_wiimote_input[in_game_num].data.assign(data, data + size); m_wiimote_input[in_game_num].size = size; while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size) @@ -623,15 +609,19 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) // This is either a desync, or the reporting mode changed. No way to really be sure... if (size != nw.size) { + u8 tries = 0; // Clear the buffer and wait for new input, in case it was just the reporting mode changing as expected. do { - m_wiimote_buffer[_number].Pop(nw); - Common::SleepCurrentThread(1); - if (false == m_is_running) - return false; - - // TODO: break if this runs too long; it probably desynced if it runs for longer than the buffer size + while (!m_wiimote_buffer[_number].Pop(nw)) + { + Common::SleepCurrentThread(1); + if (false == m_is_running) + return false; + } + ++tries; + if (tries > m_target_buffer_size) + break; } while (nw.size != size); // If it still mismatches, it surely desynced @@ -746,43 +736,6 @@ u8 CSIDevice_DanceMat::NetPlay_GetPadNum(u8 numPAD) return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); } -// called from ---CPU--- thread -// -int CWII_IPC_HLE_WiiMote::NetPlay_GetWiimoteNum(int _number) -{ -// std::lock_guard lk(crit_netplay_client); - -// if (netplay_client) -// return netplay_client->GetPadNum(_number+4); -// else - return _number; -} - -// called from ---CPU--- thread -// intercept wiimote input callback -//bool CWII_IPC_HLE_WiiMote::NetPlay_WiimoteInput(int _number, u16 _channelID, const void* _pData, u32& _Size) -bool CWII_IPC_HLE_WiiMote::NetPlay_WiimoteInput(int, u16, const void*, u32&) -{ - std::lock_guard lk(crit_netplay_client); - - if (netplay_client) - //{ - // if (_Size >= RPT_SIZE_HACK) - // { - // _Size -= RPT_SIZE_HACK; - // return false; - // } - // else - // { - // netplay_client->WiimoteInput(_number, _channelID, _pData, _Size); - // // don't use this packet - return true; - // } - //} - else - return false; -} - bool NetPlay::IsNetPlayRunning() { return netplay_client != NULL; diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 5eb5288c15..0d68ac64ef 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -49,6 +49,7 @@ NetPlayServer::NetPlayServer(const u16 port) : is_connected(false), m_is_running m_do_loop = true; m_selector.Add(m_socket); m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this); + m_target_buffer_size = 20; } } From f51cb0b7eb9c0f261abd3f5d68707ba1f93e3888 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 7 Aug 2013 18:00:38 -0400 Subject: [PATCH 003/267] Fix multiplayer wiimote netplay. --- Source/Core/Core/Src/NetPlayClient.cpp | 14 ++++++-------- Source/Core/Core/Src/NetPlayClient.h | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 6a8086869a..1504498c1f 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -500,8 +500,6 @@ void NetPlayClient::ClearBuffers() while (m_wiimote_buffer[i].Size()) m_wiimote_buffer[i].Pop(); - - m_wiimote_input[i].data.clear(); } } @@ -565,6 +563,7 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat // called from ---CPU--- thread bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) { + NetWiimote nw; { std::lock_guard lkp(m_crit.players); @@ -579,25 +578,24 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) if (previousSize != size && m_wiimote_buffer[in_game_num].Size() > 0) { // Reporting mode changed, so previous buffer is no good. - m_wiimote_buffer[_number].Clear(); + m_wiimote_buffer[in_game_num].Clear(); } - m_wiimote_input[in_game_num].data.assign(data, data + size); - m_wiimote_input[in_game_num].size = size; + nw.data.assign(data, data + size); + nw.size = size; while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size) { // add to buffer - m_wiimote_buffer[in_game_num].Push(m_wiimote_input[in_game_num]); + m_wiimote_buffer[in_game_num].Push(nw); // send - SendWiimoteState(_number, m_wiimote_input[_number]); + SendWiimoteState(_number, nw); } previousSize = size; } } // unlock players - NetWiimote nw; while (!m_wiimote_buffer[_number].Pop(nw)) { // wait for receiving thread to push some data diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index 625c20b951..0783fdf439 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -100,8 +100,6 @@ protected: Common::FifoQueue m_pad_buffer[4]; Common::FifoQueue m_wiimote_buffer[4]; - NetWiimote m_wiimote_input[4]; - NetPlayUI* m_dialog; sf::SocketTCP m_socket; std::thread m_thread; From c7025989f8cbd1e20505a17515cf6d99ec96d2c9 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 15 Aug 2013 22:31:36 -0400 Subject: [PATCH 004/267] Probably worthless commit that may fix wiimote netplay buffer problems. --- Source/Core/Core/Src/NetPlayClient.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 1504498c1f..a2a06e03e0 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -575,10 +575,10 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) { static u8 previousSize = 0; - if (previousSize != size && m_wiimote_buffer[in_game_num].Size() > 0) + while (previousSize != size && m_wiimote_buffer[in_game_num].Size() > 0) { // Reporting mode changed, so previous buffer is no good. - m_wiimote_buffer[in_game_num].Clear(); + m_wiimote_buffer[in_game_num].Pop(); } nw.data.assign(data, data + size); @@ -618,7 +618,7 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) return false; } ++tries; - if (tries > m_target_buffer_size) + if (tries > m_target_buffer_size +1) break; } while (nw.size != size); From 894e29b80929dd9ae1e837eeae8e327e6e499368 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 18 Aug 2013 05:17:06 -0400 Subject: [PATCH 005/267] Fix comments, and send wiimote mapping to new users. --- Source/Core/Core/Src/NetPlayServer.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index c5d77c0f23..29dc86411d 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -193,7 +193,7 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket) { bool is_mapped[4] = {false,false,false,false}; - for ( unsigned int m = 0; m<4; ++m) + for (unsigned int m = 0; m<4; ++m) { for (i = m_players.begin(); i!=e; ++i) { @@ -202,7 +202,7 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket) } } - for ( unsigned int m = 0; m<4; ++m) + for (unsigned int m = 0; m<4; ++m) if (false == is_mapped[m]) { player.pad_map[0] = m; @@ -252,6 +252,7 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket) m_players[socket] = player; std::lock_guard lks(m_crit.send); UpdatePadMapping(); // sync pad mappings with everyone + UpdateWiimoteMapping(); } @@ -329,7 +330,7 @@ bool NetPlayServer::GetWiimoteMapping(const int pid, int map[]) if (i == e) return false; - // get pad mapping + // get wiimote mapping for (unsigned int m = 0; m<4; ++m) map[m] = i->second.wiimote_map[m]; @@ -397,7 +398,7 @@ bool NetPlayServer::SetWiimoteMapping(const int pid, const int map[]) Client& player = i->second; - // set pad mapping + // set wiimote mapping for (unsigned int m = 0; m<4; ++m) { player.wiimote_map[m] = (PadMapping)map[m]; @@ -411,7 +412,7 @@ bool NetPlayServer::SetWiimoteMapping(const int pid, const int map[]) } std::lock_guard lks(m_crit.send); - UpdateWiimoteMapping(); // sync pad mappings with everyone + UpdateWiimoteMapping(); // sync wiimote mappings with everyone return true; } @@ -534,7 +535,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) case NP_MSG_WIIMOTE_DATA : { - // if this is pad data from the last game still being received, ignore it + // if this is wiimote data from the last game still being received, ignore it if (player.current_game != m_current_game) break; @@ -545,14 +546,14 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) for (unsigned int i = 0; i < size; ++i) packet >> data[i]; - // check if client's pad indeed maps in game + // check if client's wiimote indeed maps in game if (map >= 0 && map < 4) map = player.wiimote_map[(unsigned)map]; else map = -1; // if not, they are hacking, so disconnect them - // this could happen right after a pad map change, but that isn't implemented yet + // this could happen right after a wiimote map change, but that isn't implemented yet if (map < 0) return 1; From d3c437819d5c2128c84b9f271aa0a2fe39be7ea4 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 19 Aug 2013 13:45:02 -0400 Subject: [PATCH 006/267] NetPlay: Add blank inputs when reporting mode changes, so the buffer isn't empty if wiimote 1 isn't polled next. --- Source/Core/Core/Src/NetPlayClient.cpp | 86 ++++++++++++++++++-------- Source/Core/Core/Src/NetPlayClient.h | 2 +- Source/Core/Core/Src/NetPlayServer.cpp | 6 +- 3 files changed, 64 insertions(+), 30 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index a2a06e03e0..b03278d1a3 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -480,6 +480,19 @@ bool NetPlayClient::StartGame(const std::string &path) // boot game m_dialog->BootGame(path); + // Needed to prevent locking up at boot if (when) the wiimotes connect out of order. + NetWiimote nw; + nw.size = 4; + nw.data.resize(4); + memset(nw.data.data(), 0, 4); + + for (unsigned int w = 0; w < 4; ++w) + { + // probably overkill, but whatever + for (unsigned int i = 0; i < 7; ++i) + m_wiimote_buffer[w].Push(nw); + } + return true; } @@ -561,9 +574,10 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat // called from ---CPU--- thread -bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) +bool NetPlayClient::WiimoteUpdate(int _number, u8* data, const u8 size) { NetWiimote nw; + static u8 previousSize[4] = {4,4,4,4}; { std::lock_guard lkp(m_crit.players); @@ -573,30 +587,39 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) // does this local wiimote map in game? if (in_game_num < 4) { - static u8 previousSize = 0; - - while (previousSize != size && m_wiimote_buffer[in_game_num].Size() > 0) - { - // Reporting mode changed, so previous buffer is no good. - m_wiimote_buffer[in_game_num].Pop(); - } - nw.data.assign(data, data + size); nw.size = size; - while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size) - { - // add to buffer - m_wiimote_buffer[in_game_num].Push(nw); + if (previousSize[in_game_num] == size) + do + { + // add to buffer + m_wiimote_buffer[in_game_num].Push(nw); - // send - SendWiimoteState(_number, nw); + SendWiimoteState(_number, nw); + } while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size /*&& previousSize[in_game_num] == size*/); + + if (previousSize[in_game_num] != size) + { + + while (m_wiimote_buffer[in_game_num].Size() > 0) + { + // Reporting mode changed, so previous buffer is no good. + m_wiimote_buffer[in_game_num].Pop(); + } + + nw.data.resize(size); + memset(nw.data.data(), 0, size); + // Not sure if this is necessary, but it might be. + m_wiimote_buffer[in_game_num].Push(nw); + m_wiimote_buffer[in_game_num].Push(nw); + m_wiimote_buffer[in_game_num].Push(nw); + previousSize[in_game_num] = size; } - previousSize = size; } } // unlock players - while (!m_wiimote_buffer[_number].Pop(nw)) + while (previousSize[_number] == size && !m_wiimote_buffer[_number].Pop(nw)) { // wait for receiving thread to push some data Common::SleepCurrentThread(1); @@ -604,12 +627,22 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) return false; } - // This is either a desync, or the reporting mode changed. No way to really be sure... - if (size != nw.size) + // Use a blank input. + if (previousSize[_number] != size) + { + nw.size = size; + nw.data.resize(size); + memset(nw.data.data(), 0, size); + m_wiimote_buffer[_number].Push(nw); + m_wiimote_buffer[_number].Push(nw); + } + + // We should have used a blank input last time, so now we just need to pop through the old buffer, until we reach a good input + if (nw.size != size) { u8 tries = 0; // Clear the buffer and wait for new input, in case it was just the reporting mode changing as expected. - do + while (nw.size != size) { while (!m_wiimote_buffer[_number].Pop(nw)) { @@ -618,19 +651,20 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) return false; } ++tries; - if (tries > m_target_buffer_size +1) - break; - } while (nw.size != size); + //if (tries > m_target_buffer_size) + //break; + } // If it still mismatches, it surely desynced if (size != nw.size) { - PanicAlert("Netplay has desynced. There is no way to handle this. Self destructing in 3...2...1..."); - StopGame(); - return false; + //PanicAlert("Netplay has desynced. There is no way to handle this. Self destructing in 3...2...1..."); + //StopGame(); + //return false; } } + previousSize[_number] = size; memcpy(data, nw.data.data(), size); return true; } diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index 0783fdf439..ff6712fc91 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -68,7 +68,7 @@ public: void SendChatMessage(const std::string& msg); // Send and receive pads values - bool WiimoteUpdate(int _number, u8* data, u8 size); + bool WiimoteUpdate(int _number, u8* data, const u8 size); bool GetNetPads(const u8 pad_nb, const SPADStatus* const, NetPad* const netvalues); u8 GetPadNum(u8 numPAD); diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 29dc86411d..dc9849297b 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -197,15 +197,15 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket) { for (i = m_players.begin(); i!=e; ++i) { - if (i->second.pad_map[m] >= 0) - is_mapped[(unsigned)i->second.pad_map[m]] = true; + if (i->second.wiimote_map[m] >= 0) + is_mapped[(unsigned)i->second.wiimote_map[m]] = true; } } for (unsigned int m = 0; m<4; ++m) if (false == is_mapped[m]) { - player.pad_map[0] = m; + player.wiimote_map[0] = m; break; } From d3894a05949c938295ca1587cf9d777a50ca9c60 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 22 Aug 2013 11:37:38 -0400 Subject: [PATCH 007/267] Clean up wiimote-netplay. --- Source/Core/Core/Src/NetPlayClient.cpp | 52 +++++++++++--------------- Source/Core/Core/Src/NetPlayProto.h | 6 +-- Source/Core/Core/Src/NetPlayServer.cpp | 1 + 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index b03278d1a3..660d0d83dd 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -255,11 +255,11 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) u8 size; packet >> map >> size; - nw.size = size; + nw.resize(size); u8* data = new u8[size]; for (unsigned int i = 0; i < size; ++i) packet >> data[i]; - nw.data.assign(data,data+size); + nw.assign(data,data+size); delete[] data; // trusting server for good map value (>=0 && <4) @@ -441,10 +441,10 @@ void NetPlayClient::SendWiimoteState(const PadMapping local_nb, const NetWiimote sf::Packet spac; spac << (MessageId)NP_MSG_WIIMOTE_DATA; spac << local_nb; // local pad num - u8 size = nw.size; + u8 size = nw.size(); spac << size; for (unsigned int i = 0; i < size; ++i) - spac << nw.data.data()[i]; + spac << nw.data()[i]; std::lock_guard lks(m_crit.send); m_socket.Send(spac); @@ -482,9 +482,7 @@ bool NetPlayClient::StartGame(const std::string &path) // Needed to prevent locking up at boot if (when) the wiimotes connect out of order. NetWiimote nw; - nw.size = 4; - nw.data.resize(4); - memset(nw.data.data(), 0, 4); + nw.resize(4, 0); for (unsigned int w = 0; w < 4; ++w) { @@ -587,29 +585,26 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, const u8 size) // does this local wiimote map in game? if (in_game_num < 4) { - nw.data.assign(data, data + size); - nw.size = size; if (previousSize[in_game_num] == size) + { + nw.assign(data, data + size); do { // add to buffer m_wiimote_buffer[in_game_num].Push(nw); SendWiimoteState(_number, nw); - } while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size /*&& previousSize[in_game_num] == size*/); - - if (previousSize[in_game_num] != size) + } while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size * 200 / 120); // TODO: add a seperate setting for wiimote buffer + } + else { - while (m_wiimote_buffer[in_game_num].Size() > 0) { // Reporting mode changed, so previous buffer is no good. m_wiimote_buffer[in_game_num].Pop(); } + nw.resize(size, 0); - nw.data.resize(size); - memset(nw.data.data(), 0, size); - // Not sure if this is necessary, but it might be. m_wiimote_buffer[in_game_num].Push(nw); m_wiimote_buffer[in_game_num].Push(nw); m_wiimote_buffer[in_game_num].Push(nw); @@ -627,22 +622,20 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, const u8 size) return false; } - // Use a blank input. + // Use a blank input, since we may not have any valid input. if (previousSize[_number] != size) { - nw.size = size; - nw.data.resize(size); - memset(nw.data.data(), 0, size); + nw.resize(size, 0); m_wiimote_buffer[_number].Push(nw); m_wiimote_buffer[_number].Push(nw); } // We should have used a blank input last time, so now we just need to pop through the old buffer, until we reach a good input - if (nw.size != size) + if (nw.size() != size) { u8 tries = 0; - // Clear the buffer and wait for new input, in case it was just the reporting mode changing as expected. - while (nw.size != size) + // Clear the buffer and wait for new input, since we probably just changed reporting mode. + while (nw.size() != size) { while (!m_wiimote_buffer[_number].Pop(nw)) { @@ -651,21 +644,20 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, const u8 size) return false; } ++tries; - //if (tries > m_target_buffer_size) - //break; + if (tries > m_target_buffer_size) + break; } // If it still mismatches, it surely desynced - if (size != nw.size) + if (size != nw.size()) { - //PanicAlert("Netplay has desynced. There is no way to handle this. Self destructing in 3...2...1..."); - //StopGame(); - //return false; + PanicAlert("Netplay has desynced. There is no way to recover from this."); + return false; } } previousSize[_number] = size; - memcpy(data, nw.data.data(), size); + memcpy(data, nw.data(), size); return true; } diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h index b1c4c481d9..f722b211f7 100644 --- a/Source/Core/Core/Src/NetPlayProto.h +++ b/Source/Core/Core/Src/NetPlayProto.h @@ -16,11 +16,7 @@ struct NetSettings u8 m_Controllers[4]; }; -struct NetWiimote -{ - u8 size; - std::vector data; -}; +typedef std::vector NetWiimote; #define NETPLAY_VERSION "Dolphin NetPlay 2013-08-06 now with wiimote(TM)" diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index dc9849297b..ff7f35af2b 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -190,6 +190,7 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket) // TODO: this is crappy // try to automatically assign new user a pad + // TODO: change back to assigning pads instead of wiimotes before merging wiimote-netplay { bool is_mapped[4] = {false,false,false,false}; From 71fde876df2273152c6299675572a09e08e6ffce Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 1 Sep 2013 17:15:16 -0400 Subject: [PATCH 008/267] A fix to my fix to my fix. Sorry. (Avoid uninitialized m_pFile when loading WADs.) --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index dcad297f7d..87cd940613 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -220,6 +220,7 @@ u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index) Access.m_Position = 0; Access.m_pContent = pContent; Access.m_TitleID = TitleID; + Access.m_pFile = NULL; if (!pContent->m_pData) { From acf3bd8697b323774ab21f24e6bc95ba2e29529d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 1 Sep 2013 20:31:45 -0400 Subject: [PATCH 009/267] [Android] On-screen controls work for Software Renderer, but not the OpenGL ES 3 video backend yet. Enabled it for Software Rendering and disabled it for Open GL ES 3. --- .../dolphinemu/settings/VideoSettingsFragment.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index fdaec5df01..cde3bf755d 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -207,7 +207,7 @@ public final class VideoSettingsFragment extends PreferenceFragment // denotes the placement on the UI. So if more elements are // added to the video settings, these may need to change. // - final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); + final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(m_activity); final PreferenceScreen mainScreen = getPreferenceScreen(); if (videoBackends.getValue().equals("Software Renderer")) @@ -215,14 +215,13 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(false); } else if (videoBackends.getValue().equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(true); + mainScreen.getPreference(4).setEnabled(false); } // Also set a listener, so that if someone changes the video backend, it will disable @@ -239,14 +238,13 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(false); } else if (preference.getString(key, "Software Renderer").equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(true); + mainScreen.getPreference(4).setEnabled(false); } } } From d41eb76378eb8d96fe7e447ad4229badbdb3b719 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 1 Sep 2013 20:36:47 -0400 Subject: [PATCH 010/267] [Android] Fix the last commit. On-screen control drawing wouldn't re-enable upon flipping video backends. --- .../dolphinemu/dolphinemu/settings/VideoSettingsFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index cde3bf755d..14e512f78c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -215,6 +215,7 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); + mainScreen.getPreference(4).setEnabled(true); } else if (videoBackends.getValue().equals("OGL")) { @@ -238,6 +239,7 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); + mainScreen.getPreference(4).setEnabled(true); } else if (preference.getString(key, "Software Renderer").equals("OGL")) { From fd7cf5bb719d0fb04814d9df4a6a783d648dad40 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 29 Aug 2013 01:33:24 -0400 Subject: [PATCH 011/267] A bunch of trivial changes to fix clang warnings. --- Source/Core/AudioCommon/Src/DPL2Decoder.cpp | 4 ++++ Source/Core/AudioCommon/Src/Mixer.cpp | 2 +- Source/Core/Common/Src/SettingsHandler.cpp | 2 +- Source/Core/Common/Src/Timer.cpp | 4 ---- Source/Core/Common/Src/Timer.h | 1 - Source/Core/Core/Src/Boot/ElfReader.h | 1 - Source/Core/Core/Src/Debugger/Dump.cpp | 3 +-- Source/Core/Core/Src/Debugger/Dump.h | 1 - Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 ++ Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h | 1 - Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 3 ++- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h | 2 -- Source/Core/Core/Src/Movie.cpp | 2 +- Source/Core/DiscIO/Src/DriveBlob.h | 1 - Source/Core/DiscIO/Src/VolumeWad.h | 1 - Source/Core/DolphinWX/Src/Debugger/CodeView.cpp | 3 --- Source/Core/DolphinWX/Src/Debugger/CodeView.h | 3 --- Source/Core/DolphinWX/Src/Frame.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/AGL.cpp | 6 +++--- Source/Core/DolphinWX/Src/ISOFile.h | 1 - Source/Core/DolphinWX/Src/TASInputDlg.cpp | 2 +- Source/Core/DolphinWX/Src/TASInputDlg.h | 2 +- Source/Core/DolphinWX/Src/WiimoteConfigDiag.h | 1 - .../InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h | 5 ++--- .../InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm | 1 - Source/Plugins/Plugin_VideoSoftware/Src/Tev.h | 1 - 26 files changed, 20 insertions(+), 37 deletions(-) diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp index 5b41c605ce..97bdb5413d 100644 --- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp @@ -14,8 +14,12 @@ #include #include "DPL2Decoder.h" +#ifndef M_PI #define M_PI 3.14159265358979323846 +#endif +#ifndef M_SQRT1_2 #define M_SQRT1_2 0.70710678118654752440 +#endif int olddelay = -1; unsigned int oldfreq = 0; diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp index 2c526cf3bd..fb29f4902f 100644 --- a/Source/Core/AudioCommon/Src/Mixer.cpp +++ b/Source/Core/AudioCommon/Src/Mixer.cpp @@ -210,7 +210,7 @@ unsigned int CMixer::GetNumSamples() u32 numSamples = ((Common::AtomicLoad(m_indexW) - Common::AtomicLoad(m_indexR)) & INDEX_MASK) / 2; if (AudioInterface::GetAIDSampleRate() == m_sampleRate) - numSamples = numSamples; // 1:1 + ; //numSamples = numSamples; // 1:1 else if (m_sampleRate == 48000 && AudioInterface::GetAIDSampleRate() == 32000) numSamples = numSamples * 3 / 2 - 2; // most common case else diff --git a/Source/Core/Common/Src/SettingsHandler.cpp b/Source/Core/Common/Src/SettingsHandler.cpp index 46b4170fcb..3bd9b27c2f 100644 --- a/Source/Core/Common/Src/SettingsHandler.cpp +++ b/Source/Core/Common/Src/SettingsHandler.cpp @@ -45,7 +45,7 @@ const std::string SettingsHandler::GetValue(const std::string key) else { toFind = key + "="; - size_t found = decoded.find(toFind); + found = decoded.find(toFind); if (found == 0) { size_t delimFound = decoded.find(delim, found + toFind.length()); diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 926de59917..945d2fac76 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -39,10 +39,6 @@ Timer::Timer() : m_LastTime(0), m_StartTime(0), m_Running(false) { Update(); - -#ifdef _WIN32 - QueryPerformanceFrequency((LARGE_INTEGER*)&m_frequency); -#endif } // Write the starting time diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h index d230c73608..920a001282 100644 --- a/Source/Core/Common/Src/Timer.h +++ b/Source/Core/Common/Src/Timer.h @@ -38,7 +38,6 @@ public: private: u64 m_LastTime; u64 m_StartTime; - u64 m_frequency; bool m_Running; }; diff --git a/Source/Core/Core/Src/Boot/ElfReader.h b/Source/Core/Core/Src/Boot/ElfReader.h index de071572a6..47a4ef7103 100644 --- a/Source/Core/Core/Src/Boot/ElfReader.h +++ b/Source/Core/Core/Src/Boot/ElfReader.h @@ -27,7 +27,6 @@ private: Elf32_Phdr *segments; Elf32_Shdr *sections; - u32 *sectionOffsets; u32 *sectionAddrs; bool bRelocate; u32 entryPoint; diff --git a/Source/Core/Core/Src/Debugger/Dump.cpp b/Source/Core/Core/Src/Debugger/Dump.cpp index 8d784cf8b0..8a9a87c2b8 100644 --- a/Source/Core/Core/Src/Debugger/Dump.cpp +++ b/Source/Core/Core/Src/Debugger/Dump.cpp @@ -9,8 +9,7 @@ #include "FileUtil.h" CDump::CDump(const char* _szFilename) : - m_pData(NULL), - m_bInit(false) + m_pData(NULL) { File::IOFile pStream(_szFilename, "rb"); if (pStream) diff --git a/Source/Core/Core/Src/Debugger/Dump.h b/Source/Core/Core/Src/Debugger/Dump.h index ae94b6571e..d2764714c0 100644 --- a/Source/Core/Core/Src/Debugger/Dump.h +++ b/Source/Core/Core/Src/Debugger/Dump.h @@ -32,7 +32,6 @@ private: u8 *m_pData; - bool m_bInit; size_t m_size; u32 Read32(u32 _pos); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index ed65a89fe5..6819b05818 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -103,6 +103,7 @@ bool WritePB(u32 addr, const PB_TYPE& pb) return true; } +#if 0 // Dump the value of a PB for debugging #define DUMP_U16(field) WARN_LOG(DSPHLE, " %04x (%s)", pb.field, #field) #define DUMP_U32(field) WARN_LOG(DSPHLE, " %08x (%s)", HILO_TO_32(pb.field), #field) @@ -122,6 +123,7 @@ void DumpPB(const PB_TYPE& pb) // TODO: complete as needed } +#endif // Simulated accelerator state. static u32 acc_loop_addr, acc_end_addr; diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h index 0960c272a8..b2c73e1920 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h @@ -31,7 +31,6 @@ public: private: Buttons* m_buttons; - MixedTriggers* m_triggers; AnalogStick* m_stick; Triggers *m_effect_dial; Slider *m_left_table, *m_right_table, *m_crossfade; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index df762a8358..f9e40110fb 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -472,7 +472,8 @@ bool CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress) case IOCTLV_WD_SCAN: { // Gives parameters detailing type of scan and what to match - ScanInfo *scan = (ScanInfo *)Memory::GetPointer(CommandBuffer.InBuffer.at(0).m_Address); + // XXX - unused + // ScanInfo *scan = (ScanInfo *)Memory::GetPointer(CommandBuffer.InBuffer.at(0).m_Address); u16 *results = (u16 *)Memory::GetPointer(CommandBuffer.PayloadBuffer.at(0).m_Address); // first u16 indicates number of BSSInfo following diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h index 3f3c50926b..36402a593a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h @@ -475,9 +475,7 @@ public: { u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C); u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); - u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14); u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); - u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C); u32 result = 0; u32 common_result = 0; diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 0be4bb8926..d22f625fce 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -1174,7 +1174,7 @@ void GetSettings() u8 tmp[21]; for (int i = 0; i < 20; ++i) { - sscanf(SCM_REV_STR + 2 * i, "%02hhx", &tmp[i]); + sscanf(&SCM_REV_STR[2 * i], "%02hhx", &tmp[i]); revision[i] = tmp[i]; } } diff --git a/Source/Core/DiscIO/Src/DriveBlob.h b/Source/Core/DiscIO/Src/DriveBlob.h index cb1c7f8f08..d5c13a3b15 100644 --- a/Source/Core/DiscIO/Src/DriveBlob.h +++ b/Source/Core/DiscIO/Src/DriveBlob.h @@ -31,7 +31,6 @@ private: bool IsOK() {return file_ != 0;} #endif s64 size; - u64 *block_pointers; public: static DriveReader *Create(const char *drive); diff --git a/Source/Core/DiscIO/Src/VolumeWad.h b/Source/Core/DiscIO/Src/VolumeWad.h index d22e7a2c9e..59edf79cd4 100644 --- a/Source/Core/DiscIO/Src/VolumeWad.h +++ b/Source/Core/DiscIO/Src/VolumeWad.h @@ -34,7 +34,6 @@ public: private: IBlobReader* m_pReader; - u64 m_titleID; u32 OpeningBnrOffset, hdr_size, cert_size, tick_size, tmd_size, data_size; u8 m_Country; }; diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp index 4080d2b564..bcfb1ab586 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp @@ -57,10 +57,7 @@ CCodeView::CCodeView(DebugInterface* debuginterface, SymbolDB *symboldb, rowHeight(13), selection(0), oldSelection(0), - selectionChanged(false), selecting(false), - hasFocus(false), - showHex(false), lx(-1), ly(-1) { diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeView.h b/Source/Core/DolphinWX/Src/Debugger/CodeView.h index 5f4c41eaf7..5618abf4d7 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeView.h +++ b/Source/Core/DolphinWX/Src/Debugger/CodeView.h @@ -73,10 +73,7 @@ private: u32 selection; u32 oldSelection; - bool selectionChanged; bool selecting; - bool hasFocus; - bool showHex; int lx, ly; void _MoveTo(int x, int y) {lx = x; ly = y;} diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index dab18a1687..9c76cd5420 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -811,7 +811,7 @@ bool TASInputHasFocus() { for (int i = 0; i < 4; i++) { - if (main_frame->g_TASInputDlg[i]->HasFocus()) + if (main_frame->g_TASInputDlg[i]->TASHasFocus()) return true; } return false; diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp index 67f27a0ddb..2062268e05 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp @@ -58,7 +58,7 @@ bool cInterfaceAGL::Create(void *&window_handle) initWithAttributes: attr]; if (fmt == nil) { ERROR_LOG(VIDEO, "failed to create pixel format"); - return NULL; + return false; } GLWin.cocoaCtx = [[NSOpenGLContext alloc] @@ -66,12 +66,12 @@ bool cInterfaceAGL::Create(void *&window_handle) [fmt release]; if (GLWin.cocoaCtx == nil) { ERROR_LOG(VIDEO, "failed to create context"); - return NULL; + return false; } if (GLWin.cocoaWin == nil) { ERROR_LOG(VIDEO, "failed to create window"); - return NULL; + return false; } [window makeFirstResponder:GLWin.cocoaWin]; diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h index 9c4fe15299..080f45fd32 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.h +++ b/Source/Core/DolphinWX/Src/ISOFile.h @@ -83,7 +83,6 @@ private: bool m_Valid; bool m_BlobCompressed; std::vector m_pImage; - u32 m_ImageSize; bool m_IsDiscTwo; bool LoadFromCache(); diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index 8845eda961..e3db56e7fb 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -697,7 +697,7 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event) } } -bool TASInputDlg::HasFocus() +bool TASInputDlg::TASHasFocus() { //allows numbers to be used as hotkeys if(TextBoxHasFocus()) diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h index 46f2d50405..70f2db92a1 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.h +++ b/Source/Core/DolphinWX/Src/TASInputDlg.h @@ -34,7 +34,7 @@ class TASInputDlg : public wxDialog void GetKeyBoardInput(SPADStatus *PadStatus); bool TextBoxHasFocus(); void SetLandRTriggers(); - bool HasFocus(); + bool TASHasFocus(); wxBitmap CreateStickBitmap(int x, int y); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h index c6368fc33b..977760f579 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h @@ -68,7 +68,6 @@ private: void Cancel(wxCommandEvent& event); InputPlugin& m_plugin; - wxNotebook* m_pad_notebook; std::map m_wiimote_index_from_ctrl_id; unsigned int m_orig_wiimote_sources[MAX_BBMOTES]; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h index 930f849a17..e5c2c1b3d4 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h @@ -26,7 +26,7 @@ private: public: std::string GetName() const; bool IsDetectable() { return false; } - Cursor(u8 index, const float& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {} + Cursor(u8 index, const float& axis, const bool positive) : m_axis(axis), m_index(index), m_positive(positive) {} ControlState GetState() const; private: const float& m_axis; @@ -37,7 +37,7 @@ private: { public: std::string GetName() const; - Button(u8 index, const unsigned char& button) : m_index(index), m_button(button) {} + Button(u8 index, const unsigned char& button) : m_button(button), m_index(index) {} ControlState GetState() const; private: const unsigned char& m_button; @@ -63,7 +63,6 @@ private: const IOHIDDeviceRef m_device; const std::string m_device_name; int m_index; - void *m_window; uint32_t m_windowid; unsigned char m_mousebuttons[3]; }; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm index 003240d4a9..6473f00e77 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm @@ -16,7 +16,6 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win : m_device(device) , m_device_name(name) , m_index(index) - , m_window(window) { // This class should only recieve Keyboard or Keypad devices // Now, filter on just the buttons we can handle sanely diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h index d701625dfb..fee3c8022e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h @@ -40,7 +40,6 @@ class Tev s16 *m_ColorInputLUT[16][3]; s16 *m_AlphaInputLUT[8]; // values must point to ABGR color s16 *m_KonstLUT[32][4]; - u8 *m_RasColorLUT[8]; s16 m_BiasLUT[4]; u8 m_ScaleLShiftLUT[4]; u8 m_ScaleRShiftLUT[4]; From 403744dee83b04cdc27284491d121d045c64a99c Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 29 Aug 2013 01:42:45 -0400 Subject: [PATCH 012/267] Fix use of deprecated screen resolution API. (This is currently pointless, as the code in question is not used on OS X anyway, but I'd like to see that option come back. In any case, fixes the warning) --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index a606bf413e..0721ed3689 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -154,32 +154,32 @@ wxArrayString GetListOfResolutions() #elif defined(HAVE_XRANDR) && HAVE_XRANDR main_frame->m_XRRConfig->AddResolutions(retlist); #elif defined(__APPLE__) - CFArrayRef modes = CGDisplayAvailableModes(CGMainDisplayID()); + CFArrayRef modes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), NULL); for (CFIndex i = 0; i < CFArrayGetCount(modes); i++) { std::stringstream res; - CFDictionaryRef mode; - CFNumberRef ref; - int w, h, d; + CGDisplayModeRef mode; + CFStringRef encoding; + size_t w, h; + bool is32; - mode = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i); - ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayWidth); - CFNumberGetValue(ref, kCFNumberIntType, &w); - ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayHeight); - CFNumberGetValue(ref, kCFNumberIntType, &h); - ref = (CFNumberRef)CFDictionaryGetValue(mode, - kCGDisplayBitsPerPixel); - CFNumberGetValue(ref, kCFNumberIntType, &d); + mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + w = CGDisplayModeGetWidth(mode); + h = CGDisplayModeGetHeight(mode); + encoding = CGDisplayModeCopyPixelEncoding(mode); + is32 = CFEqual(encoding, CFSTR(IO32BitDirectPixels)); + CFRelease(encoding); - if (CFDictionaryContainsKey(mode, kCGDisplayModeIsStretched)) + if (!is32) continue; - if (d != 32) + if (CGDisplayModeGetIOFlags(mode) & kDisplayModeStretchedFlag) continue; res << w << "x" << h; retlist.Add(res.str()); } + CFRelease(modes); #endif return retlist; } From 186527544bb2e40f0a7994b729b397add02a1d67 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 29 Aug 2013 01:45:53 -0400 Subject: [PATCH 013/267] Fix use of deprecated APIs in IOdarwin.mm. --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 6f85f62a82..6e399f16ac 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -22,8 +22,8 @@ device: (IOBluetoothDevice *) device { NOTICE_LOG(WIIMOTE, "Discovered bluetooth device at %s: %s", - [[device getAddressString] UTF8String], - [[device getName] UTF8String]); + [[device addressString] UTF8String], + [[device name] UTF8String]); if ([[sender foundDevices] count] == maxDevices) [sender stop]; @@ -38,7 +38,7 @@ data: (unsigned char *) data length: (NSUInteger) length { - IOBluetoothDevice *device = [l2capChannel getDevice]; + IOBluetoothDevice *device = [l2capChannel device]; WiimoteReal::Wiimote *wm = NULL; std::lock_guard lk(WiimoteReal::g_refresh_lock); @@ -78,7 +78,7 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel { - IOBluetoothDevice *device = [l2capChannel getDevice]; + IOBluetoothDevice *device = [l2capChannel device]; WiimoteReal::Wiimote *wm = NULL; std::lock_guard lk(WiimoteReal::g_refresh_lock); @@ -211,7 +211,7 @@ bool Wiimote::Connect() [cchan retain]; NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s", - index + 1, [[btd getAddressString] UTF8String]); + index + 1, [[btd addressString] UTF8String]); m_connected = true; From c08f06f8c97fee407bf70c5c56bd0e861640ae79 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 29 Aug 2013 22:17:55 -0400 Subject: [PATCH 014/267] Fix IOCTLV_SO_GETADDRINFO. It tried to cast incoming pointers to native ones. The values are required to be null anyway, so it doesn't really matter, but it fixes a warning at least. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index f9e40110fb..4b61f20dac 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -1261,9 +1261,9 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress) hints.ai_socktype = Memory::Read_U32(_BufferIn3 + 0x8); hints.ai_protocol = Memory::Read_U32(_BufferIn3 + 0xC); hints.ai_addrlen = Memory::Read_U32(_BufferIn3 + 0x10); - hints.ai_canonname = (char*)Memory::Read_U32(_BufferIn3 + 0x14); - hints.ai_addr = (sockaddr *)Memory::Read_U32(_BufferIn3 + 0x18); - hints.ai_next = (addrinfo *)Memory::Read_U32(_BufferIn3 + 0x1C); + hints.ai_canonname = NULL; + hints.ai_addr = NULL; + hints.ai_next = NULL; } char* pNodeName = NULL; From de0a5fdfbb744c74bf5ce79ba1728d70c6af0ae2 Mon Sep 17 00:00:00 2001 From: comex Date: Fri, 30 Aug 2013 00:12:44 -0400 Subject: [PATCH 015/267] More trivial warning fixes. --- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 4 ++-- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 11 +++++------ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h | 6 +++--- Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 0bd3749a54..e65b0c50ac 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -123,8 +123,8 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { ReturnValue = FS_RESULT_FATAL; - const u64 fileSize = file.GetSize(); - INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); + const s32 fileSize = (s32) file.GetSize(); + INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08x)", SeekPosition, Mode, m_Name.c_str(), fileSize); switch (Mode) { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 4b61f20dac..3c652e72ca 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -1090,7 +1090,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress) u32 BufferInSize = 0, BufferInSize2 = 0, BufferInSize3 = 0; u32 _BufferOut = 0, _BufferOut2 = 0; - u32 BufferOutSize = 0, BufferOutSize2 = 0; + u32 BufferOutSize = 0; if (CommandBuffer.InBuffer.size() > 0) { @@ -1116,9 +1116,8 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress) if (CommandBuffer.PayloadBuffer.size() > 1) { _BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address; - BufferOutSize2 = CommandBuffer.PayloadBuffer.at(1).m_Size; } - + u32 param = 0, param2 = 0, param3, param4, param5 = 0; switch (CommandBuffer.Parameter) @@ -1134,9 +1133,9 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress) param5 = Memory::Read_U32(_BufferOut+4); } - INFO_LOG(WII_IPC_NET,"IOCTLV_SO_GETINTERFACEOPT(%08X, %08X) " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i)", - param, param2, + INFO_LOG(WII_IPC_NET,"IOCTLV_SO_GETINTERFACEOPT(%08X, %08X, %X, %X, %X) " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i) ", + param, param2, param3, param4, param5, _BufferIn, BufferInSize, _BufferIn2, BufferInSize2); switch (param2) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h index 36402a593a..95f75cffd7 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h @@ -480,7 +480,7 @@ public: u32 result = 0; u32 common_result = 0; // TODO Writes stuff to /shared2/nwc24/misc.bin - u32 update_misc = 0; + //u32 update_misc = 0; switch (Parameter) { @@ -490,12 +490,12 @@ public: case IOCTL_NW24_SET_UNIVERSAL_TIME: SetAdjustedUTC(Memory::Read_U64(BufferIn)); - update_misc = Memory::Read_U32(BufferIn + 8); + //update_misc = Memory::Read_U32(BufferIn + 8); break; case IOCTL_NW24_SET_RTC_COUNTER: rtc = Memory::Read_U32(BufferIn); - update_misc = Memory::Read_U32(BufferIn + 4); + //update_misc = Memory::Read_U32(BufferIn + 4); break; case IOCTL_NW24_GET_TIME_DIFF: diff --git a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp index 864030b7f5..80e8334989 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp @@ -518,7 +518,7 @@ void WiiSocket::update(bool read, bool write, bool except) || (it->is_ssl && ReturnValue != SSL_ERR_WAGAIN && ReturnValue != SSL_ERR_RAGAIN)) { DEBUG_LOG(WII_IPC_NET, "IOCTL(V) Sock: %08x ioctl/v: %d returned: %d nonBlock: %d forceNonBlock: %d", - fd, it->is_ssl ? it->ssl_type : it->net_type, ReturnValue, nonBlock, forceNonBlock); + fd, it->is_ssl ? (int) it->ssl_type : (int) it->net_type, ReturnValue, nonBlock, forceNonBlock); WiiSockMan::EnqueueReply(it->_CommandAddress, ReturnValue); it = pending_sockops.erase(it); } @@ -646,7 +646,7 @@ void WiiSockMan::Convert(sockaddr_in const & from, WiiSockAddrIn& to, s32 addrle to.addr.addr = from.sin_addr.s_addr; to.family = from.sin_family & 0xFF; to.port = from.sin_port; - if (addrlen < 0 || addrlen > sizeof(WiiSockAddrIn)) + if (addrlen < 0 || addrlen > (s32) sizeof(WiiSockAddrIn)) to.len = sizeof(WiiSockAddrIn); else to.len = addrlen; From 4f5729dd59bb3db74f889feeb673b22a3f2c3059 Mon Sep 17 00:00:00 2001 From: comex Date: Fri, 30 Aug 2013 00:35:36 -0400 Subject: [PATCH 016/267] MSVC warnings. --- Source/Core/Common/Src/StringUtil.cpp | 17 ++++++++--------- Source/Core/Core/Src/ActionReplay.cpp | 2 +- Source/Core/Core/Src/DSP/DSPEmitter.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp | 8 ++++---- .../Core/Core/Src/FifoPlayer/FifoRecorder.cpp | 4 ++-- Source/Core/Core/Src/HW/Memmap.cpp | 2 +- Source/Core/Core/Src/HW/Memmap.h | 2 +- Source/Core/DiscIO/Src/WbfsBlob.cpp | 4 ++-- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 3c0c01b25f..5d8a26446d 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -164,12 +164,11 @@ bool TryParse(const std::string &str, u32 *const output) if (errno == ERANGE) return false; - if (ULONG_MAX > UINT_MAX) { - // Note: The typecasts avoid GCC warnings when long is 32 bits wide. - if (value >= static_cast(0x100000000ull) - && value <= static_cast(0xFFFFFFFF00000000ull)) - return false; - } +#if ULONG_MAX > UINT_MAX + if (value >= 0x100000000ull + && value <= 0xFFFFFFFF00000000ull) + return false; +#endif *output = static_cast(value); return true; @@ -270,7 +269,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st { while(1) { - const int pos = result.find(src); + size_t pos = result.find(src); if (pos == -1) break; result.replace(pos, src.size(), dest); } @@ -317,7 +316,7 @@ std::string UriDecode(const std::string & sSrc) // for future extension" const unsigned char * pSrc = (const unsigned char *)sSrc.c_str(); - const int SRC_LEN = sSrc.length(); + const size_t SRC_LEN = sSrc.length(); const unsigned char * const SRC_END = pSrc + SRC_LEN; const unsigned char * const SRC_LAST_DEC = SRC_END - 2; // last decodable '%' @@ -379,7 +378,7 @@ std::string UriEncode(const std::string & sSrc) { const char DEC2HEX[16 + 1] = "0123456789ABCDEF"; const unsigned char * pSrc = (const unsigned char *)sSrc.c_str(); - const int SRC_LEN = sSrc.length(); + const size_t SRC_LEN = sSrc.length(); unsigned char * const pStart = new unsigned char[SRC_LEN * 3]; unsigned char * pEnd = pStart; const unsigned char * const SRC_END = pSrc + SRC_LEN; diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 7c1742a1cb..1ca57979e4 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -878,7 +878,7 @@ bool ConditionalCode(const ARAddr addr, const u32 data, int* const pSkipCount) // Skip lines until a "00000000 40000000" line is reached case CONDTIONAL_ALL_LINES: case CONDTIONAL_ALL_LINES_UNTIL: - *pSkipCount = -addr.subtype; + *pSkipCount = -(int) addr.subtype; break; default: diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp index 704a170bfc..a63d17628b 100644 --- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/Src/DSP/DSPEmitter.cpp @@ -342,7 +342,7 @@ void DSPEmitter::Compile(u16 start_addr) if (!unresolvedJumps[i].empty()) { // Check if there were any blocks waiting for this block to be linkable - unsigned int size = unresolvedJumps[i].size(); + size_t size = unresolvedJumps[i].size(); unresolvedJumps[i].remove(start_addr); if (unresolvedJumps[i].size() < size) { diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp index 1a693ede34..386c32d8bc 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp @@ -932,12 +932,12 @@ void DSPJitRegCache::writeReg(int dreg, OpArg arg) { switch(regs[dreg].size) { - case 2: emitter.MOV(16, reg, Imm16(arg.offset)); break; - case 4: emitter.MOV(32, reg, Imm32(arg.offset)); break; + case 2: emitter.MOV(16, reg, Imm16((u16) arg.offset)); break; + case 4: emitter.MOV(32, reg, Imm32((u32) arg.offset)); break; #ifdef _M_X64 case 8: - if ((s32)arg.offset == (s64)arg.offset) - emitter.MOV(64, reg, Imm32(arg.offset)); + if ((u32) arg.offset == arg.offset) + emitter.MOV(64, reg, Imm32((u32) arg.offset)); else emitter.MOV(64, reg, Imm64(arg.offset)); break; diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp index 5f3861fd66..26fb661162 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp @@ -75,14 +75,14 @@ void FifoRecorder::WriteGPCommand(u8 *data, u32 size) m_RecordAnalyzer.AnalyzeGPCommand(data); // Copy data to buffer - u32 currentSize = m_FifoData.size(); + size_t currentSize = m_FifoData.size(); m_FifoData.resize(currentSize + size); memcpy(&m_FifoData[currentSize], data, size); } if (m_FrameEnded && m_FifoData.size() > 0) { - u32 dataSize = m_FifoData.size(); + size_t dataSize = m_FifoData.size(); m_CurrentFrame.fifoDataSize = dataSize; m_CurrentFrame.fifoData = new u8[dataSize]; memcpy(m_CurrentFrame.fifoData, &m_FifoData[0], dataSize); diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 96f2945391..82b984fdb2 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -410,7 +410,7 @@ u32 Read_Instruction(const u32 em_address) return inst.hex; } -void WriteBigEData(const u8 *_pData, const u32 _Address, const u32 _iSize) +void WriteBigEData(const u8 *_pData, const u32 _Address, const size_t _iSize) { memcpy(GetPointer(_Address), _pData, _iSize); } diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h index a4cef35cf6..fe05539ae2 100644 --- a/Source/Core/Core/Src/HW/Memmap.h +++ b/Source/Core/Core/Src/HW/Memmap.h @@ -160,7 +160,7 @@ void Write_U64_Swap(const u64 _Data, const u32 _Address); void WriteHW_U32(const u32 _Data, const u32 _Address); void GetString(std::string& _string, const u32 _Address); -void WriteBigEData(const u8 *_pData, const u32 _Address, const u32 size); +void WriteBigEData(const u8 *_pData, const u32 _Address, const size_t size); void ReadBigEData(u8 *_pDest, const u32 _Address, const u32 size); u8* GetPointer(const u32 _Address); void DMA_LCToMemory(const u32 _iMemAddr, const u32 _iCacheAddr, const u32 _iNumBlocks); diff --git a/Source/Core/DiscIO/Src/WbfsBlob.cpp b/Source/Core/DiscIO/Src/WbfsBlob.cpp index 3983bd5ff6..f1d5a2b76a 100644 --- a/Source/Core/DiscIO/Src/WbfsBlob.cpp +++ b/Source/Core/DiscIO/Src/WbfsBlob.cpp @@ -81,7 +81,7 @@ bool WbfsFileReader::ReadHeader() hd_sector_count = Common::swap32(hd_sector_count); m_files[0]->file.ReadBytes(&hd_sector_shift, 1); - hd_sector_size = 1 << hd_sector_shift; + hd_sector_size = 1ull << hd_sector_shift; if(m_size != hd_sector_count * hd_sector_size) { @@ -91,7 +91,7 @@ bool WbfsFileReader::ReadHeader() // Read wbfs cluster info m_files[0]->file.ReadBytes(&wbfs_sector_shift, 1); - wbfs_sector_size = 1 << wbfs_sector_shift; + wbfs_sector_size = 1ull << wbfs_sector_shift; wbfs_sector_count = m_size / wbfs_sector_size; if(wbfs_sector_size < wii_sector_size) From 26301692290a30bc426f82a96324285909617127 Mon Sep 17 00:00:00 2001 From: comex Date: Fri, 30 Aug 2013 00:43:21 -0400 Subject: [PATCH 017/267] More warnings: mark/avert truncating conversions from float. --- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 2 +- Source/Core/Core/Src/HW/GCPadEmu.cpp | 2 +- Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp | 12 ++++++------ Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 6 +++--- Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 63f29c5a33..a67d5538ee 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -364,7 +364,7 @@ void CUCode_AXWii::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nv for (size_t i = 0; i < nvals; ++i) { curr += (vol2 - vol1) / (float)nvals; - output[i] = curr; + output[i] = (u16) curr; } } diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp index af4130b1bc..a1e07794c7 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.cpp +++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp @@ -119,7 +119,7 @@ void GCPad::GetInput(SPADStatus* const pad) void GCPad::SetMotor(const u8 on) { float state = (float)on / 255; - float force = abs(state - 0.5) * 2; + float force = abs(state - 0.5f) * 2; if (state < 0.5) force = -force; diff --git a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp index 03c140b992..6aa37d78e9 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp +++ b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp @@ -109,18 +109,18 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event)) if (strcmp((*g)->control_group->name, "Main Stick") == 0) { - max = (87.0 / 127.0) * 100; - diagonal = (55.0 / 127.0) * 100.0; + max = (87.0f / 127.0f) * 100; + diagonal = (55.0f / 127.0f) * 100.0; } else if (strcmp((*g)->control_group->name,"C-Stick") == 0) { - max = (74.0 / 127.0) * 100; - diagonal = (46.0 / 127.0) * 100; + max = (74.0f / 127.0f) * 100; + diagonal = (46.0f / 127.0f) * 100; } else { - max = (82.0 / 127.0) * 100; - diagonal = (58.0 / 127.0) * 100; + max = (82.0f / 127.0f) * 100; + diagonal = (58.0f / 127.0f) * 100; } // polygon corners diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index bd4f9fed98..f11d7afd0b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1318,7 +1318,7 @@ void Renderer::SetLineWidth() // We can't change line width in D3D unless we use ID3DXLine float fratio = xfregs.viewport.wd != 0 ? Renderer::EFBToScaledXf(1.f) : 1.0f; float psize = bpmem.lineptwidth.pointsize * fratio / 6.0f; - psize = psize > 0 ? psize : 1.0; + psize = psize > 0 ? psize : 1.0f; if (psize > m_fMaxPointSize) { psize = m_fMaxPointSize; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 9011b072e8..9e46a5eb86 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -189,8 +189,8 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta int usage = 0; GLfloat delta_x = GLfloat(2*char_width)/GLfloat(bbWidth); GLfloat delta_y = GLfloat(2*char_height)/GLfloat(bbHeight); - GLfloat border_x = 2.0/GLfloat(bbWidth); - GLfloat border_y = 4.0/GLfloat(bbHeight); + GLfloat border_x = 2.0f/GLfloat(bbWidth); + GLfloat border_y = 4.0f/GLfloat(bbHeight); GLfloat x = GLfloat(start_x); GLfloat y = GLfloat(start_y); @@ -199,7 +199,7 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta u8 c = text[i]; if(c == '\n') { - x = start_x; + x = GLfloat(start_x); y -= delta_y + border_y; continue; } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index 7ab798e2fb..effe1d3261 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -755,7 +755,7 @@ void Tev::Draw() // First, calculate the offset from the viewport center (normalized to 0..1) float offset = (Position[0] - (bpmem.fogRange.Base.Center - 342)) / (float)swxfregs.viewport.wd; // Based on that, choose the index such that points which are far away from the z-axis use the 10th "k" value and such that central points use the first value. - int index = 9 - std::abs(offset) * 9.f; + int index = (int) (9 - std::abs(offset) * 9.f); index = (index < 0) ? 0 : (index > 9) ? 9 : index; // TODO: Shouldn't be necessary! // Look up coefficient... Seems like multiplying by 4 makes Fortune Street work properly (fog is too strong without the factor) float k = bpmem.fogRange.K[index/2].GetValue(index%2) * 4.f; From 35b8dfbe0cd9826c857d8faa8f6c5475487a32e0 Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 1 Sep 2013 23:25:57 -0400 Subject: [PATCH 018/267] A few more warnings. --- Source/Core/Common/Src/ArmEmitter.cpp | 4 +++- Source/Core/Common/Src/StringUtil.cpp | 2 +- Source/Core/Core/Src/ec_wii.cpp | 2 +- Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp | 2 +- Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h | 3 +-- Source/Core/VideoCommon/Src/x64TextureDecoder.cpp | 6 ++++++ Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 4 ++-- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index 03f29da8bc..fd62b0b2c9 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -86,6 +86,7 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated) Operand2 AssumeMakeOperand2(u32 imm) { Operand2 op2; bool result = TryMakeOperand2(imm, op2); + (void) result; _dbg_assert_msg_(DYNA_REC, result, "Could not make assumed Operand2."); return op2; } @@ -958,7 +959,7 @@ extern const VFPEnc VFPOps[16][2] = { {{ -1, -1}, {0x3B, 0x30}}, // 14: VABSi }; -extern const char *VFPOpNames[16] = { +const char *VFPOpNames[16] = { "VMLA", "VNMLA", "VMLS", @@ -1189,6 +1190,7 @@ void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src) } // Moving NEON registers int SrcSize = Src < D0 ? 1 : Src < Q0 ? 2 : 4; + (void) SrcSize; int DestSize = Dest < D0 ? 1 : Dest < Q0 ? 2 : 4; bool Single = DestSize == 1; bool Quad = DestSize == 4; diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 5d8a26446d..189dfe98bc 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -270,7 +270,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st while(1) { size_t pos = result.find(src); - if (pos == -1) break; + if (pos == std::string::npos) break; result.replace(pos, src.size(), dest); } return result; diff --git a/Source/Core/Core/Src/ec_wii.cpp b/Source/Core/Core/Src/ec_wii.cpp index 7fc000d1c8..5a68cc6fb5 100644 --- a/Source/Core/Core/Src/ec_wii.cpp +++ b/Source/Core/Core/Src/ec_wii.cpp @@ -153,7 +153,7 @@ EcWii::EcWii() } else { - ERROR_LOG(WII_IPC_ES, "Failed to read keys.bin, check it is the correct size of %08lX bytes.", sizeof(BootMiiKeysBin)); + ERROR_LOG(WII_IPC_ES, "Failed to read keys.bin, check it is the correct size of %08X bytes.", (unsigned int) sizeof(BootMiiKeysBin)); } } else diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp index 31985f374f..091804e786 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp +++ b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp @@ -62,7 +62,7 @@ void CWiiSaveCrypted::ExportAllSaves() } } } - SuccessAlertT("Found %llx save files", titles.size()); + SuccessAlertT("Found %x save files", (unsigned int) titles.size()); for (u32 i = 0; i < titles.size(); ++i) { CWiiSaveCrypted* exportSave = new CWiiSaveCrypted("", titles[i]); diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h index 0f3c1d1716..29a3e1f530 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h +++ b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h @@ -42,8 +42,7 @@ private: std::string encryptedSavePath; - std::string BannerFilePath, - WiiTitlePath; + std::string WiiTitlePath; u8 IV[0x10]; diff --git a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp index e12b62d5a7..4c26509878 100644 --- a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp @@ -28,6 +28,12 @@ #include #endif +// This avoids a harmless warning from a system header in Clang; +// see http://llvm.org/bugs/show_bug.cgi?id=16093 +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wshadow" +#endif + bool TexFmt_Overlay_Enable=false; bool TexFmt_Overlay_Center=false; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 0e02fcb326..c94776ef7f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -30,8 +30,8 @@ #define GL_READ_WRITE 0x88BA #define GL_SRC1_ALPHA 0 #define GL_BGRA GL_RGBA -#define glDrawElementsBaseVertex -#define glDrawRangeElementsBaseVertex +#define glDrawElementsBaseVertex(...) +#define glDrawRangeElementsBaseVertex(...) #endif #else #define TEX2D GL_TEXTURE_RECTANGLE_ARB From 0219049c0393db23fc20571a88b03fe097914226 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 2 Sep 2013 01:28:48 -0400 Subject: [PATCH 019/267] Fix an accidental duplicate if-statement handling of 0x1007 in WII_IPC_HLE_Device_net.cpp --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 3c652e72ca..cf5ede4c35 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -752,11 +752,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress) Memory::Write_U32(optlen, BufferOut + 0xC); Memory::WriteBigEData((u8 *) optval, BufferOut + 0x10, optlen); - if (optname == 0x1007){ - s32 errorcode = Memory::Read_U32(BufferOut + 0x10); - INFO_LOG(WII_IPC_NET,"IOCTL_SO_GETSOCKOPT error code = %i", errorcode); - } - else if (optname == SO_ERROR) + if (optname == SO_ERROR) { s32 last_error = WiiSockMan::getInstance().getLastNetError(); From 831963616f8411aaf7b59d3936019ba3c601df23 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 2 Sep 2013 01:40:05 -0500 Subject: [PATCH 020/267] [Android] Make texture loading/deleting/drawing backend non-specific by making them happen in the backend instead of somewhere else. Just a clean up commit really. --- .../DolphinWX/Src/Android/ButtonManager.cpp | 7 +-- .../DolphinWX/Src/Android/ButtonManager.h | 14 ++++-- .../DolphinWX/Src/Android/TextureLoader.cpp | 47 +++++++------------ .../DolphinWX/Src/Android/TextureLoader.h | 2 +- .../Core/VideoCommon/Src/VideoBackendBase.h | 12 +++++ .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 17 ++++--- .../Plugin_VideoSoftware/Src/SWRenderer.h | 1 + .../Plugin_VideoSoftware/Src/SWmain.cpp | 26 ++++++++++ .../Plugin_VideoSoftware/Src/VideoBackend.h | 4 ++ 9 files changed, 83 insertions(+), 47 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp index 15cc371126..41f9ce20d0 100644 --- a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp @@ -181,13 +181,8 @@ namespace ButtonManager void DrawButtons() { - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it) - DrawButton((*it)->GetTexture(), (*it)->GetCoords()); - - glDisable(GL_BLEND); + g_video_backend->Video_DrawTexture((*it)->GetTexture(), (*it)->GetCoords()); } // InputDevice diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.h b/Source/Core/DolphinWX/Src/Android/ButtonManager.h index c312b9786a..f2b7c1c5cb 100644 --- a/Source/Core/DolphinWX/Src/Android/ButtonManager.h +++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.h @@ -21,6 +21,7 @@ #include #include "CommonPaths.h" #include "Android/TextureLoader.h" +#include "VideoBackendBase.h" namespace ButtonManager { @@ -60,14 +61,21 @@ namespace ButtonManager class Button { private: - GLuint m_tex; + int m_tex; ButtonType m_button; ButtonState m_state; float m_coords[8]; public: Button(std::string filename, ButtonType button, float *coords) { - m_tex = LoadPNG((std::string(DOLPHIN_DATA_DIR "/") + filename).c_str()); + u32 width, height; + char *image; + image = LoadPNG((std::string(DOLPHIN_DATA_DIR "/") + filename).c_str(), width, height); + + m_tex = g_video_backend->Video_LoadTexture(image, width, height); + + free(image); + m_button = button; memcpy(m_coords, coords, sizeof(float) * 8); m_state = BUTTON_RELEASED; @@ -83,7 +91,7 @@ namespace ButtonManager GLuint GetTexture() { return m_tex; } float *GetCoords() { return m_coords; } - ~Button() { if(m_tex) glDeleteTextures(1, &m_tex); } + ~Button() { g_video_backend->Video_DeleteTexture(m_tex); } }; struct sBind diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp b/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp index 077cf32a1a..093370da78 100644 --- a/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp +++ b/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp @@ -17,8 +17,7 @@ #include "GLInterface.h" #include - -GLuint LoadPNG(const char *filename) +char* LoadPNG(const char *filename, u32 &width, u32 &height) { FILE *infile; /* PNG file pointer */ png_structp png_ptr; /* internally used by libpng */ @@ -31,8 +30,8 @@ GLuint LoadPNG(const char *filename) int bit_depth; int color_type; - png_uint_32 width; /* PNG image width in pixels */ - png_uint_32 height; /* PNG image height in pixels */ + png_uint_32 _width; + png_uint_32 _height; unsigned int rowbytes; /* raw bytes at row n in image */ image_data = NULL; @@ -42,7 +41,7 @@ GLuint LoadPNG(const char *filename) /* Open the file. */ infile = fopen(filename, "rb"); if (!infile) - return 0; + return NULL; /* * 13.3 readpng_init() @@ -53,7 +52,7 @@ GLuint LoadPNG(const char *filename) if (!png_check_sig((unsigned char *) sig, 8)) { fclose(infile); - return 0; + return NULL; } /* @@ -62,14 +61,14 @@ GLuint LoadPNG(const char *filename) png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) { fclose(infile); - return 4; /* out of memory */ + return NULL; /* out of memory */ } info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL); fclose(infile); - return 4; /* out of memory */ + return NULL; /* out of memory */ } @@ -80,7 +79,7 @@ GLuint LoadPNG(const char *filename) if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fclose(infile); - return 0; + return NULL; } /* @@ -108,7 +107,7 @@ GLuint LoadPNG(const char *filename) /* read all the info up to the image data */ png_read_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, + png_get_IHDR(png_ptr, info_ptr, &_width, &_height, &bit_depth, &color_type, NULL, NULL, NULL); /* Set up some transforms. */ @@ -129,22 +128,22 @@ GLuint LoadPNG(const char *filename) /* Allocate the image_data buffer. */ - if ((image_data = (char *) malloc(rowbytes * height))==NULL) { + if ((image_data = (char *) malloc(rowbytes * _height))==NULL) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return 4; + return NULL; } - if ((row_pointers = (png_bytepp)malloc(height*sizeof(png_bytep))) == NULL) { + if ((row_pointers = (png_bytepp)malloc(_height*sizeof(png_bytep))) == NULL) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); free(image_data); image_data = NULL; - return 4; + return NULL; } /* set the individual row_pointers to point at the correct offsets */ - for (i = 0; i < height; ++i) + for (i = 0; i < _height; ++i) row_pointers[i] = (png_byte*)(image_data + i*rowbytes); @@ -161,19 +160,7 @@ GLuint LoadPNG(const char *filename) png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fclose(infile); - GLuint Texture = 0; - glGenTextures(1, &Texture); - - /* create a new texture object - * and bind it to texname (unsigned integer > 0) - */ - glBindTexture(GL_TEXTURE_2D, Texture); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, - GL_RGBA, GL_UNSIGNED_BYTE, image_data); - return Texture; + width = (u32)_width; + height = (u32)_height; + return image_data; } diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.h b/Source/Core/DolphinWX/Src/Android/TextureLoader.h index 69575807e6..db55078f1d 100644 --- a/Source/Core/DolphinWX/Src/Android/TextureLoader.h +++ b/Source/Core/DolphinWX/Src/Android/TextureLoader.h @@ -17,5 +17,5 @@ #include "GLInterface.h" -GLuint LoadPNG(const char *filename); +char* LoadPNG(const char *filename, u32 &width, u32 &height); diff --git a/Source/Core/VideoCommon/Src/VideoBackendBase.h b/Source/Core/VideoCommon/Src/VideoBackendBase.h index 9c591d05a5..7f8c90b2be 100644 --- a/Source/Core/VideoCommon/Src/VideoBackendBase.h +++ b/Source/Core/VideoCommon/Src/VideoBackendBase.h @@ -103,6 +103,14 @@ public: virtual void Video_ClearMessages() = 0; virtual bool Video_Screenshot(const char* filename) = 0; + // Loads a texture, -1 on not loaded + // Texture is passed in as RGBA data + virtual int Video_LoadTexture(char *imagedata, u32 width, u32 height) = 0; + // Deletes a texture loaded from LoadTexture + virtual void Video_DeleteTexture(int texID) = 0; + // Draws a texture, arg1 is the value returned by LoadTexture, arg2 is the screen coordinates + virtual void Video_DrawTexture(int texID, float *coords) = 0; + virtual void Video_SetRendering(bool bEnabled) = 0; virtual void Video_GatherPipeBursted() = 0; @@ -155,6 +163,10 @@ class VideoBackendHardware : public VideoBackend void Video_ClearMessages(); bool Video_Screenshot(const char* filename); + int Video_LoadTexture(char *imagedata, u32 width, u32 height) { return -1; } + void Video_DeleteTexture(int texID) {} + void Video_DrawTexture(int texID, float *coords) {} + void Video_SetRendering(bool bEnabled); void Video_GatherPipeBursted(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index a395025808..e56a4b7b37 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -122,12 +122,13 @@ void SWRenderer::DrawDebugText() SWRenderer::RenderText(debugtext_buffer, 21, 21, 0xDD000000); SWRenderer::RenderText(debugtext_buffer, 20, 20, 0xFFFFFF00); } -#ifdef ANDROID -// XXX: This /really/ shouldn't be here -// But for now, we don't have a generic way for all backends to draw the buttons on screen. -// Once that is implemented, we can remove this -void DrawButton(GLuint tex, float *coords) + +// XXX: We should /really/ be outputting textures to the texture image instead of this way. +void SWRenderer::DrawButton(int texID, float *coords) { + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + //Texture rectangle uses pixel coordinates #ifndef USE_GLES GLfloat u_max = (GLfloat)width; @@ -147,7 +148,7 @@ void DrawButton(GLuint tex, float *coords) {1, 1} }; #endif - glBindTexture(TEX2D, tex); + glBindTexture(TEX2D, texID); glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, coords); glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); @@ -160,8 +161,10 @@ void DrawButton(GLuint tex, float *coords) glDisableVertexAttribArray(attr_tex); glBindTexture(TEX2D, 0); + + glDisable(GL_BLEND); } -#endif + void SWRenderer::DrawTexture(u8 *texture, int width, int height) { GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h index ba856936cb..5629976978 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h @@ -16,6 +16,7 @@ namespace SWRenderer void RenderText(const char* pstr, int left, int top, u32 color); void DrawDebugText(); + void DrawButton(int texId, float *coords); void DrawTexture(u8 *texture, int width, int height); void SwapBuffer(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index c63ad2e446..6e1aff4e46 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -242,6 +242,32 @@ bool VideoSoftware::Video_Screenshot(const char *_szFilename) return false; } +int VideoSoftware::Video_LoadTexture(char *image, u32 width, u32 height) +{ + GLuint Texture = 0; + glGenTextures(1, &Texture); + + glBindTexture(GL_TEXTURE_2D, Texture); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, + GL_RGBA, GL_UNSIGNED_BYTE, image); + + return (int) Texture; +} +void VideoSoftware::Video_DeleteTexture(int texID) +{ + if (texID == -1) return; + glDeleteTextures(1, (GLuint*)&texID); +} +void VideoSoftware::Video_DrawTexture(int texID, float *coords) +{ + if (texID == -1) return; + SWRenderer::DrawButton(texID, coords); +} // ------------------------------- // Enter and exit the video loop // ------------------------------- diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index 37fe817f07..a105e66eba 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -35,6 +35,10 @@ class VideoSoftware : public VideoBackend void Video_ClearMessages(); bool Video_Screenshot(const char* filename); + int Video_LoadTexture(char *imagedata, u32 width, u32 height); + void Video_DeleteTexture(int texID); + void Video_DrawTexture(int texID, float *coords); + void Video_SetRendering(bool bEnabled); void Video_GatherPipeBursted(); From 679957dc983f40893bd2f4fb6d0e75b43a0f13cc Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 2 Sep 2013 01:44:46 -0500 Subject: [PATCH 021/267] Fix Non-GLES run path in videosoftware for the previous commit. --- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index e56a4b7b37..3be03147d6 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -129,26 +129,14 @@ void SWRenderer::DrawButton(int texID, float *coords) glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - //Texture rectangle uses pixel coordinates -#ifndef USE_GLES - GLfloat u_max = (GLfloat)width; - GLfloat v_max = (GLfloat)height; - - static const GLfloat texverts[4][2] = { - {0, v_max}, - {0, 0}, - {u_max, 0}, - {u_max, v_max} - }; -#else static const GLfloat texverts[4][2] = { {0, 1}, {0, 0}, {1, 0}, {1, 1} }; -#endif - glBindTexture(TEX2D, texID); + + glBindTexture(GL_TEXTURE_2D, texID); glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, coords); glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); @@ -160,7 +148,7 @@ void SWRenderer::DrawButton(int texID, float *coords) glDisableVertexAttribArray(attr_pos); glDisableVertexAttribArray(attr_tex); - glBindTexture(TEX2D, 0); + glBindTexture(GL_TEXTURE_2D, 0); glDisable(GL_BLEND); } From e7157e7c5285e668cef909409c319597336beda2 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 2 Sep 2013 04:10:21 -0500 Subject: [PATCH 022/267] [Android] Fix fastmem and enable. --- Source/Core/Common/Src/MemArena.cpp | 14 ++--- .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 58 ++++++++++--------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index b7400a978e..c8267c4411 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -143,20 +143,20 @@ u8* MemArena::Find4GBBase() return base; #else #ifdef ANDROID - const u32 MemSize = 0x04000000; + // Android 4.3 changed how mmap works. + // if we map it private and then munmap it, we can't use the base returned. + // This may be due to changes in them support a full SELinux implementation. + const int flags = MAP_ANON; #else - const u32 MemSize = 0x31000000; + const int flags = MAP_ANON | MAP_PRIVATE; #endif - void* base = mmap(0, MemSize, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0); + const u32 MemSize = 0x31000000; + void* base = mmap(0, MemSize, PROT_NONE, flags, -1, 0); if (base == MAP_FAILED) { PanicAlert("Failed to map 1 GB of memory space: %s", strerror(errno)); return 0; } -#ifndef ANDROID - // Android 4.3 changes how munmap works which causes crashes. - // Keep the memory space after allocating it... munmap(base, MemSize); -#endif return static_cast(base); #endif #endif diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index c9d6394873..505b7a2044 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -32,7 +32,7 @@ #include "JitAsm.h" #ifdef ANDROID -#define FASTMEM 0 +#define FASTMEM 1 #else #define FASTMEM 1 #endif @@ -455,36 +455,40 @@ void JitArm::lhz(UGeckoInstruction inst) // Backpatch route // Gets loaded in to RD // Address is in R10 - gpr.Unlock(rA, rB); - if (inst.RA) + if (Core::g_CoreStartupParameter.bFastmem) { - ARMReg RA = gpr.R(inst.RA); - MOV(R10, RA); // - 4 + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + MOV(R10, RA); // - 4 + } + else + MOV(R10, 0); // - 4 + + LoadToReg(RD, R10, 16, (u32)inst.SIMM_16); } else - MOV(R10, 0); // - 4 - - LoadToReg(RD, R10, 16, (u32)inst.SIMM_16); -#else - - if (inst.RA) - { - MOVI2R(rB, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(rB, rB, RA); - } - else - MOVI2R(rB, (u32)inst.SIMM_16); - - MOVI2R(rA, (u32)&Memory::Read_U16); - PUSH(4, R0, R1, R2, R3); - MOV(R0, rB); - BL(rA); - MOV(rA, R0); - POP(4, R0, R1, R2, R3); - MOV(RD, rA); - gpr.Unlock(rA, rB); #endif + { + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U16); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + } + + gpr.Unlock(rA, rB); SetJumpTarget(DoNotLoad); } void JitArm::lha(UGeckoInstruction inst) From 2897619ddbd3e3aae8427fc503647c65e770d466 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 2 Sep 2013 05:31:48 -0500 Subject: [PATCH 023/267] Removal of my terrible idea. --- Source/Android/res/xml/video_prefs.xml | 3 +- .../dolphinemu/EmulationActivity.java | 16 +++------- .../DolphinWX/Src/Android/ButtonManager.cpp | 3 +- .../DolphinWX/Src/Android/ButtonManager.h | 9 ++---- .../Core/VideoCommon/Src/VideoBackendBase.h | 12 -------- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 30 ------------------- .../Plugin_VideoSoftware/Src/SWRenderer.h | 1 - .../Plugin_VideoSoftware/Src/SWmain.cpp | 26 ---------------- 8 files changed, 10 insertions(+), 90 deletions(-) diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml index 6ec29c13a0..311c6ce8a9 100644 --- a/Source/Android/res/xml/video_prefs.xml +++ b/Source/Android/res/xml/video_prefs.xml @@ -129,9 +129,10 @@ android:key="showFPS" android:summary="@string/show_fps_descrip" android:title="@string/show_fps"/> - + \ No newline at end of file diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java index 71f896097c..09c7c86e70 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java @@ -1,9 +1,5 @@ package org.dolphinemu.dolphinemu; -import java.util.List; - -import org.dolphinemu.dolphinemu.settings.InputConfigFragment; - import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -11,15 +7,11 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.util.DisplayMetrics; -import android.view.InputDevice; -import android.view.KeyEvent; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.Window; -import android.view.WindowManager; +import android.view.*; import android.view.WindowManager.LayoutParams; +import org.dolphinemu.dolphinemu.settings.InputConfigFragment; + +import java.util.List; /** * This is the activity where all of the emulation handling happens. diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp index 41f9ce20d0..d3aa1c2a93 100644 --- a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp @@ -181,8 +181,7 @@ namespace ButtonManager void DrawButtons() { - for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it) - g_video_backend->Video_DrawTexture((*it)->GetTexture(), (*it)->GetCoords()); + // XXX: Make platform specific drawing } // InputDevice diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.h b/Source/Core/DolphinWX/Src/Android/ButtonManager.h index f2b7c1c5cb..bc5204d9bf 100644 --- a/Source/Core/DolphinWX/Src/Android/ButtonManager.h +++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.h @@ -70,12 +70,9 @@ namespace ButtonManager { u32 width, height; char *image; - image = LoadPNG((std::string(DOLPHIN_DATA_DIR "/") + filename).c_str(), width, height); + // image = LoadPNG((std::string(DOLPHIN_DATA_DIR "/") + filename).c_str(), width, height); + // XXX: Make platform specific drawing - m_tex = g_video_backend->Video_LoadTexture(image, width, height); - - free(image); - m_button = button; memcpy(m_coords, coords, sizeof(float) * 8); m_state = BUTTON_RELEASED; @@ -91,7 +88,7 @@ namespace ButtonManager GLuint GetTexture() { return m_tex; } float *GetCoords() { return m_coords; } - ~Button() { g_video_backend->Video_DeleteTexture(m_tex); } + ~Button() { } }; struct sBind diff --git a/Source/Core/VideoCommon/Src/VideoBackendBase.h b/Source/Core/VideoCommon/Src/VideoBackendBase.h index 7f8c90b2be..9c591d05a5 100644 --- a/Source/Core/VideoCommon/Src/VideoBackendBase.h +++ b/Source/Core/VideoCommon/Src/VideoBackendBase.h @@ -103,14 +103,6 @@ public: virtual void Video_ClearMessages() = 0; virtual bool Video_Screenshot(const char* filename) = 0; - // Loads a texture, -1 on not loaded - // Texture is passed in as RGBA data - virtual int Video_LoadTexture(char *imagedata, u32 width, u32 height) = 0; - // Deletes a texture loaded from LoadTexture - virtual void Video_DeleteTexture(int texID) = 0; - // Draws a texture, arg1 is the value returned by LoadTexture, arg2 is the screen coordinates - virtual void Video_DrawTexture(int texID, float *coords) = 0; - virtual void Video_SetRendering(bool bEnabled) = 0; virtual void Video_GatherPipeBursted() = 0; @@ -163,10 +155,6 @@ class VideoBackendHardware : public VideoBackend void Video_ClearMessages(); bool Video_Screenshot(const char* filename); - int Video_LoadTexture(char *imagedata, u32 width, u32 height) { return -1; } - void Video_DeleteTexture(int texID) {} - void Video_DrawTexture(int texID, float *coords) {} - void Video_SetRendering(bool bEnabled); void Video_GatherPipeBursted(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 3be03147d6..ad47a1a777 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -123,36 +123,6 @@ void SWRenderer::DrawDebugText() SWRenderer::RenderText(debugtext_buffer, 20, 20, 0xFFFFFF00); } -// XXX: We should /really/ be outputting textures to the texture image instead of this way. -void SWRenderer::DrawButton(int texID, float *coords) -{ - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - static const GLfloat texverts[4][2] = { - {0, 1}, - {0, 0}, - {1, 0}, - {1, 1} - }; - - glBindTexture(GL_TEXTURE_2D, texID); - - glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, coords); - glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); - glEnableVertexAttribArray(attr_pos); - glEnableVertexAttribArray(attr_tex); - glActiveTexture(GL_TEXTURE0); - glUniform1i(uni_tex, 0); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - glDisableVertexAttribArray(attr_pos); - glDisableVertexAttribArray(attr_tex); - - glBindTexture(GL_TEXTURE_2D, 0); - - glDisable(GL_BLEND); -} - void SWRenderer::DrawTexture(u8 *texture, int width, int height) { GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h index 5629976978..ba856936cb 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h @@ -16,7 +16,6 @@ namespace SWRenderer void RenderText(const char* pstr, int left, int top, u32 color); void DrawDebugText(); - void DrawButton(int texId, float *coords); void DrawTexture(u8 *texture, int width, int height); void SwapBuffer(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 6e1aff4e46..c63ad2e446 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -242,32 +242,6 @@ bool VideoSoftware::Video_Screenshot(const char *_szFilename) return false; } -int VideoSoftware::Video_LoadTexture(char *image, u32 width, u32 height) -{ - GLuint Texture = 0; - glGenTextures(1, &Texture); - - glBindTexture(GL_TEXTURE_2D, Texture); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, - GL_RGBA, GL_UNSIGNED_BYTE, image); - - return (int) Texture; -} -void VideoSoftware::Video_DeleteTexture(int texID) -{ - if (texID == -1) return; - glDeleteTextures(1, (GLuint*)&texID); -} -void VideoSoftware::Video_DrawTexture(int texID, float *coords) -{ - if (texID == -1) return; - SWRenderer::DrawButton(texID, coords); -} // ------------------------------- // Enter and exit the video loop // ------------------------------- From beb57d7fbd40da2c6301fd386736a16b5c59de86 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 2 Sep 2013 13:14:45 +0200 Subject: [PATCH 024/267] ogl: reorder driver extensions checks --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 86 ++++++++++--------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 504e58f85b..81d791f225 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -385,22 +385,34 @@ Renderer::Renderer() g_ogl_config.bSupportOGL31 = false; g_ogl_config.eSupportedGLSLVersion = GLSLES3; #else - GLint numvertexattribs = 0; - glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &numvertexattribs); - if (numvertexattribs < 16) - { - ERROR_LOG(VIDEO, "GPU: OGL ERROR: Number of attributes %d not enough.\n" - "GPU: Does your video card support OpenGL 2.x?", - numvertexattribs); - bSuccess = false; - } #ifdef __APPLE__ glewExperimental = 1; #endif if (glewInit() != GLEW_OK) { - ERROR_LOG(VIDEO, "glewInit() failed! Does your video card support OpenGL 2.x?"); - return; // TODO: fail + PanicAlert("glewInit() failed! Does your video card support OpenGL 2.x?"); + return; + } + + // check for the max vertex attributes + GLint numvertexattribs = 0; + glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &numvertexattribs); + if (numvertexattribs < 16) + { + PanicAlert("GPU: OGL ERROR: Number of attributes %d not enough.\n" + "GPU: Does your video card support OpenGL 2.x?", + numvertexattribs); + bSuccess = false; + } + + // check the max texture width and height + GLint max_texture_size; + glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&max_texture_size); + if (max_texture_size < 1024) + { + PanicAlert("GL_MAX_TEXTURE_SIZE too small at %i - must be at least 1024.", + max_texture_size); + bSuccess = false; } #if defined(_DEBUG) || defined(DEBUGFAST) @@ -412,43 +424,49 @@ Renderer::Renderer() } #endif - if (!GLEW_EXT_secondary_color) + if (!GLEW_VERSION_2_0) { - ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need GL_EXT_secondary_color.\n" - "GPU: Does your video card support OpenGL 2.x?"); + // OpenGL 2.0 is required for all shader based drawings. There is no way to get this by extensions + PanicAlert("GPU: OGL ERROR: Does your video card support OpenGL 2.0?"); bSuccess = false; } if (!GLEW_ARB_framebuffer_object) { - ERROR_LOG(VIDEO, "GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n" + // We want the ogl3 framebuffer instead of the ogl2 one for better blitting support. + // It's also compatible with the gles3 one. + PanicAlert("GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n" "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } if (!GLEW_ARB_vertex_array_object) { - ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" + // This extension is used to replace lots of pointer setting function. + // Also gles3 requires to use it. + PanicAlert("GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } if (!GLEW_ARB_map_buffer_range) { - ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n" + // ogl3 buffer mapping for better streaming support. + // The ogl2 one also isn't in gles3. + PanicAlert("GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n" "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } if (!GLEW_ARB_sampler_objects && bSuccess) { - ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need GL_ARB_sampler_objects." - "GPU: Does your video card support OpenGL 3.2?" + // Our sampler cache uses this extension. It could easyly be workaround and it's by far the + // highest requirement, but it seems that no driver lacks support for it. + PanicAlert("GPU: OGL ERROR: Need GL_ARB_sampler_objects." + "GPU: Does your video card support OpenGL 3.3?" "Please report this issue, then there will be a workaround"); bSuccess = false; } - if (!GLEW_ARB_texture_non_power_of_two) - WARN_LOG(VIDEO, "ARB_texture_non_power_of_two not supported."); // OpenGL 3 doesn't provide GLES like float functions for depth. // They are in core in OpenGL 4.1, so almost every driver should support them. @@ -459,9 +477,6 @@ Renderer::Renderer() glClearDepthf = ClearDepthf; } - - if (!bSuccess) - return; // TODO: fail g_Config.backend_info.bSupportsDualSourceBlend = GLEW_ARB_blend_func_extended; g_Config.backend_info.bSupportsGLSLUBO = GLEW_ARB_uniform_buffer_object; @@ -478,7 +493,7 @@ Renderer::Renderer() if(strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10")) { - ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need at least GLSL 1.20\n" + PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.20\n" "GPU: Does your video card support OpenGL 2.1?\n" "GPU: Your driver supports GLSL %s", g_ogl_config.glsl_version); bSuccess = false; @@ -503,7 +518,13 @@ Renderer::Renderer() { g_ogl_config.eSupportedGLSLVersion = GLSL_150; } -#endif +#endif + if (!bSuccess) + { + // Not all needed extensions are supported, so we have to stop here. + // Else some of the next calls might crash. + return; + } glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples); if(g_ogl_config.max_samples < 1) @@ -550,16 +571,6 @@ Renderer::Renderer() s_vsync = g_ActiveConfig.IsVSync(); GLInterface->SwapInterval(s_vsync); - // check the max texture width and height - GLint max_texture_size; - glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&max_texture_size); - if (max_texture_size < 1024) - ERROR_LOG(VIDEO, "GL_MAX_TEXTURE_SIZE too small at %i - must be at least 1024.", - max_texture_size); - - if (GL_REPORT_ERROR() != GL_NO_ERROR) - bSuccess = false; - // TODO: Move these somewhere else? FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); @@ -572,9 +583,6 @@ Renderer::Renderer() // Because of the fixed framebuffer size we need to disable the resolution // options while running g_Config.bRunning = true; - - if (GL_REPORT_ERROR() != GL_NO_ERROR) - bSuccess = false; glStencilFunc(GL_ALWAYS, 0, 0); glBlendFunc(GL_ONE, GL_ONE); From 1b1cc82e5b0b6306cbb50cf6cc617e0e087c82a7 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 2 Sep 2013 13:33:36 +0200 Subject: [PATCH 025/267] rename vertex streaming hack tooltip String is copyed from issue 6552. --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 0721ed3689..409f94cd0b 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -86,7 +86,7 @@ wxString af_desc = wxTRANSLATE("Enable anisotropic filtering.\nEnhances visual q wxString aa_desc = wxTRANSLATE("Reduces the amount of aliasing caused by rasterizing 3D graphics.\nThis makes the rendered picture look less blocky.\nHeavily decreases emulation speed and sometimes causes issues.\n\nIf unsure, select None."); wxString scaled_efb_copy_desc = wxTRANSLATE("Greatly increases quality of textures generated using render to texture effects.\nRaising the internal resolution will improve the effect of this setting.\nSlightly decreases performance and possibly causes issues (although unlikely).\n\nIf unsure, leave this checked."); wxString pixel_lighting_desc = wxTRANSLATE("Calculate lighting of 3D graphics per-pixel rather than per vertex.\nDecreases emulation speed by some percent (depending on your GPU).\nThis usually is a safe enhancement, but might cause issues sometimes.\n\nIf unsure, leave this unchecked."); -wxString hacked_buffer_upload_desc = wxTRANSLATE("Speed up vertex streaming by using unsafe OpenGL code. Enabling this option might cause heavy glitches or even crash the emulator.\n\nIf unsure, leave this unchecked."); +wxString hacked_buffer_upload_desc = wxTRANSLATE("Uses unsafe operations to speed up vertex streaming in OpenGL. There are no known problems on supported GPUs, but it will cause severe stability and graphical issues otherwise.\n\nIf unsure, leave this unchecked."); wxString fast_depth_calc_desc = wxTRANSLATE("Use a less accurate algorithm to calculate depth values.\nCauses issues in a few games but might give a decent speedup.\n\nIf unsure, leave this checked."); wxString force_filtering_desc = wxTRANSLATE("Force texture filtering even if the emulated game explicitly disabled it.\nImproves texture quality slightly but causes glitches in some games.\n\nIf unsure, leave this unchecked."); wxString _3d_vision_desc = wxTRANSLATE("Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\nPossibly causes issues.\nRequires fullscreen to work.\n\nIf unsure, leave this unchecked."); From a7f3264fedc64bcd23cba20726deab48a1339219 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 2 Sep 2013 14:15:22 +0000 Subject: [PATCH 026/267] [ARM] Merge a bunch of arithmetic JIT instructions and rapid prototyping of a bunch more. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 17 +- .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 654 +++++++++++------- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 50 +- 3 files changed, 424 insertions(+), 297 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index fc1b08905e..e2a3d662f4 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -119,6 +119,7 @@ public: void ComputeRC(s32 value, int cr); void ComputeCarry(); + void ComputeCarry(bool Carry); void GetCarryAndClear(ARMReg reg); void FinalizeCarry(ARMReg reg); @@ -149,29 +150,17 @@ public: void bcctrx(UGeckoInstruction _inst); // Integer - void addi(UGeckoInstruction _inst); - void addis(UGeckoInstruction _inst); - void addx(UGeckoInstruction _inst); - void addcx(UGeckoInstruction _inst); + void arith(UGeckoInstruction _inst); + void addex(UGeckoInstruction _inst); void cmp (UGeckoInstruction _inst); void cmpi(UGeckoInstruction _inst); void cmpl(UGeckoInstruction _inst); void cmpli(UGeckoInstruction _inst); void negx(UGeckoInstruction _inst); - void mulli(UGeckoInstruction _inst); - void mullwx(UGeckoInstruction _inst); void mulhwux(UGeckoInstruction _inst); - void ori(UGeckoInstruction _inst); - void oris(UGeckoInstruction _inst); - void orx(UGeckoInstruction _inst); - void xorx(UGeckoInstruction _inst); - void andx(UGeckoInstruction _inst); - void andi_rc(UGeckoInstruction _inst); - void andis_rc(UGeckoInstruction _inst); void rlwimix(UGeckoInstruction _inst); void rlwinmx(UGeckoInstruction _inst); - void subfx(UGeckoInstruction _inst); void srawix(UGeckoInstruction _inst); void extshx(UGeckoInstruction inst); void extsbx(UGeckoInstruction inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index e840d4dd49..572ee6aae7 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -81,6 +81,19 @@ void JitArm::ComputeCarry() STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER])); gpr.Unlock(tmp); } +void JitArm::ComputeCarry(bool Carry) +{ + ARMReg tmp = gpr.GetReg(); + Operand2 mask = Operand2(2, 2); // XER_CA_MASK + LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER])); + if (Carry) + ORR(tmp, tmp, mask); + else + BIC(tmp, tmp, mask); + STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER])); + gpr.Unlock(tmp); + +} void JitArm::GetCarryAndClear(ARMReg reg) { @@ -106,82 +119,401 @@ void JitArm::FinalizeCarry(ARMReg reg) gpr.Unlock(tmp); } -void JitArm::addi(UGeckoInstruction inst) +u32 Add(u32 a, u32 b) {return a + b;} +u32 Sub(u32 a, u32 b) {return a - b;} +u32 Mul(u32 a, u32 b) {return a * b;} +u32 Or (u32 a, u32 b) {return a | b;} +u32 And(u32 a, u32 b) {return a & b;} +u32 Xor(u32 a, u32 b) {return a ^ b;} + +void JitArm::arith(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(Integer) - u32 d = inst.RD, a = inst.RA; - if (a) - { - if (gpr.IsImm(a)) - { - gpr.SetImmediate(d, gpr.GetImm(a) + inst.SIMM_16); - return; - } - ARMReg rA = gpr.GetReg(false); - ARMReg RA = gpr.R(a); - ARMReg RD = gpr.R(d); - MOVI2R(rA, (u32)inst.SIMM_16); - ADD(RD, RA, rA); - } - else - gpr.SetImmediate(d, inst.SIMM_16); -} -void JitArm::addis(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) + u32 a = inst.RA, b = inst.RB, d = inst.RD, s = inst.RS; + ARMReg RA, RB, RD, RS; + bool isImm[2] = {false, false}; // Arg1 & Arg2 + u32 Imm[2] = {0, 0}; + bool Rc = false; + bool carry = false; + bool isUnsigned = false; + bool shiftedImm = false; + // printf("inst %s has OPCD %d subop10 %d\n", PPCTables::GetInstructionName(inst), inst.OPCD, inst.SUBOP10); - u32 d = inst.RD, a = inst.RA; - if (a) + switch (inst.OPCD) { - if (gpr.IsImm(a)) - { - gpr.SetImmediate(d, gpr.GetImm(a) + (inst.SIMM_16 << 16)); - return; - } - ARMReg rA = gpr.GetReg(false); - ARMReg RA = gpr.R(a); - ARMReg RD = gpr.R(d); - MOVI2R(rA, inst.SIMM_16 << 16); - ADD(RD, RA, rA); + case 7: // mulli + if (gpr.IsImm(a)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(a); + } + isImm[1] = true; + Imm[1] = inst.SIMM_16; + break; + case 13: // addic_rc + Rc = true; + case 12: // addic + if (gpr.IsImm(a)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(a); + } + isImm[1] = true; + Imm[1] = inst.SIMM_16; + carry = true; + break; + case 15: // addis + shiftedImm = true; + case 14: // addi + if (a) + { + if (gpr.IsImm(a)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(a); + } + } + else + { + isImm[0] = true; + Imm[0] = 0; + } + isImm[1] = true; + Imm[1] = inst.SIMM_16 << (shiftedImm ? 16 : 0); + break; + case 25: // oris + shiftedImm = true; + case 24: // ori + if (gpr.IsImm(s)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(s); + } + isImm[1] = true; + Imm[1] = inst.UIMM << (shiftedImm ? 16 : 0); + break; + case 27: // xoris + shiftedImm = true; + case 26: // xori + if (gpr.IsImm(s)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(s); + } + isImm[1] = true; + Imm[1] = inst.UIMM << (shiftedImm ? 16 : 0); + break; + case 29: // addis_rc + shiftedImm = true; + case 28: // addi_rc + if (gpr.IsImm(s)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(s); + } + isImm[1] = true; + Imm[1] = inst.UIMM << (shiftedImm ? 16 : 0); + Rc = true; + break; + + case 31: // addcx, addx, subfx + switch(inst.SUBOP10) + { + case 28: // andx + case 60: // andcx + case 124: // norx + case 284: // eqvx + case 316: // xorx + case 412: // orcx + case 444: // orx + case 476: // nandx + if (gpr.IsImm(s)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(s); + } + if (gpr.IsImm(b)) + { + isImm[1] = true; + Imm[1] = gpr.GetImm(b); + } + Rc = inst.Rc; + break; + case 10: // addcx + carry = true; + case 40: // subfx + isUnsigned = true; + case 235: // mullwx + case 266: + case 778: // both addx + if (gpr.IsImm(a)) + { + isImm[0] = true; + Imm[0] = gpr.GetImm(a); + } + if (gpr.IsImm(b)) + { + isImm[1] = true; + Imm[1] = gpr.GetImm(b); + } + Rc = inst.Rc; + break; + } + break; + default: + WARN_LOG(DYNA_REC, "Unkown OPCD %d with arith function", inst.OPCD); + Default(inst); return; + break; } - else - gpr.SetImmediate(d, inst.SIMM_16 << 16); -} -void JitArm::addx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - u32 a = inst.RA, b = inst.RB, d = inst.RD; - - if (gpr.IsImm(a) && gpr.IsImm(b)) + if (isImm[0] && isImm[1]) // Immediate propagation { - gpr.SetImmediate(d, gpr.GetImm(a) + gpr.GetImm(b)); - if (inst.Rc) ComputeRC(gpr.GetImm(d), 0); + bool hasCarry = false; + u32 dest = d; + switch(inst.OPCD) + { + case 7: + gpr.SetImmediate(d, Mul(Imm[0], Imm[1])); + break; + case 12: + case 13: + gpr.SetImmediate(d, Add(Imm[0], Imm[1])); + hasCarry = Interpreter::Helper_Carry(Imm[0], Imm[1]); + break; + case 14: + case 15: + gpr.SetImmediate(d, Add(Imm[0], Imm[1])); + hasCarry = Interpreter::Helper_Carry(Imm[0], Imm[1]); + break; + case 24: + case 25: + gpr.SetImmediate(a, Or(Imm[0], Imm[1])); + dest = a; + break; + case 26: + case 27: + gpr.SetImmediate(a, Xor(Imm[0], Imm[1])); + dest = a; + break; + case 28: + case 29: + gpr.SetImmediate(a, And(Imm[0], Imm[1])); + dest = a; + break; + case 31: // addcx, addx, subfx + switch(inst.SUBOP10) + { + case 28: + gpr.SetImmediate(a, And(Imm[0], Imm[1])); + dest = a; + break; + case 40: // subfx + gpr.SetImmediate(d, Sub(Imm[1], Imm[0])); + break; + case 60: + gpr.SetImmediate(a, And(Imm[1], ~Imm[0])); + dest = a; + break; + case 124: + gpr.SetImmediate(a, ~Or(Imm[0], Imm[1])); + dest = a; + break; + case 235: + gpr.SetImmediate(d, Mul(Imm[0], Imm[1])); + break; + case 284: + gpr.SetImmediate(a, ~Xor(Imm[0], Imm[1])); + dest = a; + break; + case 316: + gpr.SetImmediate(a, Xor(Imm[0], Imm[1])); + dest = a; + break; + case 412: + gpr.SetImmediate(a, Or(Imm[0], ~Imm[1])); + dest = a; + break; + case 444: + gpr.SetImmediate(a, Or(Imm[0], Imm[1])); + dest = a; + break; + case 476: + gpr.SetImmediate(a, ~And(Imm[1], Imm[0])); + dest = a; + break; + case 10: // addcx + case 266: + case 778: // both addx + gpr.SetImmediate(d, Add(Imm[0], Imm[1])); + hasCarry = Interpreter::Helper_Carry(Imm[0], Imm[1]); + break; + } + break; + } + if (carry) ComputeCarry(hasCarry); + if (Rc) ComputeRC(gpr.GetImm(dest), 0); return; } - ARMReg RA = gpr.R(a); - ARMReg RB = gpr.R(b); - ARMReg RD = gpr.R(d); - ADDS(RD, RA, RB); - if (inst.Rc) ComputeRC(); + // One or the other isn't a IMM + switch(inst.OPCD) + { + case 7: + { + ARMReg rA = gpr.GetReg(); + RD = gpr.R(d); + RA = gpr.R(a); + MOVI2R(rA, Imm[1]); + MUL(RD, RA, rA); + gpr.Unlock(rA); + } + break; + case 12: + case 13: + { + ARMReg rA = gpr.GetReg(); + RD = gpr.R(d); + RA = gpr.R(a); + MOVI2R(rA, Imm[1]); + ADDS(RD, RA, rA); + gpr.Unlock(rA); + } + break; + case 14: + case 15: // Arg2 is always Imm + if (!isImm[0]) + { + ARMReg rA = gpr.GetReg(); + RD = gpr.R(d); + RA = gpr.R(a); + MOVI2R(rA, Imm[1]); + ADD(RD, RA, rA); + gpr.Unlock(rA); + } + else + gpr.SetImmediate(d, Imm[1]); + break; + case 24: + case 25: + { + ARMReg rA = gpr.GetReg(); + RS = gpr.R(s); + RA = gpr.R(a); + MOVI2R(rA, Imm[1]); + ORR(RA, RS, rA); + gpr.Unlock(rA); + } + break; + case 26: + case 27: + { + ARMReg rA = gpr.GetReg(); + RS = gpr.R(s); + RA = gpr.R(a); + MOVI2R(rA, Imm[1]); + EOR(RA, RS, rA); + gpr.Unlock(rA); + } + + break; + case 28: + case 29: + { + ARMReg rA = gpr.GetReg(); + RS = gpr.R(s); + RA = gpr.R(a); + MOVI2R(rA, Imm[1]); + ANDS(RA, RS, rA); + gpr.Unlock(rA); + } + break; + case 31: + switch(inst.SUBOP10) + { + case 28: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + ANDS(RA, RS, RB); + break; + case 40: // subfx + RD = gpr.R(d); + RA = gpr.R(a); + RB = gpr.R(b); + SUBS(RD, RB, RA); + break; + case 60: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + BICS(RA, RS, RB); + break; + case 124: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + ORR(RA, RS, RB); + MVNS(RA, RA); + break; + case 235: + RD = gpr.R(d); + RA = gpr.R(a); + RB = gpr.R(b); + MULS(RD, RA, RB); + break; + case 284: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + EOR(RA, RS, RB); + MVNS(RA, RA); + break; + case 316: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + EORS(RA, RS, RB); + break; + case 412: + { + ARMReg rA = gpr.GetReg(); + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + MVN(rA, RB); + ANDS(RA, RS, rA); + gpr.Unlock(rA); + } + break; + case 444: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + ORRS(RA, RS, RB); + break; + case 476: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + AND(RA, RS, RB); + MVNS(RA, RA); + break; + + case 10: // addcx + case 266: + case 778: // both addx + RD = gpr.R(d); + RA = gpr.R(a); + RB = gpr.R(b); + ADDS(RD, RA, RB); + break; + } + break; + } + if (carry) ComputeCarry(); + if (Rc) isUnsigned ? GenerateRC() : ComputeRC(); } -void JitArm::addcx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - u32 a = inst.RA, b = inst.RB, d = inst.RD; - - ARMReg RA = gpr.R(a); - ARMReg RB = gpr.R(b); - ARMReg RD = gpr.R(d); - ADDS(RD, RA, RB); - ComputeCarry(); - if (inst.Rc) ComputeRC(); -} void JitArm::addex(UGeckoInstruction inst) { INSTRUCTION_START @@ -199,61 +531,6 @@ void JitArm::addex(UGeckoInstruction inst) gpr.Unlock(rA); } -void JitArm::subfx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - - u32 a = inst.RA, b = inst.RB, d = inst.RD; - - if (inst.OE) PanicAlert("OE: subfx"); - - if (gpr.IsImm(a) && gpr.IsImm(b)) - { - gpr.SetImmediate(d, gpr.GetImm(b) - gpr.GetImm(a)); - if (inst.Rc) ComputeRC(gpr.GetImm(d), 0); - return; - } - ARMReg RA = gpr.R(a); - ARMReg RB = gpr.R(b); - ARMReg RD = gpr.R(d); - SUBS(RD, RB, RA); - if (inst.Rc) GenerateRC(); -} -void JitArm::mulli(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - u32 a = inst.RA, d = inst.RD; - - if (gpr.IsImm(a)) - { - gpr.SetImmediate(d, gpr.GetImm(a) * inst.SIMM_16); - return; - } - ARMReg RA = gpr.R(a); - ARMReg RD = gpr.R(d); - ARMReg rA = gpr.GetReg(); - MOVI2R(rA, inst.SIMM_16); - MUL(RD, RA, rA); - gpr.Unlock(rA); -} - -void JitArm::mullwx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - - u32 a = inst.RA, b = inst.RB, d = inst.RD; - - ARMReg RA = gpr.R(a); - ARMReg RB = gpr.R(b); - ARMReg RD = gpr.R(d); - MULS(RD, RA, RB); - if (inst.OE) PanicAlert("OE: mullwx"); - if (inst.Rc) ComputeRC(); -} - void JitArm::mulhwux(UGeckoInstruction inst) { INSTRUCTION_START @@ -269,145 +546,6 @@ void JitArm::mulhwux(UGeckoInstruction inst) if (inst.Rc) ComputeRC(); } -void JitArm::ori(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - u32 a = inst.RA, s = inst.RS; - - if (gpr.IsImm(s)) - { - gpr.SetImmediate(a, gpr.GetImm(s) | inst.UIMM); - return; - } - ARMReg RA = gpr.R(a); - ARMReg RS = gpr.R(s); - ARMReg rA = gpr.GetReg(); - MOVI2R(rA, inst.UIMM); - ORR(RA, RS, rA); - gpr.Unlock(rA); -} -void JitArm::oris(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - u32 a = inst.RA, s = inst.RS; - - if (gpr.IsImm(s)) - { - gpr.SetImmediate(a, gpr.GetImm(s) | (inst.UIMM << 16)); - return; - } - ARMReg RA = gpr.R(a); - ARMReg RS = gpr.R(s); - ARMReg rA = gpr.GetReg(); - MOVI2R(rA, inst.UIMM << 16); - ORR(RA, RS, rA); - gpr.Unlock(rA); -} - -void JitArm::orx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - u32 a = inst.RA, b = inst.RB, s = inst.RS; - - if (gpr.IsImm(b) && gpr.IsImm(s)) - { - gpr.SetImmediate(a, gpr.GetImm(s) | gpr.GetImm(b)); - if (inst.Rc) ComputeRC(gpr.GetImm(a), 0); - return; - } - ARMReg rA = gpr.R(a); - ARMReg rB = gpr.R(b); - ARMReg rS = gpr.R(s); - ORRS(rA, rS, rB); - if (inst.Rc) - ComputeRC(); -} - -void JitArm::xorx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(Integer) - - u32 a = inst.RA, b = inst.RB, s = inst.RS; - - if (gpr.IsImm(b) && gpr.IsImm(s)) - { - gpr.SetImmediate(a, gpr.GetImm(s) ^ gpr.GetImm(b)); - if (inst.Rc) ComputeRC(gpr.GetImm(a), 0); - return; - } - ARMReg rA = gpr.R(a); - ARMReg rB = gpr.R(b); - ARMReg rS = gpr.R(s); - EORS(rA, rS, rB); - if (inst.Rc) - ComputeRC(); -} - -void JitArm::andx(UGeckoInstruction inst) -{ - u32 a = inst.RA, b = inst.RB, s = inst.RS; - - if (gpr.IsImm(s) && gpr.IsImm(b)) - { - gpr.SetImmediate(a, gpr.GetImm(s) & gpr.GetImm(b)); - if (inst.Rc) ComputeRC(gpr.GetImm(a), 0); - return; - } - ARMReg rA = gpr.R(a); - ARMReg rB = gpr.R(b); - ARMReg rS = gpr.R(s); - - ANDS(rA, rS, rB); - - if (inst.Rc) ComputeRC(); -} - -void JitArm::andi_rc(UGeckoInstruction inst) -{ - u32 a = inst.RA, s = inst.RS; - - if (gpr.IsImm(s)) - { - gpr.SetImmediate(a, gpr.GetImm(s) & inst.UIMM); - ComputeRC(gpr.GetImm(a), 0); - return; - } - ARMReg rA = gpr.R(a); - ARMReg rS = gpr.R(s); - ARMReg RA = gpr.GetReg(); - - MOVI2R(RA, inst.UIMM); - ANDS(rA, rS, RA); - - ComputeRC(); - gpr.Unlock(RA); -} - -void JitArm::andis_rc(UGeckoInstruction inst) -{ - u32 a = inst.RA, s = inst.RS; - - if (gpr.IsImm(s)) - { - gpr.SetImmediate(a, gpr.GetImm(s) & ((u32)inst.UIMM << 16)); - ComputeRC(gpr.GetImm(a), 0); - return; - } - ARMReg rA = gpr.R(a); - ARMReg rS = gpr.R(s); - ARMReg RA = gpr.GetReg(); - - MOVI2R(RA, (u32)inst.UIMM << 16); - ANDS(rA, rS, RA); - - ComputeRC(); - gpr.Unlock(RA); -} - void JitArm::extshx(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 3d52bf8d16..de67e3c06e 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -58,25 +58,25 @@ static GekkoOPTemplate primarytable[] = {3, &JitArm::Break}, //"twi", OPTYPE_SYSTEM, FL_ENDBLOCK}}, {17, &JitArm::sc}, //"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, - {7, &JitArm::mulli}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, + {7, &JitArm::arith}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, {8, &JitArm::Default}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, {10, &JitArm::cmpli}, //"cmpli", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, {11, &JitArm::cmpi}, //"cmpi", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, - {12, &JitArm::Default}, //"addic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, - {13, &JitArm::Default}, //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}}, - {14, &JitArm::addi}, //"addi", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, - {15, &JitArm::addis}, //"addis", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, + {12, &JitArm::arith}, //"addic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {13, &JitArm::arith}, //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}}, + {14, &JitArm::arith}, //"addi", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, + {15, &JitArm::arith}, //"addis", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, {20, &JitArm::rlwimix}, //"rlwimix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}}, {21, &JitArm::rlwinmx}, //"rlwinmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, {23, &JitArm::Default}, //"rlwnmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}}, - {24, &JitArm::ori}, //"ori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, - {25, &JitArm::oris}, //"oris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, - {26, &JitArm::Default}, //"xori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, - {27, &JitArm::Default}, //"xoris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, - {28, &JitArm::andi_rc}, //"andi_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, - {29, &JitArm::andis_rc}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, + {24, &JitArm::arith}, //"ori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {25, &JitArm::arith}, //"oris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {26, &JitArm::arith}, //"xori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {27, &JitArm::arith}, //"xoris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {28, &JitArm::arith}, //"andi_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, + {29, &JitArm::arith}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, {32, &JitArm::lwz}, //"lwz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, {33, &JitArm::Default}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, @@ -194,14 +194,14 @@ static GekkoOPTemplate table19[] = static GekkoOPTemplate table31[] = { - {28, &JitArm::andx}, //"andx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, - {60, &JitArm::Default}, //"andcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, - {444, &JitArm::orx}, //"orx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, - {124, &JitArm::Default}, //"norx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, - {316, &JitArm::xorx}, //"xorx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, - {412, &JitArm::Default}, //"orcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, - {476, &JitArm::Default}, //"nandx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, - {284, &JitArm::Default}, //"eqvx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {28, &JitArm::arith}, //"andx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {60, &JitArm::arith}, //"andcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {444, &JitArm::arith}, //"orx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {124, &JitArm::arith}, //"norx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {316, &JitArm::arith}, //"xorx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {412, &JitArm::arith}, //"orcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {476, &JitArm::arith}, //"nandx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {284, &JitArm::arith}, //"eqvx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, {0, &JitArm::cmp}, //"cmp", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, {32, &JitArm::cmpl}, //"cmpl", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, {26, &JitArm::Default}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, @@ -307,9 +307,9 @@ static GekkoOPTemplate table31[] = static GekkoOPTemplate table31_2[] = { - {266, &JitArm::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, - {778, &JitArm::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, - {10, &JitArm::addcx}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {266, &JitArm::arith}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {778, &JitArm::arith}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {10, &JitArm::arith}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {138, &JitArm::addex}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {234, &JitArm::Default}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {202, &JitArm::Default}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, @@ -319,11 +319,11 @@ static GekkoOPTemplate table31_2[] = {971, &JitArm::Default}, //"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, {75, &JitArm::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, {11, &JitArm::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {235, &JitArm::mullwx}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {235, &JitArm::arith}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, {747, &JitArm::Default}, //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, {104, &JitArm::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, - {40, &JitArm::subfx}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, - {552, &JitArm::Default}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {40, &JitArm::arith}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {552, &JitArm::arith}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {8, &JitArm::Default}, //"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {136, &JitArm::Default}, //"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {232, &JitArm::Default}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, From e198e201e407b4ce63fa5b98ddb49473a1a0c4ef Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 2 Sep 2013 11:00:22 -0400 Subject: [PATCH 027/267] [Android] Fix the video settings from crashing the app. Was broke in the commit "Removal of my terrible idea" https://code.google.com/p/dolphin-emu/source/detail?r=2897619ddbd3e3aae8427fc503647c65e770d466 Didn't comment out the line for that preference in the XML. This is disabled for now until the UI overlay for the buttons are implemented directly into the Java front-end. --- .../dolphinemu/settings/VideoSettingsFragment.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index 14e512f78c..9f7448765b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -215,14 +215,14 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(true); + //mainScreen.getPreference(4).setEnabled(true); } else if (videoBackends.getValue().equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(false); + //mainScreen.getPreference(4).setEnabled(false); } // Also set a listener, so that if someone changes the video backend, it will disable @@ -239,14 +239,14 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(true); + //mainScreen.getPreference(4).setEnabled(true); } else if (preference.getString(key, "Software Renderer").equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(false); + //mainScreen.getPreference(4).setEnabled(false); } } } From 4c3230bcde57814b14bdb1701d47929ffcfa138a Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 2 Sep 2013 16:37:04 -0400 Subject: [PATCH 028/267] Remove accessType from BackPatch's signature in favor of getting it from DisassembleMov. It isn't easily accessible with sigaction or Mach exceptions (well, requires an additional system call in the latter), and isn't necessary. (and get rid of the enum, because it's only used once, and the comments are more expressive than enum names) --- Source/Core/Common/Src/x64Analyzer.cpp | 177 +++++++++--------- Source/Core/Common/Src/x64Analyzer.h | 15 +- Source/Core/Core/Src/ArmMemTools.cpp | 4 +- .../Src/PowerPC/JitArm32/JitArm_BackPatch.cpp | 2 +- .../Src/PowerPC/JitCommon/JitBackpatch.cpp | 25 +-- .../Core/Core/Src/PowerPC/JitCommon/JitBase.h | 4 +- Source/Core/Core/Src/PowerPC/JitInterface.cpp | 4 +- Source/Core/Core/Src/PowerPC/JitInterface.h | 2 +- Source/Core/Core/Src/x64MemTools.cpp | 5 +- 9 files changed, 109 insertions(+), 129 deletions(-) diff --git a/Source/Core/Common/Src/x64Analyzer.cpp b/Source/Core/Common/Src/x64Analyzer.cpp index 456830e467..9632c46125 100644 --- a/Source/Core/Common/Src/x64Analyzer.cpp +++ b/Source/Core/Common/Src/x64Analyzer.cpp @@ -4,7 +4,7 @@ #include "x64Analyzer.h" -bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int accessType) +bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info) { unsigned const char *startCodePtr = codePtr; u8 rex = 0; @@ -12,11 +12,11 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc u8 codeByte2 = 0; //Check for regular prefix - info.operandSize = 4; - info.zeroExtend = false; - info.signExtend = false; - info.hasImmediate = false; - info.isMemoryWrite = false; + info->operandSize = 4; + info->zeroExtend = false; + info->signExtend = false; + info->hasImmediate = false; + info->isMemoryWrite = false; u8 modRMbyte = 0; u8 sibByte = 0; @@ -26,7 +26,7 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc if (*codePtr == 0x66) { - info.operandSize = 2; + info->operandSize = 2; codePtr++; } else if (*codePtr == 0x67) @@ -40,7 +40,7 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc rex = *codePtr; if (rex & 8) //REX.W { - info.operandSize = 8; + info->operandSize = 8; } codePtr++; } @@ -72,11 +72,11 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc (codeByte2 & 0xF0) == 0x80 || ((codeByte2 & 0xF0) == 0xA0 && (codeByte2 & 0x07) <= 0x02) || (codeByte2 & 0xF8) == 0xC8) - { + { // No mod R/M byte - } + } else - { + { modRMbyte = *codePtr++; hasModRM = true; } @@ -85,21 +85,21 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc if (hasModRM) { ModRM mrm(modRMbyte, rex); - info.regOperandReg = mrm.reg; + info->regOperandReg = mrm.reg; if (mrm.mod < 3) { if (mrm.rm == 4) { //SIB byte sibByte = *codePtr++; - info.scaledReg = (sibByte >> 3) & 7; - info.otherReg = (sibByte & 7); - if (rex & 2) info.scaledReg += 8; - if (rex & 1) info.otherReg += 8; + info->scaledReg = (sibByte >> 3) & 7; + info->otherReg = (sibByte & 7); + if (rex & 2) info->scaledReg += 8; + if (rex & 1) info->otherReg += 8; } else { - //info.scaledReg = + //info->scaledReg = } } if (mrm.mod == 1 || mrm.mod == 2) @@ -112,100 +112,103 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc } if (displacementSize == 1) - info.displacement = (s32)(s8)*codePtr; + info->displacement = (s32)(s8)*codePtr; else - info.displacement = *((s32 *)codePtr); + info->displacement = *((s32 *)codePtr); codePtr += displacementSize; - if (accessType == 1) + switch (codeByte) { - info.isMemoryWrite = true; - //Write access - switch (codeByte) + // writes + case 0xC6: // mem <- imm8 { - case MOVE_8BIT: //move 8-bit immediate - { - info.hasImmediate = true; - info.immediate = *codePtr; - codePtr++; //move past immediate - } - break; - - case MOVE_16_32BIT: //move 16 or 32-bit immediate, easiest case for writes - { - if (info.operandSize == 2) - { - info.hasImmediate = true; - info.immediate = *(u16*)codePtr; - codePtr += 2; - } - else if (info.operandSize == 4) - { - info.hasImmediate = true; - info.immediate = *(u32*)codePtr; - codePtr += 4; - } - else if (info.operandSize == 8) - { - info.zeroExtend = true; - info.immediate = *(u32*)codePtr; - codePtr += 4; - } - } - break; - case MOVE_REG_TO_MEM: //move reg to memory - break; - - default: - PanicAlert("Unhandled disasm case in write handler!\n\nPlease implement or avoid."); - return false; + info->isMemoryWrite = true; + info->hasImmediate = true; + info->immediate = *codePtr; + codePtr++; //move past immediate } - } - else - { - // Memory read + break; - //mov eax, dword ptr [rax] == 8b 00 - switch (codeByte) + case 0xC7: // mem <- imm16/32 { - case 0x0F: + info->isMemoryWrite = true; + if (info->operandSize == 2) + { + info->hasImmediate = true; + info->immediate = *(u16*)codePtr; + codePtr += 2; + } + else if (info->operandSize == 4) + { + info->hasImmediate = true; + info->immediate = *(u32*)codePtr; + codePtr += 4; + } + else if (info->operandSize == 8) + { + info->zeroExtend = true; + info->immediate = *(u32*)codePtr; + codePtr += 4; + } + } + + case 0x89: // mem <- r16/32/64 + { + info->isMemoryWrite = true; + break; + } + + case 0x0F: // two-byte escape + { + info->isMemoryWrite = false; switch (codeByte2) { - case MOVZX_BYTE: //movzx on byte - info.zeroExtend = true; - info.operandSize = 1; + case 0xB6: // movzx on byte + info->zeroExtend = true; + info->operandSize = 1; break; - case MOVZX_SHORT: //movzx on short - info.zeroExtend = true; - info.operandSize = 2; + case 0xB7: // movzx on short + info->zeroExtend = true; + info->operandSize = 2; break; - case MOVSX_BYTE: //movsx on byte - info.signExtend = true; - info.operandSize = 1; + case 0xBE: // movsx on byte + info->signExtend = true; + info->operandSize = 1; break; - case MOVSX_SHORT: //movsx on short - info.signExtend = true; - info.operandSize = 2; + case 0xBF: // movsx on short + info->signExtend = true; + info->operandSize = 2; break; default: return false; } break; - case 0x8a: - if (info.operandSize == 4) + } + + case 0x8A: // r8 <- mem + { + info->isMemoryWrite = false; + if (info->operandSize == 4) { - info.operandSize = 1; + info->operandSize = 1; break; } - else + else return false; - case 0x8b: - break; //it's OK don't need to do anything - default: - return false; } + + case 0x8B: // r16/32/64 <- mem + { + info->isMemoryWrite = false; + break; + } + + break; + + default: + return false; } - info.instructionSize = (int)(codePtr - startCodePtr); + info->instructionSize = (int)(codePtr - startCodePtr); return true; } diff --git a/Source/Core/Common/Src/x64Analyzer.h b/Source/Core/Common/Src/x64Analyzer.h index 705bcd0e9c..028d291079 100644 --- a/Source/Core/Common/Src/x64Analyzer.h +++ b/Source/Core/Common/Src/x64Analyzer.h @@ -33,21 +33,12 @@ struct ModRM } }; -enum{ - MOVZX_BYTE = 0xB6, //movzx on byte - MOVZX_SHORT = 0xB7, //movzx on short - MOVSX_BYTE = 0xBE, //movsx on byte - MOVSX_SHORT = 0xBF, //movsx on short - MOVE_8BIT = 0xC6, //move 8-bit immediate - MOVE_16_32BIT = 0xC7, //move 16 or 32-bit immediate - MOVE_REG_TO_MEM = 0x89, //move reg to memory -}; - -enum AccessType{ +enum AccessType +{ OP_ACCESS_READ = 0, OP_ACCESS_WRITE = 1 }; -bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int accessType); +bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info); #endif // _X64ANALYZER_H_ diff --git a/Source/Core/Core/Src/ArmMemTools.cpp b/Source/Core/Core/Src/ArmMemTools.cpp index 34a0c34b7d..01e63a6a42 100644 --- a/Source/Core/Core/Src/ArmMemTools.cpp +++ b/Source/Core/Core/Src/ArmMemTools.cpp @@ -81,11 +81,9 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) u32 em_address = (u32)(bad_address - memspace_bottom); - int access_type = 0; - CONTEXT fake_ctx; fake_ctx.reg_pc = ctx->arm_pc; - const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, access_type, em_address, &fake_ctx); + const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, em_address, &fake_ctx); if (new_rip) { ctx->arm_pc = fake_ctx.reg_pc; } diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp index 9d01332f57..45b39ecd5b 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp @@ -96,7 +96,7 @@ bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store) } return true; } -const u8 *JitArm::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) +const u8 *JitArm::BackPatch(u8 *codePtr, u32 emAddress, void *ctx_void) { // TODO: This ctx needs to be filled with our information CONTEXT *ctx = (CONTEXT *)ctx_void; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp index c92d05d9d3..506435284e 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp @@ -160,7 +160,7 @@ const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info) // 1) It's really necessary. We don't know anything about the context. // 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be // that many of them in a typical program/game. -const u8 *Jitx86Base::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) +const u8 *Jitx86Base::BackPatch(u8 *codePtr, u32 emAddress, void *ctx_void) { #ifdef _M_X64 CONTEXT *ctx = (CONTEXT *)ctx_void; @@ -169,29 +169,15 @@ const u8 *Jitx86Base::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void return 0; // this will become a regular crash real soon after this InstructionInfo info; - if (!DisassembleMov(codePtr, info, accessType)) { + if (!DisassembleMov(codePtr, &info)) { BackPatchError("BackPatch - failed to disassemble MOV instruction", codePtr, emAddress); } - /* - if (info.isMemoryWrite) { - if (!Memory::IsRAMAddress(emAddress, true)) { - PanicAlert("Exception: Caught write to invalid address %08x", emAddress); - return; - } - BackPatchError("BackPatch - determined that MOV is write, not yet supported and should have been caught before", - codePtr, emAddress); - }*/ - if (info.otherReg != RBX) PanicAlert("BackPatch : Base reg not RBX." "\n\nAttempted to access %08x.", emAddress); - - if (accessType == OP_ACCESS_WRITE) - PanicAlert("BackPatch : Currently only supporting reads." - "\n\nAttempted to write to %08x.", emAddress); - if (accessType == 0) + if (!info.isMemoryWrite) { XEmitter emitter(codePtr); int bswapNopCount; @@ -205,8 +191,11 @@ const u8 *Jitx86Base::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void emitter.NOP((int)info.instructionSize + bswapNopCount - 5); return codePtr; } - else if (accessType == 1) + else { + PanicAlert("BackPatch : Currently only supporting reads." + "\n\nAttempted to write to %08x.", emAddress); + // TODO: special case FIFO writes. Also, support 32-bit mode. // Also, debug this so that it actually works correctly :P XEmitter emitter(codePtr - 2); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h index 826369e604..a5f7bd62be 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h @@ -74,7 +74,7 @@ public: virtual void Jit(u32 em_address) = 0; - virtual const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx) = 0; + virtual const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) = 0; virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0; @@ -89,7 +89,7 @@ protected: public: JitBlockCache *GetBlockCache() { return &blocks; } - const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); + const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx); bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } }; diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.cpp b/Source/Core/Core/Src/PowerPC/JitInterface.cpp index 1ca5626b1e..787ffebb6e 100644 --- a/Source/Core/Core/Src/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/Src/PowerPC/JitInterface.cpp @@ -175,9 +175,9 @@ namespace JitInterface { return jit->IsInCodeSpace(ptr); } - const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx) + const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) { - return jit->BackPatch(codePtr, accessType, em_address, ctx); + return jit->BackPatch(codePtr, em_address, ctx); } void ClearCache() diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.h b/Source/Core/Core/Src/PowerPC/JitInterface.h index bf5d750a1f..a0b7d62291 100644 --- a/Source/Core/Core/Src/PowerPC/JitInterface.h +++ b/Source/Core/Core/Src/PowerPC/JitInterface.h @@ -18,7 +18,7 @@ namespace JitInterface // Memory Utilities bool IsInCodeSpace(u8 *ptr); - const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); + const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx); // used by JIT to read instructions u32 Read_Opcode_JIT(const u32 _Address); diff --git a/Source/Core/Core/Src/x64MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp index 2594598303..02b5abb809 100644 --- a/Source/Core/Core/Src/x64MemTools.cpp +++ b/Source/Core/Core/Src/x64MemTools.cpp @@ -99,7 +99,7 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) //We could emulate the memory accesses here, but then they would still be around to take up //execution resources. Instead, we backpatch into a generic memory call and retry. - const u8 *new_rip = JitInterface::BackPatch(codePtr, accessType, emAddress, ctx); + const u8 *new_rip = JitInterface::BackPatch(codePtr, emAddress, ctx); // Rip/Eip needs to be updated. if (new_rip) @@ -214,7 +214,6 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) // Backpatch time. // Seems we'll need to disassemble to get access_type - that work is probably // best done and debugged on the Windows side. - int access_type = 0; CONTEXT fake_ctx; @@ -225,7 +224,7 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) fake_ctx.Eax = CREG_EAX(ctx); fake_ctx.Eip = CREG_EIP(ctx); #endif - const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, access_type, em_address, &fake_ctx); + const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, em_address, &fake_ctx); if (new_rip) { #ifdef _M_X64 From 50520c7c3d43bcb7e1d4de7251b05162be983f50 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 29 Aug 2013 16:26:00 -0400 Subject: [PATCH 029/267] Make fastmem work under a debugger on OS X. Not only do debuggers catch the expected SIGSEGV by default, I'm not sure there's a working way to configure either gdb or lldb not to. This commit uses an OS X-specific mechanism to add an exception handler that runs before the default one. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 2 +- .../Core/Src/PowerPC/JitCommon/JitBackpatch.h | 7 + Source/Core/Core/Src/x64MemTools.cpp | 287 ++++++++++++------ 3 files changed, 207 insertions(+), 89 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index e2a3d662f4..8ed14f6f94 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -82,7 +82,7 @@ public: JitBaseBlockCache *GetBlockCache() { return &blocks; } - const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); + const u8 *BackPatch(u8 *codePtr, bool isWrite, u32 em_address, void *ctx); bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h index e3e60a8d94..a8f204b1e1 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h @@ -36,6 +36,13 @@ #endif +#if defined(_M_ARM) +#define CONTEXT_PC(ctx) ((ctx)->reg_pc) +#elif defined(_M_X64) +#define CONTEXT_PC(ctx) ((ctx)->Rip) +#else +#define CONTEXT_PC(ctx) ((ctx)->Eip) +#endif class TrampolineCache : public Gen::XCodeBlock { diff --git a/Source/Core/Core/Src/x64MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp index 02b5abb809..9d854238d5 100644 --- a/Source/Core/Core/Src/x64MemTools.cpp +++ b/Source/Core/Core/Src/x64MemTools.cpp @@ -12,6 +12,12 @@ #endif #endif +#ifdef __APPLE__ +#include +#include +#include "Thread.h" +#endif + #ifdef __APPLE__ #define CREG_RAX(ctx) (*(ctx))->__ss.__rax #define CREG_RIP(ctx) (*(ctx))->__ss.__rip @@ -49,6 +55,53 @@ namespace EMM { +#if defined __APPLE__ || defined __linux__ || defined __FreeBSD__ +#include +void print_trace(const char * msg) +{ + void *array[100]; + size_t size; + char **strings; + size_t i; + + size = backtrace(array, 100); + strings = backtrace_symbols(array, size); + printf("%s Obtained %u stack frames.\n", msg, (unsigned int)size); + for (i = 0; i < size; i++) + printf("--> %s\n", strings[i]); + free(strings); +} +#endif + +bool DoFault(u64 bad_address, CONTEXT *ctx) +{ + if (!JitInterface::IsInCodeSpace((u8*) CONTEXT_PC(ctx))) + { + // Let's not prevent debugging. + return false; + } + + u64 memspace_bottom = (u64)Memory::base; + u64 memspace_top = memspace_bottom + +#ifdef _M_X64 + 0x100000000ULL; +#else + 0x40000000; +#endif + + if (bad_address < memspace_bottom || bad_address >= memspace_top) { + return false; + } + u32 em_address = (u32)(bad_address - memspace_bottom); + const u8 *new_pc = jit->BackPatch((u8*) CONTEXT_PC(ctx), em_address, ctx); + if (new_pc) + { + CONTEXT_PC(ctx) = (u64) new_pc; + } + + return true; +} + #ifdef _WIN32 LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) @@ -62,54 +115,24 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) { return (DWORD)EXCEPTION_CONTINUE_SEARCH; } - + //Where in the x86 code are we? PVOID codeAddr = pPtrs->ExceptionRecord->ExceptionAddress; unsigned char *codePtr = (unsigned char*)codeAddr; - - if (!JitInterface::IsInCodeSpace(codePtr)) + u64 badAddress = (u64)pPtrs->ExceptionRecord->ExceptionInformation[1]; + CONTEXT *ctx = pPtrs->ContextRecord; + + if (DoFault(badAddress, ctx)) + { + return (DWORD)EXCEPTION_CONTINUE_EXECUTION; + } + else { // Let's not prevent debugging. return (DWORD)EXCEPTION_CONTINUE_SEARCH; } - //Figure out what address was hit - u64 badAddress = (u64)pPtrs->ExceptionRecord->ExceptionInformation[1]; - - //TODO: First examine the address, make sure it's within the emulated memory space - u64 memspaceBottom = (u64)Memory::base; -#ifdef _M_X64 - u64 memspaceTop = memspaceBottom + 0x100000000ULL; -#else - u64 memspaceTop = memspaceBottom + 0x40000000; -#endif - if (badAddress < memspaceBottom || badAddress >= memspaceTop) - { - return (DWORD)EXCEPTION_CONTINUE_SEARCH; - //PanicAlert("Exception handler - access outside memory space. %08x%08x", - // badAddress >> 32, badAddress); - } - - u32 emAddress = (u32)(badAddress - memspaceBottom); - - //Now we have the emulated address. - - CONTEXT *ctx = pPtrs->ContextRecord; - //opportunity to play with the context - we can change the debug regs! - - //We could emulate the memory accesses here, but then they would still be around to take up - //execution resources. Instead, we backpatch into a generic memory call and retry. - const u8 *new_rip = JitInterface::BackPatch(codePtr, emAddress, ctx); - - // Rip/Eip needs to be updated. - if (new_rip) -#ifdef _M_X64 - ctx->Rip = (DWORD_PTR)new_rip; -#else - ctx->Eip = (DWORD_PTR)new_rip; -#endif } - return (DWORD)EXCEPTION_CONTINUE_EXECUTION; case EXCEPTION_STACK_OVERFLOW: MessageBox(0, _T("Stack overflow!"), 0,0); @@ -118,7 +141,7 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) case EXCEPTION_ILLEGAL_INSTRUCTION: //No SSE support? Or simply bad codegen? return EXCEPTION_CONTINUE_SEARCH; - + case EXCEPTION_PRIV_INSTRUCTION: //okay, dynarec codegen is obviously broken. return EXCEPTION_CONTINUE_SEARCH; @@ -150,33 +173,142 @@ void InstallExceptionHandler() #endif } -#else // _WIN32 +#elif defined(__APPLE__) -#ifndef ANDROID -#if defined __APPLE__ || defined __linux__ || defined __FreeBSD__ || defined _WIN32 -#ifndef _WIN32 -#include -#endif -void print_trace(const char * msg) +void CheckKR(const char* name, kern_return_t kr) { - void *array[100]; - size_t size; - char **strings; - size_t i; + if (kr) + { + PanicAlertT("%s failed: kr=%x", name, kr); + } +} - size = backtrace(array, 100); - strings = backtrace_symbols(array, size); - printf("%s Obtained %u stack frames.\n", msg, (unsigned int)size); - for (i = 0; i < size; i++) - printf("--> %s\n", strings[i]); - free(strings); +#ifdef _M_X64 +void ExceptionThread(mach_port_t port) +{ + Common::SetCurrentThreadName("Mach exception thread"); + #pragma pack(4) + struct + { + mach_msg_header_t Head; + NDR_record_t NDR; + exception_type_t exception; + mach_msg_type_number_t codeCnt; + int64_t code[2]; + int flavor; + mach_msg_type_number_t old_stateCnt; + natural_t old_state[x86_THREAD_STATE64_COUNT]; + mach_msg_trailer_t trailer; + } msg_in; + + struct + { + mach_msg_header_t Head; + NDR_record_t NDR; + kern_return_t RetCode; + int flavor; + mach_msg_type_number_t new_stateCnt; + natural_t new_state[x86_THREAD_STATE64_COUNT]; + } msg_out; + #pragma pack() + memset(&msg_in, 0xee, sizeof(msg_in)); + memset(&msg_out, 0xee, sizeof(msg_out)); + mach_msg_header_t *send_msg = NULL; + mach_msg_size_t send_size = 0; + mach_msg_option_t option = MACH_RCV_MSG; + while (1) + { + // If this isn't the first run, send the reply message. Then, receive + // a message: either a mach_exception_raise_state RPC due to + // thread_set_exception_ports, or MACH_NOTIFY_NO_SENDERS due to + // mach_port_request_notification. + CheckKR("mach_msg_overwrite", mach_msg_overwrite(send_msg, option, send_size, sizeof(msg_in), port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL, &msg_in.Head, 0)); + + if (msg_in.Head.msgh_id == MACH_NOTIFY_NO_SENDERS) + { + // the other thread exited + mach_port_destroy(mach_task_self(), port); + return; + } + + if (msg_in.Head.msgh_id != 2406) + { + PanicAlertT("unknown message received"); + return; + } + + if (msg_in.flavor != x86_THREAD_STATE64) + { + PanicAlertT("unknown flavor %d (expected %d)", msg_in.flavor, x86_THREAD_STATE64); + return; + } + + x86_thread_state64_t *state = (x86_thread_state64_t *) msg_in.old_state; + CONTEXT fake_ctx; + fake_ctx.Rax = state->__rax; + fake_ctx.Rip = state->__rip; + + bool ok = DoFault(msg_in.code[1], &fake_ctx); + + state->__rax = fake_ctx.Rax; + state->__rip = fake_ctx.Rip; + + // Set up the reply. + msg_out.Head.msgh_bits = MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(msg_in.Head.msgh_bits), 0); + msg_out.Head.msgh_remote_port = msg_in.Head.msgh_remote_port; + msg_out.Head.msgh_local_port = MACH_PORT_NULL; + msg_out.Head.msgh_id = msg_in.Head.msgh_id + 100; + msg_out.NDR = msg_in.NDR; + if (ok) + { + msg_out.RetCode = KERN_SUCCESS; + msg_out.flavor = x86_THREAD_STATE64; + msg_out.new_stateCnt = x86_THREAD_STATE64_COUNT; + memcpy(msg_out.new_state, msg_in.old_state, x86_THREAD_STATE64_COUNT * sizeof(natural_t)); + } + else + { + // Pass the exception to the next handler (debugger or crash). + msg_out.RetCode = KERN_FAILURE; + msg_out.flavor = 0; + msg_out.new_stateCnt = 0; + } + msg_out.Head.msgh_size = offsetof(typeof(msg_out), new_state) + msg_out.new_stateCnt * sizeof(natural_t); + + send_msg = &msg_out.Head; + send_size = msg_out.Head.msgh_size; + option |= MACH_SEND_MSG; + } } #endif -void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) +void InstallExceptionHandler() +{ +#ifdef _M_IX86 + PanicAlertT("InstallExceptionHandler called, but this platform does not yet support it."); +#else + mach_port_t port; + CheckKR("mach_port_allocate", mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &port)); + std::thread exc_thread(ExceptionThread, port); + exc_thread.detach(); + // Obtain a send right for thread_set_exception_ports to copy... + CheckKR("mach_port_insert_right", mach_port_insert_right(mach_task_self(), port, port, MACH_MSG_TYPE_MAKE_SEND)); + // Mach tries the following exception ports in order: thread, task, host. + // Debuggers set the task port, so we grab the thread port. + CheckKR("thread_set_exception_ports", thread_set_exception_ports(mach_thread_self(), EXC_MASK_BAD_ACCESS, port, EXCEPTION_STATE | MACH_EXCEPTION_CODES, x86_THREAD_STATE64)); + // ...and get rid of our copy so that MACH_NOTIFY_NO_SENDERS works. + CheckKR("mach_port_mod_refs", mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_SEND, -1)); + mach_port_t previous; + CheckKR("mach_port_request_notification", mach_port_request_notification(mach_task_self(), port, MACH_NOTIFY_NO_SENDERS, 0, port, MACH_MSG_TYPE_MAKE_SEND_ONCE, &previous)); +#endif +} + +#elif !defined(ANDROID) + +void sigsegv_handler(int sig, siginfo_t *info, void *raw_context) { #ifndef _M_GENERIC - if (signal != SIGSEGV) + if (sig != SIGSEGV) { // We are not interested in other signals - handle it as usual. return; @@ -188,35 +320,11 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) // Huh? Return. return; } - void *fault_memory_ptr = (void *)info->si_addr; + u64 bad_address = (u64)info->si_addr; // Get all the information we can out of the context. mcontext_t *ctx = &context->uc_mcontext; -#ifdef _M_X64 - u8 *fault_instruction_ptr = (u8 *)CREG_RIP(ctx); -#else - u8 *fault_instruction_ptr = (u8 *)CREG_EIP(ctx); -#endif - if (!JitInterface::IsInCodeSpace(fault_instruction_ptr)) - { - // Let's not prevent debugging. - return; - } - - u64 bad_address = (u64)fault_memory_ptr; - u64 memspace_bottom = (u64)Memory::base; - if (bad_address < memspace_bottom) { - PanicAlertT("Exception handler - access below memory space. %08llx%08llx", - bad_address >> 32, bad_address); - } - u32 em_address = (u32)(bad_address - memspace_bottom); - - // Backpatch time. - // Seems we'll need to disassemble to get access_type - that work is probably - // best done and debugged on the Windows side. - CONTEXT fake_ctx; - #ifdef _M_X64 fake_ctx.Rax = CREG_RAX(ctx); fake_ctx.Rip = CREG_RIP(ctx); @@ -224,8 +332,8 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) fake_ctx.Eax = CREG_EAX(ctx); fake_ctx.Eip = CREG_EIP(ctx); #endif - const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, em_address, &fake_ctx); - if (new_rip) + // assume it's not a write + if (DoFault(bad_address, &fake_ctx)) { #ifdef _M_X64 CREG_RAX(ctx) = fake_ctx.Rax; @@ -235,15 +343,18 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) CREG_EIP(ctx) = fake_ctx.Eip; #endif } + else + { + // retry and crash + signal(SIGSEGV, SIG_DFL); + } #endif } -#endif void InstallExceptionHandler() { #ifdef _M_IX86 PanicAlertT("InstallExceptionHandler called, but this platform does not yet support it."); - return; #else struct sigaction sa; sa.sa_handler = 0; From 5b9254a1cdae609844f61197910c12f80ac29f54 Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 2 Sep 2013 17:30:31 -0400 Subject: [PATCH 030/267] fix android. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 8ed14f6f94..9481502fa8 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -82,7 +82,7 @@ public: JitBaseBlockCache *GetBlockCache() { return &blocks; } - const u8 *BackPatch(u8 *codePtr, bool isWrite, u32 em_address, void *ctx); + const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx); bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } From 6b1c8f9d17ca7a3e368f9fafeaa8d5d3c729e5b8 Mon Sep 17 00:00:00 2001 From: Justin Chadwick Date: Mon, 2 Sep 2013 19:55:25 -0400 Subject: [PATCH 031/267] [Netplay] Read dual core setting before syncing it with clients. Fixes issue 6573. Fixes issue 6535. --- Source/Core/DolphinWX/Src/NetWindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 7bf3d9816d..f962b58590 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -401,6 +401,7 @@ void NetPlayDiag::OnChat(wxCommandEvent&) void NetPlayDiag::GetNetSettings(NetSettings &settings) { SConfig &instance = SConfig::GetInstance(); + settings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread; settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; settings.m_DSPEnableJIT = instance.m_EnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue(); From eb8e03fab5ddc955a4c1e78575902796cfbb2e9b Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 2 Sep 2013 20:07:47 -0500 Subject: [PATCH 032/267] Add a check for a shared polarssl library. This checks to see that the system version is new enough, and is compiled with havege support. --- CMakeLists.txt | 15 ++++++--- CMakeTests/FindPolarSSL.cmake | 59 +++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 CMakeTests/FindPolarSSL.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index dcec534409..9b2ba4f44f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -602,10 +602,17 @@ if(USE_UPNP) add_definitions(-DUSE_UPNP) endif() - -message("Using PolarSSL from Externals") -add_subdirectory(Externals/polarssl/) -include_directories(Externals/polarssl/include) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) + include(FindPolarSSL) +endif() +if(POLARSSL_FOUND AND POLARSSL_WORKS) + message("Using shared PolarSSL") + include_directories(${POLARSSL_INCLUDE_DIR}) +else() + message("Using PolarSSL from Externals") + add_subdirectory(Externals/polarssl/) + include_directories(Externals/polarssl/include) +endif() if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) check_lib(SOIL SOIL SOIL/SOIL.h QUIET) diff --git a/CMakeTests/FindPolarSSL.cmake b/CMakeTests/FindPolarSSL.cmake new file mode 100644 index 0000000000..be67c5613a --- /dev/null +++ b/CMakeTests/FindPolarSSL.cmake @@ -0,0 +1,59 @@ +# Locate polarssl library +# This module defines +# POLARSSL_FOUND +# POLARSSL_LIBRARY +# POLARSSL_INCLUDE_DIR +# POLARSSL_WORKS, this is true if polarssl is found and contains the methods +# needed by dolphin-emu + +if(POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY) + # Already in cache, be silent + set(POLARSSL_FIND_QUIETLY TRUE) +endif() + +find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h) +find_library(POLARSSL_LIBRARY polarssl) + +if (POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY) + set (POLARSSL_FOUND TRUE) +endif () + +if (POLARSSL_FOUND) + if (NOT POLARSSL_FIND_QUIETLY) + message (STATUS "Found the polarssl libraries at ${POLARSSL_LIBRARY}") + message (STATUS "Found the polarssl headers at ${POLARSSL_INCLUDE_DIR}") + endif (NOT POLARSSL_FIND_QUIETLY) + + message(STATUS "Checking to see if system version contains necessary methods") + + set(CMAKE_REQUIRED_INCLUDES ${POLARSSL_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${POLARSSL_LIBRARY}) + check_cxx_source_compiles(" + #include + #include + #include + int main() + { + ssl_context ctx; + ssl_session session; + havege_state hs; + + ssl_init(&ctx); + havege_init(&hs); + ssl_set_rng(&ctx, havege_random, &hs); + ssl_set_session(&ctx, &session); + + ssl_close_notify(&ctx); + ssl_session_free(&session); + ssl_free(&ctx); + + return 0; + }" + POLARSSL_WORKS) + +else () + message (STATUS "Could not find polarssl") +endif () + +MARK_AS_ADVANCED(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY) + From cea7737aefa2afc6083a14f404c807dc2add894f Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 2 Sep 2013 21:54:28 -0400 Subject: [PATCH 033/267] Fix crash on stop in netplay, and stop netplay when anyone with a pad mapped in game stops emulation. --- Source/Core/Core/Src/NetPlayClient.cpp | 17 +++++++++++++++++ Source/Core/Core/Src/NetPlayClient.h | 1 + Source/Core/Core/Src/NetPlayServer.cpp | 14 ++++++++++++++ Source/Core/DolphinWX/Src/NetWindow.cpp | 6 ++---- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 46acca6b94..3153ad2e2a 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -564,6 +564,23 @@ bool NetPlayClient::StopGame() return true; } +void NetPlayClient::Stop() +{ + bool isPadMapped = false; + for (unsigned int i = 0; i < 4; ++i) + { + if (m_pad_map[i] == m_local_player->pid) + isPadMapped = true; + } + // tell the server to stop if we have a pad mapped in game. + if (isPadMapped) + { + sf::Packet spac; + spac << (MessageId)NP_MSG_STOP_GAME; + m_socket.Send(spac); + } +} + // called from ---CPU--- thread u8 NetPlayClient::GetPadNum(u8 numPAD) { diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index 59d5742b18..a5aea6e472 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -74,6 +74,7 @@ public: bool StartGame(const std::string &path); bool StopGame(); + void Stop(); bool ChangeGame(const std::string& game); void SendChatMessage(const std::string& msg); diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index d8f2a7dd09..bcbfce9e29 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -376,6 +376,20 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) } break; + case NP_MSG_STOP_GAME: + { + // tell clients to stop game + sf::Packet spac; + spac << (MessageId)NP_MSG_STOP_GAME; + + std::lock_guard lkp(m_crit.players); + std::lock_guard lks(m_crit.send); + SendToClients(spac); + + m_is_running = false; + } + break; + default : PanicAlertT("Unknown message with id:%d received from player:%d Kicking player!", mid, player.pid); // unknown message, kick the client diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index f962b58590..a31f9c1cb1 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -650,8 +650,6 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event) void NetPlay::StopGame() { - if (netplay_server != NULL) - netplay_server->StopGame(); - - // TODO: allow non-hosting clients to close the window + if (netplay_client != NULL) + netplay_client->Stop(); } From 410197a3bd0b051b564c1abae788cd75e7985067 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 2 Sep 2013 22:05:05 -0400 Subject: [PATCH 034/267] Remove code that was made unused by revision cea7737aefa2. --- Source/Core/Core/Src/NetPlayServer.cpp | 17 ----------------- Source/Core/Core/Src/NetPlayServer.h | 1 - 2 files changed, 18 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index bcbfce9e29..c4d2f583ea 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -465,23 +465,6 @@ bool NetPlayServer::StartGame(const std::string &path) return true; } - -// called from ---GUI--- thread -bool NetPlayServer::StopGame() -{ - // tell clients to stop game - sf::Packet spac; - spac << (MessageId)NP_MSG_STOP_GAME; - - std::lock_guard lkp(m_crit.players); - std::lock_guard lks(m_crit.send); - SendToClients(spac); - - m_is_running = false; - - return true; -} - // called from multiple threads void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid) { diff --git a/Source/Core/Core/Src/NetPlayServer.h b/Source/Core/Core/Src/NetPlayServer.h index 5fbdb42802..5349764790 100644 --- a/Source/Core/Core/Src/NetPlayServer.h +++ b/Source/Core/Core/Src/NetPlayServer.h @@ -33,7 +33,6 @@ public: void SetNetSettings(const NetSettings &settings); bool StartGame(const std::string &path); - bool StopGame(); void GetPadMapping(PadMapping map[]); void SetPadMapping(const PadMapping map[]); From 7d09e72ac8ef892c44186007db77e37a4f4168c8 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 2 Sep 2013 23:33:53 -0400 Subject: [PATCH 035/267] Don't tell the server to stop if we already stopped. --- Source/Core/Core/Src/NetPlayClient.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 3153ad2e2a..428a217fed 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -566,6 +566,8 @@ bool NetPlayClient::StopGame() void NetPlayClient::Stop() { + if (m_is_running == false) + return; bool isPadMapped = false; for (unsigned int i = 0; i < 4; ++i) { From dfce0f3b0bc2e407ee190a4b59f4625dc2ab509f Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 3 Sep 2013 03:58:27 +0000 Subject: [PATCH 036/267] [ARM] Merge all store instructions in to one. This disables fastmem on stores currently. Hit isn't noticeable since I've also implemented 5 more store instructions with this. --- Source/Core/Core/Src/NetPlayClient.cpp | 19 +++++++++++++++ Source/Core/Core/Src/NetPlayClient.h | 1 + Source/Core/Core/Src/NetPlayServer.cpp | 31 +++++++++++-------------- Source/Core/Core/Src/NetPlayServer.h | 1 - Source/Core/DolphinWX/Src/NetWindow.cpp | 6 ++--- 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 46acca6b94..428a217fed 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -564,6 +564,25 @@ bool NetPlayClient::StopGame() return true; } +void NetPlayClient::Stop() +{ + if (m_is_running == false) + return; + bool isPadMapped = false; + for (unsigned int i = 0; i < 4; ++i) + { + if (m_pad_map[i] == m_local_player->pid) + isPadMapped = true; + } + // tell the server to stop if we have a pad mapped in game. + if (isPadMapped) + { + sf::Packet spac; + spac << (MessageId)NP_MSG_STOP_GAME; + m_socket.Send(spac); + } +} + // called from ---CPU--- thread u8 NetPlayClient::GetPadNum(u8 numPAD) { diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index 59d5742b18..a5aea6e472 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -74,6 +74,7 @@ public: bool StartGame(const std::string &path); bool StopGame(); + void Stop(); bool ChangeGame(const std::string& game); void SendChatMessage(const std::string& msg); diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index d8f2a7dd09..c4d2f583ea 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -376,6 +376,20 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) } break; + case NP_MSG_STOP_GAME: + { + // tell clients to stop game + sf::Packet spac; + spac << (MessageId)NP_MSG_STOP_GAME; + + std::lock_guard lkp(m_crit.players); + std::lock_guard lks(m_crit.send); + SendToClients(spac); + + m_is_running = false; + } + break; + default : PanicAlertT("Unknown message with id:%d received from player:%d Kicking player!", mid, player.pid); // unknown message, kick the client @@ -451,23 +465,6 @@ bool NetPlayServer::StartGame(const std::string &path) return true; } - -// called from ---GUI--- thread -bool NetPlayServer::StopGame() -{ - // tell clients to stop game - sf::Packet spac; - spac << (MessageId)NP_MSG_STOP_GAME; - - std::lock_guard lkp(m_crit.players); - std::lock_guard lks(m_crit.send); - SendToClients(spac); - - m_is_running = false; - - return true; -} - // called from multiple threads void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid) { diff --git a/Source/Core/Core/Src/NetPlayServer.h b/Source/Core/Core/Src/NetPlayServer.h index 5fbdb42802..5349764790 100644 --- a/Source/Core/Core/Src/NetPlayServer.h +++ b/Source/Core/Core/Src/NetPlayServer.h @@ -33,7 +33,6 @@ public: void SetNetSettings(const NetSettings &settings); bool StartGame(const std::string &path); - bool StopGame(); void GetPadMapping(PadMapping map[]); void SetPadMapping(const PadMapping map[]); diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index f962b58590..a31f9c1cb1 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -650,8 +650,6 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event) void NetPlay::StopGame() { - if (netplay_server != NULL) - netplay_server->StopGame(); - - // TODO: allow non-hosting clients to close the window + if (netplay_client != NULL) + netplay_client->Stop(); } From cc2fa4a00393d46a1917371854895e945cbcbd85 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 3 Sep 2013 04:11:25 +0000 Subject: [PATCH 037/267] [ARM] Merge all store instructions in to one. This disables fastmem on stores currently. Hit isn't noticeable since I've also implemented 5 more store instructions with this. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 13 +- .../Src/PowerPC/JitArm32/JitArm_BackPatch.cpp | 21 +- .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 440 ++++++------------ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 24 +- 4 files changed, 170 insertions(+), 328 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 9481502fa8..55215f4cdb 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -124,9 +124,11 @@ public: void FinalizeCarry(ARMReg reg); // TODO: This shouldn't be here - void StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset); + void UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset); + void SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 offsetReg, int accessSize, s32 offset); void LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset); + // OPCODES void unknown_instruction(UGeckoInstruction _inst); void Default(UGeckoInstruction _inst); @@ -173,6 +175,8 @@ public: void mftb(UGeckoInstruction _inst); // LoadStore + void stX(UGeckoInstruction _inst); + void icbi(UGeckoInstruction _inst); void dcbst(UGeckoInstruction _inst); void lbz(UGeckoInstruction _inst); @@ -180,13 +184,6 @@ public: void lha(UGeckoInstruction _inst); void lwz(UGeckoInstruction _inst); void lwzx(UGeckoInstruction _inst); - void stb(UGeckoInstruction _inst); - void stbu(UGeckoInstruction _inst); - void sth(UGeckoInstruction _inst); - void sthu(UGeckoInstruction _inst); - void stw(UGeckoInstruction _inst); - void stwu(UGeckoInstruction _inst); - void stwx(UGeckoInstruction _inst); // Floating point void fabsx(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp index 45b39ecd5b..a8ea4d929a 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp @@ -24,25 +24,6 @@ #include "../JitCommon/JitBackpatch.h" #include "StringUtil.h" -#ifdef _M_X64 -static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress) { - u64 code_addr = (u64)codePtr; - disassembler disasm; - char disbuf[256]; - memset(disbuf, 0, 256); -#ifdef _M_IX86 - disasm.disasm32(0, code_addr, codePtr, disbuf); -#else - disasm.disasm64(0, code_addr, codePtr, disbuf); -#endif - PanicAlert("%s\n\n" - "Error encountered accessing emulated address %08x.\n" - "Culprit instruction: \n%s\nat %#llx", - text.c_str(), emAddress, disbuf, code_addr); - return; -} -#endif - // This generates some fairly heavy trampolines, but: // 1) It's really necessary. We don't know anything about the context. // 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be @@ -96,7 +77,7 @@ bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store) } return true; } -const u8 *JitArm::BackPatch(u8 *codePtr, u32 emAddress, void *ctx_void) +const u8 *JitArm::BackPatch(u8 *codePtr, u32, void *ctx_void) { // TODO: This ctx needs to be filled with our information CONTEXT *ctx = (CONTEXT *)ctx_void; diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 505b7a2044..5691727690 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -31,294 +31,9 @@ #include "JitRegCache.h" #include "JitAsm.h" -#ifdef ANDROID -#define FASTMEM 1 -#else -#define FASTMEM 1 -#endif -void JitArm::stb(UGeckoInstruction inst) +void JitArm::UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) { - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg RS = gpr.R(inst.RS); -#if 0 // FASTMEM - // R10 contains the dest address - ARMReg Value = R11; - ARMReg RA; - if (inst.RA) - RA = gpr.R(inst.RA); - MOV(Value, RS); - if (inst.RA) - { - MOVI2R(R10, inst.SIMM_16, false); - ADD(R10, R10, RA); - } - else - { - MOVI2R(R10, (u32)inst.SIMM_16, false); - NOP(1); - } - StoreFromReg(R10, Value, 16, 0); -#else - ARMReg ValueReg = gpr.GetReg(); - ARMReg Addr = gpr.GetReg(); - ARMReg Function = gpr.GetReg(); - - MOV(ValueReg, RS); - if (inst.RA) - { - MOVI2R(Addr, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(Addr, Addr, RA); - } - else - MOVI2R(Addr, (u32)inst.SIMM_16); - - MOVI2R(Function, (u32)&Memory::Write_U8); - PUSH(4, R0, R1, R2, R3); - MOV(R0, ValueReg); - MOV(R1, Addr); - BL(Function); - POP(4, R0, R1, R2, R3); - gpr.Unlock(ValueReg, Addr, Function); -#endif -} - -void JitArm::stbu(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - ARMReg RA = gpr.R(inst.RA); - ARMReg RS = gpr.R(inst.RS); - ARMReg ValueReg = gpr.GetReg(); - ARMReg Addr = gpr.GetReg(); - ARMReg Function = gpr.GetReg(); - - MOVI2R(Addr, inst.SIMM_16); - ADD(Addr, Addr, RA); - - // Check for DSI exception prior to writing back address - LDR(Function, R9, PPCSTATE_OFF(Exceptions)); - CMP(Function, EXCEPTION_DSI); - FixupBranch DoNotWrite = B_CC(CC_EQ); - MOV(RA, Addr); - SetJumpTarget(DoNotWrite); - - MOV(ValueReg, RS); - - MOVI2R(Function, (u32)&Memory::Write_U8); - PUSH(4, R0, R1, R2, R3); - MOV(R0, ValueReg); - MOV(R1, Addr); - BL(Function); - POP(4, R0, R1, R2, R3); - - gpr.Unlock(ValueReg, Addr, Function); -} -void JitArm::sth(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg RS = gpr.R(inst.RS); -#if 0 // FASTMEM - // R10 contains the dest address - ARMReg Value = R11; - ARMReg RA; - if (inst.RA) - RA = gpr.R(inst.RA); - MOV(Value, RS); - if (inst.RA) - { - MOVI2R(R10, inst.SIMM_16, false); - ADD(R10, R10, RA); - } - else - { - MOVI2R(R10, (u32)inst.SIMM_16, false); - NOP(1); - } - StoreFromReg(R10, Value, 16, 0); -#else - ARMReg ValueReg = gpr.GetReg(); - ARMReg Addr = gpr.GetReg(); - ARMReg Function = gpr.GetReg(); - - MOV(ValueReg, RS); - if (inst.RA) - { - MOVI2R(Addr, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(Addr, Addr, RA); - } - else - MOVI2R(Addr, (u32)inst.SIMM_16); - - MOVI2R(Function, (u32)&Memory::Write_U16); - PUSH(4, R0, R1, R2, R3); - MOV(R0, ValueReg); - MOV(R1, Addr); - BL(Function); - POP(4, R0, R1, R2, R3); - gpr.Unlock(ValueReg, Addr, Function); -#endif -} -void JitArm::sthu(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg RA = gpr.R(inst.RA); - ARMReg RS = gpr.R(inst.RS); - ARMReg ValueReg = gpr.GetReg(); - ARMReg Addr = gpr.GetReg(); - ARMReg Function = gpr.GetReg(); - - MOVI2R(Addr, inst.SIMM_16); - ADD(Addr, Addr, RA); - - // Check for DSI exception prior to writing back address - LDR(Function, R9, PPCSTATE_OFF(Exceptions)); - CMP(Function, EXCEPTION_DSI); - FixupBranch DoNotWrite = B_CC(CC_EQ); - MOV(RA, Addr); - SetJumpTarget(DoNotWrite); - - MOV(ValueReg, RS); - - MOVI2R(Function, (u32)&Memory::Write_U16); - PUSH(4, R0, R1, R2, R3); - MOV(R0, ValueReg); - MOV(R1, Addr); - BL(Function); - POP(4, R0, R1, R2, R3); - - gpr.Unlock(ValueReg, Addr, Function); -} - -void JitArm::stw(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg RS = gpr.R(inst.RS); -#if FASTMEM - // R10 contains the dest address - if (Core::g_CoreStartupParameter.bFastmem) - { - ARMReg Value = R11; - ARMReg RA; - if (inst.RA) - RA = gpr.R(inst.RA); - MOV(Value, RS); - if (inst.RA) - { - MOVI2R(R10, inst.SIMM_16, false); - ADD(R10, R10, RA); - } - else - { - MOVI2R(R10, (u32)inst.SIMM_16, false); - NOP(1); - } - StoreFromReg(R10, Value, 32, 0); - } - else -#endif - { - ARMReg ValueReg = gpr.GetReg(); - ARMReg Addr = gpr.GetReg(); - ARMReg Function = gpr.GetReg(); - - MOV(ValueReg, RS); - if (inst.RA) - { - MOVI2R(Addr, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(Addr, Addr, RA); - } - else - MOVI2R(Addr, (u32)inst.SIMM_16); - - MOVI2R(Function, (u32)&Memory::Write_U32); - PUSH(4, R0, R1, R2, R3); - MOV(R0, ValueReg); - MOV(R1, Addr); - BL(Function); - POP(4, R0, R1, R2, R3); - gpr.Unlock(ValueReg, Addr, Function); - } -} -void JitArm::stwu(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg RA = gpr.R(inst.RA); - ARMReg RS = gpr.R(inst.RS); - ARMReg ValueReg = gpr.GetReg(); - ARMReg Addr = gpr.GetReg(); - ARMReg Function = gpr.GetReg(); - - MOVI2R(Addr, inst.SIMM_16); - ADD(Addr, Addr, RA); - - // Check for DSI exception prior to writing back address - LDR(Function, R9, PPCSTATE_OFF(Exceptions)); - CMP(Function, EXCEPTION_DSI); - FixupBranch DoNotWrite = B_CC(CC_EQ); - MOV(RA, Addr); - SetJumpTarget(DoNotWrite); - - MOV(ValueReg, RS); - - MOVI2R(Function, (u32)&Memory::Write_U32); - PUSH(4, R0, R1, R2, R3); - MOV(R0, ValueReg); - MOV(R1, Addr); - BL(Function); - POP(4, R0, R1, R2, R3); - - gpr.Unlock(ValueReg, Addr, Function); -} -void JitArm::stwx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - u32 a = inst.RA, b = inst.RB, s = inst.RB; - - if (a) { - // Doesn't work - Default(inst); return; - } - - ARMReg RB = gpr.R(b); - ARMReg RS = gpr.R(s); - ARMReg ValueReg = gpr.GetReg(); - ARMReg Addr = gpr.GetReg(); - ARMReg Function = gpr.GetReg(); - - if (a) - ADD(Addr, gpr.R(a), RB); - else - MOV(Addr, RB); - - MOV(ValueReg, RS); - fpr.Flush(); - MOVI2R(Function, (u32)&Memory::Write_U32); - PUSH(4, R0, R1, R2, R3); - MOV(R0, ValueReg); - MOV(R1, Addr); - BL(Function); - POP(4, R0, R1, R2, R3); - - gpr.Unlock(ValueReg, Addr, Function); -} - -void JitArm::StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) -{ - ARMReg rA = gpr.GetReg(); + ARMReg rA = R11; // All this gets replaced on backpatch MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 1-2 @@ -349,8 +64,157 @@ void JitArm::StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) STRB(value, dest); break; } - gpr.Unlock(rA); } + +void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset, int accessSize, s32 offset) +{ + if (Core::g_CoreStartupParameter.bFastmem && fastmem) + { + ARMReg rA = R10; + ARMReg rB = R12; + ARMReg RA; + ARMReg RB; + ARMReg RS = gpr.R(value); + + if (regOffset != -1) + { + RB = gpr.R(regOffset); + MOV(rA, RB); + } + else + MOVI2R(rA, offset); + + if (dest != -1) + { + RA = gpr.R(dest); + ADD(rA, rA, RA); + } + + MOV(rB, RS); + UnsafeStoreFromReg(rA, rB, accessSize, 0); + return; + } + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg rC = gpr.GetReg(); + ARMReg RA; + ARMReg RB; + if (dest != -1) + RA = gpr.R(dest); + if (regOffset != -1) + RB = gpr.R(regOffset); + ARMReg RS = gpr.R(value); + switch(accessSize) + { + case 32: + MOVI2R(rA, (u32)&Memory::Write_U32); + break; + case 16: + MOVI2R(rA, (u32)&Memory::Write_U16); + break; + case 8: + MOVI2R(rA, (u32)&Memory::Write_U8); + break; + } + MOV(rB, RS); + if (regOffset == -1) + MOVI2R(rC, offset); + else + MOV(rC, RB); + if (dest != -1) + ADD(rC, rC, RA); + + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + MOV(R1, rC); + BL(rA); + POP(4, R0, R1, R2, R3); + gpr.Unlock(rA, rB, rC); +} + +void JitArm::stX(UGeckoInstruction inst) +{ + u32 a = inst.RA, b = inst.RB, s = inst.RS; + s32 offset = inst.SIMM_16; + u32 accessSize = 0; + s32 regOffset = -1; + bool zeroA = true; + bool update = false; + bool fastmem = false; + switch(inst.OPCD) + { + case 45: // sthu + update = true; + case 44: // sth + accessSize = 16; + break; + case 31: + switch (inst.SUBOP10) + { + case 183: // stwux + zeroA = false; + update = true; + case 151: // stwx + accessSize = 32; + regOffset = b; + break; + case 247: // stbux + zeroA = false; + update = true; + case 215: // stbx + accessSize = 8; + regOffset = b; + break; + case 439: // sthux + zeroA = false; + update = true; + case 407: // sthx + accessSize = 16; + regOffset = b; + break; + } + break; + case 37: // stwu + update = true; + case 36: // stw + accessSize = 32; + break; + case 39: // stbu + update = true; + case 38: // stb + accessSize = 8; + break; + } + SafeStoreFromReg(fastmem, zeroA ? a ? a : -1 : a, s, regOffset, accessSize, offset); + if (update) + { + ARMReg rA = gpr.GetReg(); + ARMReg RB; + ARMReg RA = gpr.R(a); + if (regOffset != -1) + RB = gpr.R(regOffset); + // Check for DSI exception prior to writing back address + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotWrite = B_CC(CC_EQ); + if (a) + { + if (regOffset == -1) + MOVI2R(rA, offset); + else + MOV(rA, RB); + ADD(RA, RA, rA); + } + else + if (regOffset == -1) + MOVI2R(RA, (u32)offset); + else + MOV(RA, RB); + SetJumpTarget(DoNotWrite); + gpr.Unlock(rA); + } +} + void JitArm::LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) { ARMReg rA = gpr.GetReg(); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index de67e3c06e..5a4d33ea32 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -87,12 +87,12 @@ static GekkoOPTemplate primarytable[] = {42, &JitArm::lha}, //"lha", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, {43, &JitArm::Default}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, - {44, &JitArm::sth}, //"sth", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, - {45, &JitArm::sthu}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, - {36, &JitArm::stw}, //"stw", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, - {37, &JitArm::stwu}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, - {38, &JitArm::stb}, //"stb", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, - {39, &JitArm::stbu}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + {44, &JitArm::stX}, //"sth", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {45, &JitArm::stX}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + {36, &JitArm::stX}, //"stw", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {37, &JitArm::stX}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + {38, &JitArm::stX}, //"stb", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {39, &JitArm::stX}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, {46, &JitArm::Default}, //"lmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, {47, &JitArm::Default}, //"stmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, @@ -249,16 +249,16 @@ static GekkoOPTemplate table31[] = {597, &JitArm::Default}, //"lswi", OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D}}, //store word - {151, &JitArm::stwx}, //"stwx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, - {183, &JitArm::Default}, //"stwux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + {151, &JitArm::stX}, //"stwx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {183, &JitArm::stX}, //"stwux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, //store halfword - {407, &JitArm::Default}, //"sthx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, - {439, &JitArm::Default}, //"sthux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + {407, &JitArm::stX}, //"sthx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {439, &JitArm::stX}, //"sthux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, //store byte - {215, &JitArm::Default}, //"stbx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, - {247, &JitArm::Default}, //"stbux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + {215, &JitArm::stX}, //"stbx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {247, &JitArm::stX}, //"stbux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, //store bytereverse {662, &JitArm::Default}, //"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, From d4d6eb562ec52ee4d205fcdf82a19bb39cb40e14 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 3 Sep 2013 05:05:10 +0000 Subject: [PATCH 038/267] [ARM] Fix and enable fastmem for 32bit stores. --- .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 5691727690..7bb0fa514f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -33,13 +33,12 @@ void JitArm::UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) { - ARMReg rA = R11; // All this gets replaced on backpatch - MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 1-2 - AND(dest, dest, rA); // 3 - MOVI2R(rA, (u32)Memory::base, false); // 4-5 - ADD(dest, dest, rA); // 6 + MOVI2R(R14, Memory::MEMVIEW32_MASK, false); // 1-2 + AND(dest, dest, R14); // 3 + MOVI2R(R14, (u32)Memory::base, false); // 4-5 + ADD(dest, dest, R14); // 6 switch (accessSize) { case 32: @@ -70,28 +69,29 @@ void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset, { if (Core::g_CoreStartupParameter.bFastmem && fastmem) { - ARMReg rA = R10; - ARMReg rB = R12; ARMReg RA; ARMReg RB; ARMReg RS = gpr.R(value); + if (dest != -1) + RA = gpr.R(dest); + if (regOffset != -1) { RB = gpr.R(regOffset); - MOV(rA, RB); + MOV(R10, RB); + NOP(1); } else - MOVI2R(rA, offset); + MOVI2R(R10, (u32)offset, false); if (dest != -1) - { - RA = gpr.R(dest); - ADD(rA, rA, RA); - } + ADD(R10, R10, RA); + else + NOP(1); - MOV(rB, RS); - UnsafeStoreFromReg(rA, rB, accessSize, 0); + MOV(R12, RS); + UnsafeStoreFromReg(R10, R12, accessSize, 0); return; } ARMReg rA = gpr.GetReg(); @@ -155,6 +155,7 @@ void JitArm::stX(UGeckoInstruction inst) zeroA = false; update = true; case 151: // stwx + fastmem = true; accessSize = 32; regOffset = b; break; @@ -177,6 +178,7 @@ void JitArm::stX(UGeckoInstruction inst) case 37: // stwu update = true; case 36: // stw + fastmem = true; accessSize = 32; break; case 39: // stbu From 30cd436e8642bbbd35d001a6b310dac3b0f92c29 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 3 Sep 2013 09:22:43 +0000 Subject: [PATCH 039/267] [ARM] Merge load instructions in to one. Also rapid prototype 13 more load instructions. This disables fastmem currently for loads. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 8 +- .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 444 +++++++----------- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 36 +- 3 files changed, 201 insertions(+), 287 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 55215f4cdb..a04d9e0dd5 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -126,6 +126,8 @@ public: // TODO: This shouldn't be here void UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset); void SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 offsetReg, int accessSize, s32 offset); + + void SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse); void LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset); @@ -176,14 +178,10 @@ public: // LoadStore void stX(UGeckoInstruction _inst); + void lXX(UGeckoInstruction _inst); void icbi(UGeckoInstruction _inst); void dcbst(UGeckoInstruction _inst); - void lbz(UGeckoInstruction _inst); - void lhz(UGeckoInstruction _inst); - void lha(UGeckoInstruction _inst); - void lwz(UGeckoInstruction _inst); - void lwzx(UGeckoInstruction _inst); // Floating point void fabsx(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 7bb0fa514f..295de5af66 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -217,6 +217,186 @@ void JitArm::stX(UGeckoInstruction inst) } } +void JitArm::SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse) +{ + ARMReg RD = gpr.R(dest); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + if (offsetReg == -1) + MOVI2R(rA, offset); + else + MOV(rA, gpr.R(offsetReg)); + + if (addr != -1) + ADD(rA, rA, gpr.R(addr)); + + switch (accessSize) + { + case 8: + MOVI2R(rB, (u32)&Memory::Read_U8); + break; + case 16: + MOVI2R(rB, (u32)&Memory::Read_U16); + break; + case 32: + MOVI2R(rB, (u32)&Memory::Read_U32); + break; + } + PUSH(4, R0, R1, R2, R3); + MOV(R0, rA); + BL(rB); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + if (signExtend) // Only on 16 loads + SXTH(RD, RD); + if (reverse) + { + if (accessSize == 32) + REV(RD, RD); + else if (accessSize == 16) + REV16(RD, RD); + } + gpr.Unlock(rA, rB); +} + +void JitArm::lXX(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + u32 a = inst.RA, b = inst.RB, d = inst.RD; + s32 offset = inst.SIMM_16; + u32 accessSize = 0; + s32 offsetReg = -1; + bool zeroA = true; + bool update = false; + bool signExtend = false; + bool reverse = false; + + switch(inst.OPCD) + { + case 31: + switch(inst.SUBOP10) + { + case 55: // lwzux + zeroA = false; + update = true; + case 23: // lwzx + accessSize = 32; + offsetReg = b; + break; + case 119: //lbzux + zeroA = false; + update = true; + case 87: // lbzx + accessSize = 8; + offsetReg = b; + break; + case 311: // lhzux + zeroA = false; + update = true; + case 279: // lhzx + accessSize = 16; + offsetReg = b; + break; + case 375: // lhaux + zeroA = false; + update = true; + case 343: // lhax + accessSize = 16; + signExtend = true; + offsetReg = b; + break; + case 534: // lwbrx + accessSize = 32; + reverse = true; + break; + case 790: // lhbrx + accessSize = 16; + reverse = true; + break; + } + break; + case 33: // lwzu + zeroA = false; + update = true; + case 32: // lwz + accessSize = 32; + break; + case 35: // lbzu + zeroA = false; + update = true; + case 34: // lbz + accessSize = 8; + break; + case 41: // lhzu + zeroA = false; + update = true; + case 40: // lhz + accessSize = 16; + break; + case 43: // lhau + zeroA = false; + update = true; + case 42: // lha + signExtend = true; + accessSize = 16; + break; + } + + // Check for exception before loading + ARMReg rA = gpr.GetReg(false); + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + + SafeLoadToReg(d, zeroA ? a ? a : -1 : a, offsetReg, accessSize, offset, signExtend, reverse); + + if (update) + { + rA = gpr.GetReg(false); + ARMReg RA = gpr.R(a); + if (offsetReg == -1) + MOVI2R(rA, offset); + else + MOV(RA, gpr.R(offsetReg)); + ADD(RA, RA, rA); + } + + SetJumpTarget(DoNotLoad); + + // LWZ idle skipping + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && + (inst.hex & 0xFFFF0000) == 0x800D0000 && + (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && + Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) + { + ARMReg RD = gpr.R(d); + gpr.Flush(); + fpr.Flush(); + + // if it's still 0, we can wait until the next event + TST(RD, RD); + FixupBranch noIdle = B_CC(CC_NEQ); + rA = gpr.GetReg(); + + MOVI2R(rA, (u32)&PowerPC::OnIdle); + MOVI2R(R0, PowerPC::ppcState.gpr[a] + (s32)(s16)inst.SIMM_16); + BL(rA); + + gpr.Unlock(rA); + WriteExceptionExit(); + + SetJumpTarget(noIdle); + + //js.compilerPC += 8; + return; + } + +} + void JitArm::LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) { ARMReg rA = gpr.GetReg(); @@ -255,270 +435,6 @@ void JitArm::LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) } gpr.Unlock(rA); } -void JitArm::lbz(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg rA = gpr.GetReg(); - ARMReg rB = gpr.GetReg(); - ARMReg RD = gpr.R(inst.RD); - LDR(rA, R9, PPCSTATE_OFF(Exceptions)); - CMP(rA, EXCEPTION_DSI); - FixupBranch DoNotLoad = B_CC(CC_EQ); -#if FASTMEM - // Backpatch route - // Gets loaded in to RD - // Address is in R10 - if (Core::g_CoreStartupParameter.bFastmem) - { - gpr.Unlock(rA, rB); - if (inst.RA) - { - ARMReg RA = gpr.R(inst.RA); - MOV(R10, RA); // - 4 - } - else - MOV(R10, 0); // - 4 - LoadToReg(RD, R10, 8, inst.SIMM_16); - } - else -#endif - { - if (inst.RA) - { - MOVI2R(rB, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(rB, rB, RA); - } - else - MOVI2R(rB, (u32)inst.SIMM_16); - - MOVI2R(rA, (u32)&Memory::Read_U8); - PUSH(4, R0, R1, R2, R3); - MOV(R0, rB); - BL(rA); - MOV(rA, R0); - POP(4, R0, R1, R2, R3); - MOV(RD, rA); - gpr.Unlock(rA, rB); - } - SetJumpTarget(DoNotLoad); -} - -void JitArm::lhz(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg rA = gpr.GetReg(); - ARMReg rB = gpr.GetReg(); - ARMReg RD = gpr.R(inst.RD); - LDR(rA, R9, PPCSTATE_OFF(Exceptions)); - CMP(rA, EXCEPTION_DSI); - FixupBranch DoNotLoad = B_CC(CC_EQ); -#if FASTMEM - // Backpatch route - // Gets loaded in to RD - // Address is in R10 - if (Core::g_CoreStartupParameter.bFastmem) - { - if (inst.RA) - { - ARMReg RA = gpr.R(inst.RA); - MOV(R10, RA); // - 4 - } - else - MOV(R10, 0); // - 4 - - LoadToReg(RD, R10, 16, (u32)inst.SIMM_16); - } - else -#endif - { - if (inst.RA) - { - MOVI2R(rB, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(rB, rB, RA); - } - else - MOVI2R(rB, (u32)inst.SIMM_16); - - MOVI2R(rA, (u32)&Memory::Read_U16); - PUSH(4, R0, R1, R2, R3); - MOV(R0, rB); - BL(rA); - MOV(rA, R0); - POP(4, R0, R1, R2, R3); - MOV(RD, rA); - } - - gpr.Unlock(rA, rB); - SetJumpTarget(DoNotLoad); -} -void JitArm::lha(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg rA = gpr.GetReg(); - ARMReg rB = gpr.GetReg(); - ARMReg RD = gpr.R(inst.RD); - LDR(rA, R9, PPCSTATE_OFF(Exceptions)); - CMP(rA, EXCEPTION_DSI); - FixupBranch DoNotLoad = B_CC(CC_EQ); - - if (inst.RA) - { - MOVI2R(rB, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(rB, rB, RA); - } - else - MOVI2R(rB, (u32)inst.SIMM_16); - - MOVI2R(rA, (u32)&Memory::Read_U16); - PUSH(4, R0, R1, R2, R3); - MOV(R0, rB); - BL(rA); - MOV(rA, R0); - SXTH(rA, rA); - POP(4, R0, R1, R2, R3); - MOV(RD, rA); - gpr.Unlock(rA, rB); - SetJumpTarget(DoNotLoad); -} - -void JitArm::lwz(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg rA = gpr.GetReg(); - ARMReg rB = gpr.GetReg(); - ARMReg RD = gpr.R(inst.RD); - LDR(rA, R9, PPCSTATE_OFF(Exceptions)); - CMP(rA, EXCEPTION_DSI); - FixupBranch DoNotLoad = B_CC(CC_EQ); - -#if FASTMEM - // Backpatch route - // Gets loaded in to RD - // Address is in R10 - if (Core::g_CoreStartupParameter.bFastmem) - { - gpr.Unlock(rA, rB); - if (inst.RA) - { - ARMReg RA = gpr.R(inst.RA); - MOV(R10, RA); // - 4 - } - else - MOV(R10, 0); // - 4 - LoadToReg(RD, R10, 32, (u32)inst.SIMM_16); - } - else -#endif - { - if (inst.RA) - { - MOVI2R(rB, inst.SIMM_16); - ARMReg RA = gpr.R(inst.RA); - ADD(rB, rB, RA); - } - else - MOVI2R(rB, (u32)inst.SIMM_16); - - MOVI2R(rA, (u32)&Memory::Read_U32); - PUSH(4, R0, R1, R2, R3); - MOV(R0, rB); - BL(rA); - MOV(rA, R0); - POP(4, R0, R1, R2, R3); - MOV(RD, rA); - gpr.Unlock(rA, rB); - } - SetJumpTarget(DoNotLoad); - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && - (inst.hex & 0xFFFF0000) == 0x800D0000 && - (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || - (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && - Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) - { - gpr.Flush(); - fpr.Flush(); - - // if it's still 0, we can wait until the next event - TST(RD, RD); - FixupBranch noIdle = B_CC(CC_NEQ); - rA = gpr.GetReg(); - - MOVI2R(rA, (u32)&PowerPC::OnIdle); - MOVI2R(R0, PowerPC::ppcState.gpr[inst.RA] + (s32)(s16)inst.SIMM_16); - BL(rA); - - gpr.Unlock(rA); - WriteExceptionExit(); - - SetJumpTarget(noIdle); - - //js.compilerPC += 8; - return; - } -} -void JitArm::lwzx(UGeckoInstruction inst) -{ - INSTRUCTION_START - JITDISABLE(LoadStore) - - ARMReg rA = gpr.GetReg(); - ARMReg rB = gpr.GetReg(); - - ARMReg RB = gpr.R(inst.RB); - ARMReg RD = gpr.R(inst.RD); - LDR(rA, R9, PPCSTATE_OFF(Exceptions)); - CMP(rA, EXCEPTION_DSI); - FixupBranch DoNotLoad = B_CC(CC_EQ); -#if FASTMEM - // Backpatch route - // Gets loaded in to RD - // Address is in R10 - if (Core::g_CoreStartupParameter.bFastmem) - { - gpr.Unlock(rA, rB); - if (inst.RA) - { - ARMReg RA = gpr.R(inst.RA); - ADD(R10, RA, RB); // - 4 - } - else - MOV(R10, RB); // -4 - LoadToReg(RD, R10, 32, 0); - } - else -#endif - { - if (inst.RA) - { - ARMReg RA = gpr.R(inst.RA); - ADD(rB, RA, RB); - } - else - MOV(rB, RB); - - MOVI2R(rA, (u32)&Memory::Read_U32); - PUSH(4, R0, R1, R2, R3); - MOV(R0, rB); - BL(rA); - MOV(rA, R0); - POP(4, R0, R1, R2, R3); - MOV(RD, rA); - gpr.Unlock(rA, rB); - } - SetJumpTarget(DoNotLoad); - //// u32 temp = Memory::Read_U32(_inst.RA ? (m_GPR[_inst.RA] + m_GPR[_inst.RB]) : m_GPR[_inst.RB]); -} void JitArm::dcbst(UGeckoInstruction inst) { diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 5a4d33ea32..71c3e7c856 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -78,14 +78,14 @@ static GekkoOPTemplate primarytable[] = {28, &JitArm::arith}, //"andi_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, {29, &JitArm::arith}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, - {32, &JitArm::lwz}, //"lwz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, - {33, &JitArm::Default}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, - {34, &JitArm::lbz}, //"lbz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, - {35, &JitArm::Default}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, - {40, &JitArm::lhz}, //"lhz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, - {41, &JitArm::Default}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, - {42, &JitArm::lha}, //"lha", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, - {43, &JitArm::Default}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {32, &JitArm::lXX}, //"lwz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {33, &JitArm::lXX}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {34, &JitArm::lXX}, //"lbz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {35, &JitArm::lXX}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {40, &JitArm::lXX}, //"lhz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {41, &JitArm::lXX}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {42, &JitArm::lXX}, //"lha", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {43, &JitArm::lXX}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, {44, &JitArm::stX}, //"sth", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, {45, &JitArm::stX}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, @@ -221,24 +221,24 @@ static GekkoOPTemplate table31[] = {1014, &JitArm::Default}, //"dcbz", OPTYPE_DCACHE, 0, 4}}, //load word - {23, &JitArm::lwzx}, //"lwzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, - {55, &JitArm::Default}, //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + {23, &JitArm::lXX}, //"lwzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {55, &JitArm::lXX}, //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, //load halfword - {279, &JitArm::Default}, //"lhzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, - {311, &JitArm::Default}, //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + {279, &JitArm::lXX}, //"lhzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {311, &JitArm::lXX}, //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, //load halfword signextend - {343, &JitArm::Default}, //"lhax", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, - {375, &JitArm::Default}, //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + {343, &JitArm::lXX}, //"lhax", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {375, &JitArm::lXX}, //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, //load byte - {87, &JitArm::Default}, //"lbzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, - {119, &JitArm::Default}, //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + {87, &JitArm::lXX}, //"lbzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {119, &JitArm::lXX}, //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, //load byte reverse - {534, &JitArm::Default}, //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, - {790, &JitArm::Default}, //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {534, &JitArm::lXX}, //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {790, &JitArm::lXX}, //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, // Conditional load/store (Wii SMP) {150, &JitArm::Default}, //"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0}}, From 39ad48dfa56c7df6dd08a5e169878cb7877ef488 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 3 Sep 2013 09:55:15 +0000 Subject: [PATCH 040/267] [ARM] lmw implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 24 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index a04d9e0dd5..6bea38eee7 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -179,6 +179,7 @@ public: // LoadStore void stX(UGeckoInstruction _inst); void lXX(UGeckoInstruction _inst); + void lmw(UGeckoInstruction _inst); void icbi(UGeckoInstruction _inst); void dcbst(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 295de5af66..4abff14e15 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -436,6 +436,30 @@ void JitArm::LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) gpr.Unlock(rA); } +// Some games use this heavily in video codecs +// We make the assumption that this pulls from main RAM at /all/ times +void JitArm::lmw(UGeckoInstruction inst) +{ + u32 a = inst.RA; + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, inst.SIMM_16); + if (a) + ADD(rA, rA, gpr.R(a)); + MOVI2R(rB, Memory::MEMVIEW32_MASK, false); // 1-2 + AND(rA, rA, rB); // 3 + MOVI2R(rB, (u32)Memory::base, false); // 4-5 + ADD(rA, rA, rB); // 6 + + for (int i = inst.RD; i < 32; i++) + { + ARMReg RX = gpr.R(i); + LDR(RX, rA, (i - inst.RD) * 4); + REV(RX, RX); + } + gpr.Unlock(rA, rB); +} + void JitArm::dcbst(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 71c3e7c856..338de355df 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -94,7 +94,7 @@ static GekkoOPTemplate primarytable[] = {38, &JitArm::stX}, //"stb", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, {39, &JitArm::stX}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, - {46, &JitArm::Default}, //"lmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, + {46, &JitArm::lmw}, //"lmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, {47, &JitArm::Default}, //"stmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, {48, &JitArm::lfs}, //"lfs", OPTYPE_LOADFP, FL_IN_A}}, From 4f72671d32cfba5fbf203417dff3ea34f62b7bf8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 3 Sep 2013 07:05:02 -0400 Subject: [PATCH 041/267] [Android] Change the documentation of the FolderBrowser class. We don't show invalid items anymore. --- .../org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java index 890c43f347..0ff89816e6 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java @@ -33,8 +33,7 @@ import org.dolphinemu.dolphinemu.gamelist.GameListActivity; * the game list for easy browsing the next time the * application is used. *

- * Note that invalid items will be shown in the color red.
- * Also note that this file browser does not display files + * Note that this file browser does not display files * or directories that are hidden */ public final class FolderBrowser extends Fragment From 0255e1391244f70fc7b0a81dc133638f2cab745a Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 3 Sep 2013 17:36:55 +0200 Subject: [PATCH 042/267] ogl: disable revision 737df2a68cd5 for desktop ogl texelFetch doesn't filter linear, so every copy with filters didn't work correctly. This is still the case for gles, but this will be fixed after the 4.0 release. Fixes issue 6465. --- Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h | 5 +---- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h index 5da16a818e..5b0d66f7f6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h @@ -60,10 +60,7 @@ struct XFBSource : public XFBSourceBase inline GLenum getFbType() { #ifndef USE_GLES3 - if(g_ogl_config.eSupportedGLSLVersion == GLSL_120) - { - return GL_TEXTURE_RECTANGLE; - } + return GL_TEXTURE_RECTANGLE; #endif return GL_TEXTURE_2D; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 95c5c3f46d..b99b112f2f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -566,9 +566,9 @@ void ProgramShaderCache::CreateHeader ( void ) , v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implement dual source blend , v==GLSL_120 ? "" : "out vec4 name;" - , v==GLSL_120 ? "#extension GL_ARB_texture_rectangle : enable" : "" - , v==GLSL_120 ? "" : "#define texture2DRect(samp, uv) texelFetch(samp, ivec2(floor(uv)), 0)" - , v==GLSL_120 ? "" : "#define sampler2DRect sampler2D" + , v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture" + , v==GLSLES3 ? "#define texture2DRect(samp, uv) texelFetch(samp, ivec2(floor(uv)), 0)" : "" + , v==GLSLES3 ? "#define sampler2DRect sampler2D" : "" ); } From 7e1959a2007485daaae53f2501be0bf543dbf71a Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 3 Sep 2013 18:51:30 +0200 Subject: [PATCH 043/267] ogl: remove obsolete code --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 81d791f225..1839bca68a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1576,11 +1576,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons GL_REPORT_ERRORD(); // Clear framebuffer - if(!g_ActiveConfig.bAnaglyphStereo) - { - glClearColor(0, 0, 0, 0); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - } + glClearColor(0, 0, 0, 0); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); GL_REPORT_ERRORD(); From 8ae10b3e123fb9dd9369084d474e6184d23c88f9 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 3 Sep 2013 15:50:41 -0400 Subject: [PATCH 044/267] [NetPlay] Allow recording movies during netplay. Fixes issue 6207. --- Source/Core/Core/Src/HW/SI.cpp | 5 ++++- Source/Core/Core/Src/Movie.cpp | 22 +++++++++++++++--- Source/Core/Core/Src/Movie.h | 4 +++- Source/Core/Core/Src/NetPlayClient.cpp | 30 ++++++++++++++++++++++++- Source/Core/Core/Src/NetPlayClient.h | 5 +++++ Source/Core/DolphinWX/Src/NetWindow.cpp | 8 +++++++ Source/Core/DolphinWX/Src/NetWindow.h | 3 +++ 7 files changed, 71 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp index 5574ae536e..ff9057aa4f 100644 --- a/Source/Core/Core/Src/HW/SI.cpp +++ b/Source/Core/Core/Src/HW/SI.cpp @@ -644,7 +644,10 @@ int GetTicksToNextSIPoll() // Poll for input at regular intervals (once per frame) when playing or recording a movie if (Movie::IsPlayingInput() || Movie::IsRecordingInput()) { - return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate; + if (Movie::IsNetPlayRecording()) + return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate / 2; + else + return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate; } if (NetPlay::IsNetPlayRunning()) return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate / 2; diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index d22f625fce..5e9804cd25 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -24,6 +24,7 @@ #include "../../Common/Src/NandPaths.h" #include "polarssl/md5.h" #include "scmrev.h" +#include "NetPlayClient.h" // The chunk to allocate movie data in multiples of. #define DTM_BASE_LENGTH (1024) @@ -50,8 +51,8 @@ u64 g_currentFrame = 0, g_totalFrames = 0; // VI u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_recordingStartTime; // seconds since 1970 that recording started -bool bSaveConfig, bSkipIdle, bDualCore, bProgressive, bDSPHLE, bFastDiscSpeed = false; -bool bMemcard, g_bClearSave, bSyncGPU = false; +bool bSaveConfig = false, bSkipIdle = false, bDualCore = false, bProgressive = false, bDSPHLE = false, bFastDiscSpeed = false; +bool bMemcard = false, g_bClearSave = false, bSyncGPU = false, bNetPlay = false; std::string videoBackend = "unknown"; int iCPUCore = 1; bool g_bDiscChange = false; @@ -360,6 +361,11 @@ bool IsSyncGPU() return bSyncGPU; } +bool IsNetPlayRecording() +{ + return bNetPlay; +} + void ChangePads(bool instantly) { if (Core::GetState() == Core::CORE_UNINITIALIZED) @@ -409,7 +415,14 @@ bool BeginRecordingInput(int controllers) g_currentFrame = g_totalFrames = 0; g_currentLagCount = g_totalLagCount = 0; g_currentInputCount = g_totalInputCount = 0; - g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); + if (NetPlay::IsNetPlayRunning()) + { + bNetPlay = true; + g_recordingStartTime = NETPLAY_INITIAL_GCTIME; + } + else + g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); + g_rerecords = 0; for (int i = 0; i < 4; i++) @@ -682,6 +695,7 @@ void ReadHeader() bMemcard = tmpHeader.bMemcard; bongos = tmpHeader.bongos; bSyncGPU = tmpHeader.bSyncGPU; + bNetPlay = tmpHeader.bNetPlay; memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision)); } else @@ -1108,6 +1122,7 @@ void SaveRecording(const char *filename) header.bMemcard = bMemcard; header.bClearSave = g_bClearSave; header.bSyncGPU = bSyncGPU; + header.bNetPlay = bNetPlay; strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); memcpy(header.md5,MD5,16); @@ -1168,6 +1183,7 @@ void GetSettings() videoBackend = g_video_backend->GetName(); bSyncGPU = SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU; iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + bNetPlay = NetPlay::IsNetPlayRunning(); if (!Core::g_CoreStartupParameter.bWii) g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 27ac18e1b6..423393c7a4 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -107,7 +107,8 @@ struct DTMHeader { bool bClearSave; // Create a new memory card when playing back a movie if true u8 bongos; bool bSyncGPU; - u8 reserved[14]; // Padding for any new config options + bool bNetPlay; + u8 reserved[13]; // Padding for any new config options u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 revision[20]; // Git hash u8 reserved2[27]; // Make heading 256 bytes, just because we can @@ -142,6 +143,7 @@ bool IsUsingMemcard(); bool IsSyncGPU(); void SetGraphicsConfig(); void GetSettings(); +bool IsNetPlayRecording(); bool IsUsingPad(int controller); bool IsUsingWiimote(int wiimote); diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 428a217fed..4a568c9607 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -17,6 +17,7 @@ // for wiimote/ OSD messages #include "Core.h" #include "ConfigManager.h" +#include "Movie.h" std::mutex crit_netplay_client; static NetPlayClient * netplay_client = NULL; @@ -420,6 +421,21 @@ bool NetPlayClient::StartGame(const std::string &path) ClearBuffers(); + if (m_dialog->IsRecording()) + { + + if (Movie::IsReadOnly()) + Movie::SetReadOnly(false); + + u8 controllers_mask = 0; + for (unsigned int i = 0; i < 4; ++i) + { + if (m_pad_map[i] > 0) + controllers_mask |= (1 << i); + } + Movie::BeginRecordingInput(controllers_mask); + } + // boot game m_dialog->BootGame(path); @@ -527,6 +543,18 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat Common::SleepCurrentThread(1); } + SPADStatus tmp; + tmp.stickY = ((u8*)&netvalues->nHi)[0]; + tmp.stickX = ((u8*)&netvalues->nHi)[1]; + tmp.button = ((u16*)&netvalues->nHi)[1]; + + tmp.substickX = ((u8*)&netvalues->nLo)[3]; + tmp.substickY = ((u8*)&netvalues->nLo)[2]; + tmp.triggerLeft = ((u8*)&netvalues->nLo)[1]; + tmp.triggerRight = ((u8*)&netvalues->nLo)[0]; + Movie::RecordInput(&tmp, pad_nb); + Movie::InputUpdate(); + return true; } @@ -634,7 +662,7 @@ u32 CEXIIPL::NetPlay_GetGCTime() std::lock_guard lk(crit_netplay_client); if (netplay_client) - return 1272737767; // watev + return NETPLAY_INITIAL_GCTIME; // watev else return 0; } diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index a5aea6e472..db949aaa7c 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -22,6 +22,8 @@ #include "FifoQueue.h" +const int NETPLAY_INITIAL_GCTIME = 1272737767; + class NetPad { public: @@ -46,6 +48,7 @@ public: virtual void OnMsgChangeGame(const std::string& filename) = 0; virtual void OnMsgStartGame() = 0; virtual void OnMsgStopGame() = 0; + virtual bool IsRecording() = 0; }; extern NetSettings g_NetPlaySettings; @@ -117,6 +120,8 @@ protected: PadMapping m_pad_map[4]; + bool m_is_recording; + private: void UpdateDevices(); void SendPadState(const PadMapping in_game_pad, const NetPad& np); diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index a31f9c1cb1..020ed4e72c 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -354,6 +354,9 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game bottom_szr->Add(m_memcard_write, 0, wxCENTER); } + m_record_chkbox = new wxCheckBox(panel, wxID_ANY, _("Record input")); + bottom_szr->Add(m_record_chkbox, 0, wxCENTER); + bottom_szr->AddStretchSpacer(1); bottom_szr->Add(quit_btn); @@ -565,6 +568,11 @@ void NetPlayDiag::OnConfigPads(wxCommandEvent&) netplay_server->SetPadMapping(mapping); } +bool NetPlayDiag::IsRecording() +{ + return m_record_chkbox->GetValue(); +} + ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* const game_list, wxString& game_name) : wxDialog(parent, wxID_ANY, _("Change Game"), wxDefaultPosition, wxDefaultSize) , m_game_name(game_name) diff --git a/Source/Core/DolphinWX/Src/NetWindow.h b/Source/Core/DolphinWX/Src/NetWindow.h index 3f8502a6ee..f271f12afe 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.h +++ b/Source/Core/DolphinWX/Src/NetWindow.h @@ -81,6 +81,8 @@ public: static NetPlayDiag *&GetInstance() { return npd; }; + bool IsRecording(); + private: DECLARE_EVENT_TABLE() @@ -97,6 +99,7 @@ private: wxTextCtrl* m_chat_text; wxTextCtrl* m_chat_msg_text; wxCheckBox* m_memcard_write; + wxCheckBox* m_record_chkbox; std::string m_selected_game; wxButton* m_game_btn; From 70cfe96492416ce1efae17089d44668fac0acaa4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 3 Sep 2013 17:25:45 -0400 Subject: [PATCH 045/267] [Android] Fix an accidental call to the wrong method in the superclass of EmulationActivity. Should have been returning "super.onMenuItemSelected(itemId, item)" instead of "super.onOptionsItemSelected(item)". --- .../src/org/dolphinemu/dolphinemu/EmulationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java index 09c7c86e70..4c5eb4d978 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java @@ -177,7 +177,7 @@ public final class EmulationActivity extends Activity return true; default: - return super.onOptionsItemSelected( item ); + return super.onMenuItemSelected(itemId, item); } } From e110f1049c490f32a32ffb974ed31e34e5b82ee8 Mon Sep 17 00:00:00 2001 From: Justin Chadwick Date: Tue, 3 Sep 2013 17:41:52 -0400 Subject: [PATCH 046/267] [NetPlay] Make the Memory Card A/B setting sync across netplay. Fixes issue 6575. --- Source/Core/Core/Src/BootManager.cpp | 7 +++++++ Source/Core/Core/Src/NetPlayClient.cpp | 5 +++++ Source/Core/Core/Src/NetPlayProto.h | 4 +++- Source/Core/Core/Src/NetPlayServer.cpp | 2 ++ Source/Core/DolphinWX/Src/NetWindow.cpp | 2 ++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 6454df49d5..b2c7dbc058 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -46,6 +46,7 @@ struct ConfigCache bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread, bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; int iTLBHack, iCPUCore; + TEXIDevices m_EXIDevice[2]; std::string strBackend; }; static ConfigCache config_cache; @@ -94,6 +95,8 @@ bool BootCore(const std::string& _rFilename) config_cache.bHLE_BS2 = StartUp.bHLE_BS2; config_cache.m_EnableJIT = SConfig::GetInstance().m_EnableJIT; config_cache.bDSPThread = StartUp.bDSPThread; + config_cache.m_EXIDevice[0] = SConfig::GetInstance().m_EXIDevice[0]; + config_cache.m_EXIDevice[1] = SConfig::GetInstance().m_EXIDevice[1]; // General settings game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); @@ -144,6 +147,8 @@ bool BootCore(const std::string& _rFilename) StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard; SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT; + SConfig::GetInstance().m_EXIDevice[0] = g_NetPlaySettings.m_EXIDevice[0]; + SConfig::GetInstance().m_EXIDevice[1] = g_NetPlaySettings.m_EXIDevice[1]; } // Run the game @@ -184,6 +189,8 @@ void Stop() VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); StartUp.bHLE_BS2 = config_cache.bHLE_BS2; SConfig::GetInstance().m_EnableJIT = config_cache.m_EnableJIT; + SConfig::GetInstance().m_EXIDevice[0] = config_cache.m_EXIDevice[0]; + SConfig::GetInstance().m_EXIDevice[1] = config_cache.m_EXIDevice[1]; } } diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 4a568c9607..2889a44323 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -237,6 +237,11 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) packet >> g_NetPlaySettings.m_DSPEnableJIT; packet >> g_NetPlaySettings.m_DSPHLE; packet >> g_NetPlaySettings.m_WriteToMemcard; + int tmp; + packet >> tmp; + g_NetPlaySettings.m_EXIDevice[0] = (TEXIDevices) tmp; + packet >> tmp; + g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices) tmp; } m_dialog->OnMsgStartGame(); diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h index 550c7eb2f7..900b08f936 100644 --- a/Source/Core/Core/Src/NetPlayProto.h +++ b/Source/Core/Core/Src/NetPlayProto.h @@ -7,6 +7,7 @@ #include "Common.h" #include "CommonTypes.h" +#include "HW/EXI_Device.h" struct NetSettings { @@ -14,6 +15,7 @@ struct NetSettings bool m_DSPHLE; bool m_DSPEnableJIT; bool m_WriteToMemcard; + TEXIDevices m_EXIDevice[2]; }; struct Rpt : public std::vector @@ -23,7 +25,7 @@ struct Rpt : public std::vector typedef std::vector NetWiimote; -#define NETPLAY_VERSION "Dolphin NetPlay 2013-08-31" +#define NETPLAY_VERSION "Dolphin NetPlay 2013-09-03" // messages enum diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index c4d2f583ea..715fd5048d 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -455,6 +455,8 @@ bool NetPlayServer::StartGame(const std::string &path) spac << m_settings.m_DSPEnableJIT; spac << m_settings.m_DSPHLE; spac << m_settings.m_WriteToMemcard; + spac << m_settings.m_EXIDevice[0]; + spac << m_settings.m_EXIDevice[1]; std::lock_guard lkp(m_crit.players); std::lock_guard lks(m_crit.send); diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 020ed4e72c..c7ef839198 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -408,6 +408,8 @@ void NetPlayDiag::GetNetSettings(NetSettings &settings) settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; settings.m_DSPEnableJIT = instance.m_EnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue(); + settings.m_EXIDevice[0] = instance.m_EXIDevice[0]; + settings.m_EXIDevice[1] = instance.m_EXIDevice[1]; } std::string NetPlayDiag::FindGame() From e9ffba7ab8ee845277c3de50c43c3e18c05e4f38 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 3 Sep 2013 18:53:23 -0400 Subject: [PATCH 047/267] Don't ever ever let CFrame::DoStop() run twice at the same time. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 711195048b..dff7e9650c 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1017,6 +1017,9 @@ void CFrame::DoStop() if (confirmStop) return; + // don't let this function run again until it finishes, or is aborted. + confirmStop = true; + m_bGameLoading = false; if (Core::GetState() != Core::CORE_UNINITIALIZED || m_RenderParent != NULL) @@ -1030,7 +1033,6 @@ void CFrame::DoStop() if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop) { Core::EState state = Core::GetState(); - confirmStop = true; Core::SetState(Core::CORE_PAUSE); wxMessageDialog m_StopDlg( this, @@ -1040,10 +1042,10 @@ void CFrame::DoStop() wxDefaultPosition); int Ret = m_StopDlg.ShowModal(); - confirmStop = false; if (Ret != wxID_YES) { Core::SetState(state); + confirmStop = false; return; } } @@ -1058,6 +1060,7 @@ void CFrame::DoStop() wxBeginBusyCursor(); BootManager::Stop(); wxEndBusyCursor(); + confirmStop = false; #if defined(HAVE_X11) && HAVE_X11 if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) From 8684b7635a2cb67998ec03908093ffd2ecfda0d4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 4 Sep 2013 02:07:48 +0000 Subject: [PATCH 048/267] [ARM] Reimplement fastmem for the few loadstores that had it before. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp | 1 + Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 4 +- .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 98 +++++++++++-------- 3 files changed, 59 insertions(+), 44 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp index cd5f90d129..83609af768 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp @@ -296,6 +296,7 @@ void STACKALIGN JitArm::Jit(u32 em_address) } void JitArm::Break(UGeckoInstruction inst) { + ERROR_LOG(DYNA_REC, "%s called a Break instruction!", PPCTables::GetInstructionName(inst)); BKPT(0x4444); } diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 6bea38eee7..264ec588e3 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -127,8 +127,8 @@ public: void UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset); void SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 offsetReg, int accessSize, s32 offset); - void SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse); - void LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset); + void UnsafeLoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset); + void SafeLoadToReg(bool fastmem, u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse); // OPCODES diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 4abff14e15..b3f8a3cbb1 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -217,9 +217,58 @@ void JitArm::stX(UGeckoInstruction inst) } } -void JitArm::SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse) +void JitArm::UnsafeLoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) +{ + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, offset, false); // -3 + ADD(addr, addr, rA); // - 1 + + // All this gets replaced on backpatch + MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 2 + AND(addr, addr, rA); // 3 + MOVI2R(rA, (u32)Memory::base, false); // 5 + ADD(addr, addr, rA); // 6 + switch (accessSize) + { + case 32: + LDR(dest, addr); // 7 + break; + case 16: + LDRH(dest, addr); + break; + case 8: + LDRB(dest, addr); + break; + } + switch (accessSize) + { + case 32: + REV(dest, dest); // 9 + break; + case 16: + REV16(dest, dest); + break; + case 8: + NOP(1); + break; + + } + gpr.Unlock(rA); +} + +void JitArm::SafeLoadToReg(bool fastmem, u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse) { ARMReg RD = gpr.R(dest); + if (Core::g_CoreStartupParameter.bFastmem && fastmem) + { + if (addr != -1) + MOV(R10, gpr.R(addr)); + else + MOV(R10, 0); + + UnsafeLoadToReg(RD, R10, accessSize, offset); + return; + } ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); @@ -273,7 +322,8 @@ void JitArm::lXX(UGeckoInstruction inst) bool update = false; bool signExtend = false; bool reverse = false; - + bool fastmem = false; + switch(inst.OPCD) { case 31: @@ -322,18 +372,21 @@ void JitArm::lXX(UGeckoInstruction inst) zeroA = false; update = true; case 32: // lwz + fastmem = true; accessSize = 32; break; case 35: // lbzu zeroA = false; update = true; case 34: // lbz + fastmem = true; accessSize = 8; break; case 41: // lhzu zeroA = false; update = true; case 40: // lhz + fastmem = true; accessSize = 16; break; case 43: // lhau @@ -351,7 +404,7 @@ void JitArm::lXX(UGeckoInstruction inst) CMP(rA, EXCEPTION_DSI); FixupBranch DoNotLoad = B_CC(CC_EQ); - SafeLoadToReg(d, zeroA ? a ? a : -1 : a, offsetReg, accessSize, offset, signExtend, reverse); + SafeLoadToReg(fastmem, d, zeroA ? a ? a : -1 : a, offsetReg, accessSize, offset, signExtend, reverse); if (update) { @@ -397,45 +450,6 @@ void JitArm::lXX(UGeckoInstruction inst) } -void JitArm::LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) -{ - ARMReg rA = gpr.GetReg(); - MOVI2R(rA, offset, false); // -3 - ADD(addr, addr, rA); // - 1 - - // All this gets replaced on backpatch - MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 2 - AND(addr, addr, rA); // 3 - MOVI2R(rA, (u32)Memory::base, false); // 5 - ADD(addr, addr, rA); // 6 - switch (accessSize) - { - case 32: - LDR(dest, addr); // 7 - break; - case 16: - LDRH(dest, addr); - break; - case 8: - LDRB(dest, addr); - break; - } - switch (accessSize) - { - case 32: - REV(dest, dest); // 9 - break; - case 16: - REV16(dest, dest); - break; - case 8: - NOP(1); - break; - - } - gpr.Unlock(rA); -} - // Some games use this heavily in video codecs // We make the assumption that this pulls from main RAM at /all/ times void JitArm::lmw(UGeckoInstruction inst) From 7e26aace9f08d600f938605e8ed1ef6cbe3e2b3e Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 4 Sep 2013 03:27:45 +0000 Subject: [PATCH 049/267] [ARM] Reenable ps_add. Issue is due to something in the FPR cache. Still needs to be investigated. --- .../Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 279ed10a48..148e2f086b 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -27,14 +27,11 @@ #include "JitRegCache.h" #include "JitAsm.h" -// Wrong, THP videos like SMS and Ikaruga show artifacts void JitArm::ps_add(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(Paired) - Default(inst); return; - u32 a = inst.FA, b = inst.FB, d = inst.FD; if (inst.Rc){ Default(inst); return; @@ -45,9 +42,10 @@ void JitArm::ps_add(UGeckoInstruction inst) ARMReg vB1 = fpr.R1(b); ARMReg vD0 = fpr.R0(d); ARMReg vD1 = fpr.R1(d); - + VADD(vD0, vA0, vB0); VADD(vD1, vA1, vB1); + fpr.Flush(); } // Wrong, THP videos like SMS and Ikaruga show artifacts @@ -106,6 +104,7 @@ void JitArm::ps_sum0(UGeckoInstruction inst) VADD(vD0, vA0, vB1); VMOV(vD1, vC1); + fpr.Flush(); } void JitArm::ps_sub(UGeckoInstruction inst) @@ -126,12 +125,14 @@ void JitArm::ps_sub(UGeckoInstruction inst) VSUB(vD0, vA0, vB0); VSUB(vD1, vA1, vB1); + fpr.Flush(); } void JitArm::ps_mul(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(Paired) + u32 a = inst.FA, c = inst.FC, d = inst.FD; if (inst.Rc){ Default(inst); return; @@ -145,5 +146,6 @@ void JitArm::ps_mul(UGeckoInstruction inst) VMUL(vD0, vA0, vC0); VMUL(vD1, vA1, vC1); + fpr.Flush(); } From 1ea8b936676d5e0992a50cf4d0458658bf61978c Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 00:02:49 -0400 Subject: [PATCH 050/267] Fix typo in log message in WII_IOB.cpp. --- Source/Core/Core/Src/HW/WII_IOB.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WII_IOB.cpp b/Source/Core/Core/Src/HW/WII_IOB.cpp index 59d610afec..bfcf1024e4 100644 --- a/Source/Core/Core/Src/HW/WII_IOB.cpp +++ b/Source/Core/Core/Src/HW/WII_IOB.cpp @@ -29,7 +29,7 @@ void Read32(u32& _rReturnValue, const u32 _Address) break; // WiiMenu... no idea case 0x24: - ERROR_LOG(WII_IOB, "IOP: Read32 from 0x18 = 0x%08x (WiiMenu)", _Address); + ERROR_LOG(WII_IOB, "IOP: Read32 from 0x24 = 0x%08x (WiiMenu)", _Address); break; From e0214b1a38aaa3cf2f796118fcd700b00587e423 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 01:03:44 -0400 Subject: [PATCH 051/267] Fix syncing wiimotes on OS X. IOdarwin.mm was assuming that scanning was complete when the run loop was stopped (which the scan callback does), but somebody else was stopping the run loop first, causing the scan to be aborted. Wait until the scan is actually complete. --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 6e399f16ac..f0d285b274 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -7,6 +7,7 @@ @interface SearchBT: NSObject { @public unsigned int maxDevices; + bool done; } @end @@ -15,6 +16,7 @@ error: (IOReturn) error aborted: (BOOL) aborted { + done = true; CFRunLoopStop(CFRunLoopGetCurrent()); } @@ -144,9 +146,12 @@ void WiimoteScanner::FindWiimotes(std::vector & found_wiimotes, Wiimot else ERROR_LOG(WIIMOTE, "Unable to do bluetooth discovery"); - CFRunLoopRun(); + do + { + CFRunLoopRun(); + } + while(!sbt->done); - [bti stop]; int found_devices = [[bti foundDevices] count]; if (found_devices) From 0e949afa57c6a7e4532d4d160bd4289decf96e8c Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 01:11:04 -0400 Subject: [PATCH 052/267] Remove dubious retain on OS X. Revert this if the claimed crash actually shows up - or better, figure out the actual cause. --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index f0d285b274..8596b12080 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -210,11 +210,6 @@ bool Wiimote::Connect() return false; } - // As of 10.8 these need explicit retaining or writing to the wiimote has a very high - // chance of crashing and burning. - [ichan retain]; - [cchan retain]; - NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s", index + 1, [[btd addressString] UTF8String]); @@ -227,15 +222,15 @@ bool Wiimote::Connect() // Disconnect a wiimote. void Wiimote::Disconnect() { - if (btd != NULL) - [btd closeConnection]; - if (ichan != NULL) [ichan release]; if (cchan != NULL) [cchan release]; + if (btd != NULL) + [btd closeConnection]; + btd = NULL; cchan = NULL; ichan = NULL; From d0d053a9f9fc3cc65704c5abd8a2a3c92b3f33ae Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 4 Sep 2013 02:04:31 -0500 Subject: [PATCH 053/267] Fix for old libc version on bionic. Old versions would crash if the second argument was NULL. --- Source/Core/Common/Src/CDUtils.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp index 9a302b9189..f697476df5 100644 --- a/Source/Core/Common/Src/CDUtils.cpp +++ b/Source/Core/Common/Src/CDUtils.cpp @@ -214,7 +214,8 @@ bool cdio_is_cdrom(std::string device) #ifdef __linux__ // Resolve symbolic links. This allows symbolic links to valid // drives to be passed from the command line with the -e flag. - char *devname = realpath(device.c_str(), NULL); + char resolved_path[MAX_PATH]; + char *devname = realpath(device.c_str(), resolved_path); if (!devname) return false; #endif @@ -234,11 +235,6 @@ bool cdio_is_cdrom(std::string device) } } -#ifdef __linux__ - if (devname) - free(devname); -#endif - devices.clear(); return res; } From 906de748bd00a09486d2a16b337751c55ebac8f9 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 03:10:09 -0400 Subject: [PATCH 054/267] Refactor thread handling to fix OS X bug. On OS X, openL2CAPChannelSync registers events on the current thread's run loop, so Connect needs to be called on a thread that's going to do CFRunLoopRun; this was causing all Wiimote input to be ignored. Easiest way to do that is to use the Wiimote thread, and have Read call CFRunLoopRun to block on events, bringing OS X's Wiimote event loop in line with every other platform's. This also means that the thread can't be stopped and recreated by Prepare, so make Prepare notify it instead, which has the side effect of not making the GUI block on Prepare. (It would be nice if the GUI also did not block on searching for devices, because blocking the GUI is gross, but for now...) --- .../Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 4 +- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 7 +- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 4 +- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 27 ++- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 163 ++++++++++-------- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 22 ++- 6 files changed, 128 insertions(+), 99 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index 59025f9040..870d281326 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -43,12 +43,12 @@ bool WiimoteScanner::IsReady() const return false; } -bool Wiimote::Connect() +bool Wiimote::ConnectInternal() { return 0; } -void Wiimote::Disconnect() +void Wiimote::DisconnectInternal() { return; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index edd79f2bf6..014eadc9a8 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -27,8 +27,7 @@ namespace WiimoteReal { WiimoteScanner::WiimoteScanner() - : m_run_thread() - , m_want_wiimotes() + : m_want_wiimotes() , device_id(-1) , device_sock(-1) { @@ -135,7 +134,7 @@ void WiimoteScanner::FindWiimotes(std::vector & found_wiimotes, Wiimot } // Connect to a wiimote with a known address. -bool Wiimote::Connect() +bool Wiimote::ConnectInternal() { sockaddr_l2 addr; addr.l2_family = AF_BLUETOOTH; @@ -168,7 +167,7 @@ bool Wiimote::Connect() return true; } -void Wiimote::Disconnect() +void Wiimote::DisconnectInternal() { close(cmd_sock); close(int_sock); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 5d4d26108f..866284b323 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -459,7 +459,7 @@ bool WiimoteScanner::IsReady() const } // Connect to a wiimote with a known device path. -bool Wiimote::Connect() +bool Wiimote::ConnectInternal() { if (IsConnected()) return false; @@ -535,7 +535,7 @@ bool Wiimote::Connect() return true; } -void Wiimote::Disconnect() +void Wiimote::DisconnectInternal() { if (!IsConnected()) return; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 8596b12080..17e867bc7a 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -64,7 +64,7 @@ return; } - if (wm->inputlen != 0) { + if (wm->inputlen != -1) { WARN_LOG(WIIMOTE, "Dropping packet for wiimote %i, queue full", wm->index + 1); return; @@ -73,9 +73,8 @@ memcpy(wm->input, data, length); wm->inputlen = length; - (void)wm->Read(); - (void)UpdateSystemActivity(UsrActivity); + CFRunLoopStop(CFRunLoopGetCurrent()); } - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel @@ -100,7 +99,7 @@ WARN_LOG(WIIMOTE, "Lost channel to wiimote %i", wm->index + 1); - wm->Disconnect(); + wm->DisconnectInternal(); } @end @@ -189,7 +188,7 @@ bool WiimoteScanner::IsReady() const } // Connect to a wiimote with a known address. -bool Wiimote::Connect() +bool Wiimote::ConnectInternal() { if (IsConnected()) return false; @@ -204,12 +203,12 @@ bool Wiimote::Connect() { ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels " "for wiimote %i", index + 1); - Disconnect(); + DisconnectInternal(); [cbt release]; return false; } - + NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s", index + 1, [[btd addressString] UTF8String]); @@ -220,7 +219,7 @@ bool Wiimote::Connect() } // Disconnect a wiimote. -void Wiimote::Disconnect() +void Wiimote::DisconnectInternal() { if (ichan != NULL) [ichan release]; @@ -250,16 +249,12 @@ bool Wiimote::IsConnected() const int Wiimote::IORead(unsigned char *buf) { - int bytes; + input = buf; + inputlen = -1; - if (!IsConnected()) - return 0; + CFRunLoopRun(); - bytes = inputlen; - memcpy(buf, input, bytes); - inputlen = 0; - - return bytes; + return inputlen; } int Wiimote::IOWrite(const unsigned char *buf, int len) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index d2e7e2f57a..aead9d60fa 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -40,7 +40,7 @@ WiimoteScanner g_wiimote_scanner; Wiimote::Wiimote() : index() #ifdef __APPLE__ - , btd(), ichan(), cchan(), inputlen(), m_connected() + , btd(), ichan(), cchan(), input(), inputlen(), m_connected() #elif defined(__linux__) && HAVE_BLUEZ , cmd_sock(-1), int_sock(-1) #elif defined(_WIN32) @@ -49,7 +49,7 @@ Wiimote::Wiimote() , m_last_input_report() , m_channel(0) , m_rumble_state() - , m_run_thread(false) + , m_need_prepare() { #if defined(__linux__) && HAVE_BLUEZ bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; @@ -60,9 +60,6 @@ Wiimote::~Wiimote() { StopThread(); - if (IsConnected()) - Disconnect(); - ClearReadQueue(); m_write_reports.Clear(); } @@ -225,8 +222,8 @@ bool Wiimote::Read() } else if (0 == result) { - WARN_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting Wiimote %d.", index + 1); - Disconnect(); + ERROR_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting Wiimote %d.", index + 1); + DisconnectInternal(); } return false; @@ -308,27 +305,31 @@ void Wiimote::Update() rpt.data(), rpt.size()); } -bool Wiimote::Prepare(int _index) +void Wiimote::Prepare(int _index) { index = _index; + m_need_prepare = true; +} +bool Wiimote::PrepareOnThread() +{ // core buttons, no continuous reporting - u8 const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REPORT_MODE, 0, WM_REPORT_CORE}; + u8 static const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REPORT_MODE, 0, WM_REPORT_CORE}; // Set the active LEDs and turn on rumble. - u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_LEDS, u8(WIIMOTE_LED_1 << (index%WIIMOTE_BALANCE_BOARD) | 0x1)}; + u8 static const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_LEDS, u8(WIIMOTE_LED_1 << (index%WIIMOTE_BALANCE_BOARD) | 0x1)}; // Turn off rumble - u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_RUMBLE, 0}; + u8 static const rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_RUMBLE, 0}; // Request status report - u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0}; + u8 static const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0}; // TODO: check for sane response? return (IOWrite(mode_report, sizeof(mode_report)) - && IOWrite(led_report, sizeof(led_report)) - && (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report))) - && IOWrite(req_status_report, sizeof(req_status_report))); + && IOWrite(led_report, sizeof(led_report)) + && (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report))) + && IOWrite(req_status_report, sizeof(req_status_report))); } void Wiimote::EmuStart() @@ -480,35 +481,75 @@ void WiimoteScanner::ThreadFunc() NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped."); } +bool Wiimote::Connect() +{ + m_thread_ready = false; + StartThread(); + WaitReady(); + return IsConnected(); +} + void Wiimote::StartThread() { - m_run_thread = true; m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); } void Wiimote::StopThread() { - m_run_thread = false; if (m_wiimote_thread.joinable()) m_wiimote_thread.join(); } +void Wiimote::SetReady() +{ + if (!m_thread_ready) + { + { + std::lock_guard Guard(m_thread_ready_mutex); + m_thread_ready = true; + } + m_thread_ready_cond.notify_all(); + } +} + +void Wiimote::WaitReady() +{ + std::unique_lock lock(m_thread_ready_mutex); + while (!m_thread_ready) + { + m_thread_ready_cond.wait(lock); + } +} + void Wiimote::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Device Thread"); + bool ok = ConnectInternal(); + + SetReady(); + + if (!ok) + { + return; + } // main loop - while (m_run_thread && IsConnected()) + while (IsConnected()) { -#ifdef __APPLE__ - // Reading happens elsewhere on OSX - bool const did_something = Write(); -#else - bool const did_something = Write() || Read(); -#endif - if (!did_something) - Common::SleepCurrentThread(1); + if (m_need_prepare) + { + m_need_prepare = false; + if (!PrepareOnThread()) + { + ERROR_LOG(WIIMOTE, "Wiimote::PrepareOnThread failed. Disconnecting Wiimote %d.", index + 1); + DisconnectInternal(); + } + } + Write(); + Read(); } + + DisconnectInternal(); } void LoadSettings() @@ -629,24 +670,32 @@ void ChangeWiimoteSource(unsigned int index, int source) Host_ConnectWiimote(index, true); } +static bool TryToConnectWiimoteN(Wiimote* wm, unsigned int i) +{ + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] + && !g_wiimotes[i]) + { + if (wm->Connect()) + { + wm->Prepare(i); + NOTICE_LOG(WIIMOTE, "Connected to Wiimote %i.", i + 1); + g_wiimotes[i] = wm; + Host_ConnectWiimote(i, true); + } + return true; + } + return false; +} + void TryToConnectWiimote(Wiimote* wm) { std::unique_lock lk(g_refresh_lock); for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) { - if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] - && !g_wiimotes[i]) + if (TryToConnectWiimoteN(wm, i)) { - if (wm->Connect() && wm->Prepare(i)) - { - NOTICE_LOG(WIIMOTE, "Connected to Wiimote %i.", i + 1); - - std::swap(g_wiimotes[i], wm); - g_wiimotes[i]->StartThread(); - - Host_ConnectWiimote(i, true); - } + wm = NULL; break; } } @@ -661,19 +710,10 @@ void TryToConnectWiimote(Wiimote* wm) void TryToConnectBalanceBoard(Wiimote* wm) { std::unique_lock lk(g_refresh_lock); - - if (WIIMOTE_SRC_REAL & g_wiimote_sources[WIIMOTE_BALANCE_BOARD] - && !g_wiimotes[WIIMOTE_BALANCE_BOARD]) + + if (TryToConnectWiimoteN(wm, WIIMOTE_BALANCE_BOARD)) { - if (wm->Connect() && wm->Prepare(WIIMOTE_BALANCE_BOARD)) - { - NOTICE_LOG(WIIMOTE, "Connected to Balance Board %i.", WIIMOTE_BALANCE_BOARD + 1); - - std::swap(g_wiimotes[WIIMOTE_BALANCE_BOARD], wm); - g_wiimotes[WIIMOTE_BALANCE_BOARD]->StartThread(); - - Host_ConnectWiimote(WIIMOTE_BALANCE_BOARD, true); - } + wm = NULL; } g_wiimote_scanner.WantBB(0 != CalculateWantedBB()); @@ -687,26 +727,13 @@ void DoneWithWiimote(int index) { std::lock_guard lk(g_refresh_lock); - if (g_wiimotes[index]) + Wiimote* wm = g_wiimotes[index]; + + if (wm) { - g_wiimotes[index]->StopThread(); - + g_wiimotes[index] = NULL; // First see if we can use this real Wiimote in another slot. - for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - { - if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] - && !g_wiimotes[i]) - { - if (g_wiimotes[index]->Prepare(i)) - { - std::swap(g_wiimotes[i], g_wiimotes[index]); - g_wiimotes[i]->StartThread(); - - Host_ConnectWiimote(i, true); - } - break; - } - } + TryToConnectWiimote(wm); } // else, just disconnect the Wiimote @@ -763,9 +790,7 @@ void Refresh() { if (g_wiimotes[i]) { - g_wiimotes[i]->StopThread(); g_wiimotes[i]->Prepare(i); - g_wiimotes[i]->StartThread(); } } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 2ab4e435e2..e48567acbb 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -52,13 +52,17 @@ public: // connecting and disconnecting from physical devices // (using address inserted by FindWiimotes) + // these are called from the wiimote's thread. + bool ConnectInternal(); + void DisconnectInternal(); + bool Connect(); - void Disconnect(); // TODO: change to something like IsRelevant bool IsConnected() const; - bool Prepare(int index); + void Prepare(int index); + bool PrepareOnThread(); void DisableDataReporting(); void EnableDataReporting(u8 mode); @@ -72,9 +76,10 @@ public: IOBluetoothDevice *btd; IOBluetoothL2CAPChannel *ichan; IOBluetoothL2CAPChannel *cchan; - char input[MAX_PAYLOAD]; + unsigned char* input; int inputlen; bool m_connected; + CFRunLoopRef m_wiimote_thread_run_loop; #elif defined(__linux__) && HAVE_BLUEZ bdaddr_t bdaddr; // Bluetooth address int cmd_sock; // Command socket @@ -100,12 +105,17 @@ private: int IOWrite(u8 const* buf, int len); void ThreadFunc(); + void SetReady(); + void WaitReady(); bool m_rumble_state; - bool m_run_thread; - std::thread m_wiimote_thread; - + std::thread m_wiimote_thread; + volatile bool m_thread_ready; + volatile bool m_need_prepare; + std::mutex m_thread_ready_mutex; + std::condition_variable m_thread_ready_cond; + Common::FifoQueue m_read_reports; Common::FifoQueue m_write_reports; From 02fc68ea5d1466998c7d59b2882a5f9e348de24b Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 03:21:38 -0400 Subject: [PATCH 055/267] While we're at it, explicitly wake up the Wiimote thread rather than using a 1s timeout. This only matters if reads are not constantly being completed by reports anyway, but seems like a good idea. --- .../Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 3 +++ Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 25 ++++++++++++++++--- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 20 ++++++++++++--- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 5 ++++ .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 14 ++++++++++- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 2 ++ 6 files changed, 60 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index 870d281326..e1ca6d603c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -58,6 +58,9 @@ bool Wiimote::IsConnected() const return false; } +void Wiimote::IOWakeup() +{} + int Wiimote::IORead(u8* buf) { return 0; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 014eadc9a8..826b9e67ce 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -181,26 +181,43 @@ bool Wiimote::IsConnected() const return cmd_sock != -1;// && int_sock != -1; } +void Wiimote::IOWakeup() +{ + char c = 0; + if (write(wakeup_pipe_w, &c, 1) != 1) + { + ERROR_LOG(WIIMOTE, "Unable to write to wakeup pipe."); + } +} + // positive = read packet // negative = didn't read packet // zero = error int Wiimote::IORead(u8* buf) { // Block select for 1/2000th of a second - timeval tv; - tv.tv_sec = 0; - tv.tv_usec = WIIMOTE_DEFAULT_TIMEOUT * 1000; fd_set fds; FD_ZERO(&fds); FD_SET(int_sock, &fds); + FD_SET(wakeup_pipe_r, &fds); - if (select(int_sock + 1, &fds, NULL, NULL, &tv) == -1) + if (select(int_sock + 1, &fds, NULL, NULL, NULL) == -1) { ERROR_LOG(WIIMOTE, "Unable to select wiimote %i input socket.", index + 1); return -1; } + if (FD_ISSET(wakeup_pipe_r, &fds)) + { + char c; + if (read(wakeup_pipe_r, &c, 1) != 1) + { + ERROR_LOG(WIIMOTE, "Unable to read from wakeup pipe."); + } + return -1; + } + if (!FD_ISSET(int_sock, &fds)) return -1; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 866284b323..206c11ab64 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -142,6 +142,7 @@ namespace WiimoteReal int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, int len); int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index); +void _IOWakeup(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read); template void ProcessWiimotes(bool new_scan, T& callback); @@ -557,6 +558,11 @@ bool Wiimote::IsConnected() const return dev_handle != 0; } +void _IOWakeup(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read) +{ + CancelIoEx(dev_handle, &hid_overlap_read); +} + // positive = read packet // negative = didn't read packet // zero = error @@ -575,7 +581,7 @@ int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index if (ERROR_IO_PENDING == read_err) { - auto const wait_result = WaitForSingleObject(hid_overlap_read.hEvent, WIIMOTE_DEFAULT_TIMEOUT); + auto const wait_result = WaitForSingleObject(hid_overlap_read.hEvent, INFINITE); if (WAIT_TIMEOUT == wait_result) { CancelIo(dev_handle); @@ -592,10 +598,10 @@ int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index if (ERROR_OPERATION_ABORTED == overlapped_err) { + /* if (buf[1] != 0) - WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).", - WIIMOTE_DEFAULT_TIMEOUT); - + WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem."); + */ return -1; } @@ -615,6 +621,12 @@ int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index return bytes + 1; } +void Wiimote::IOWakeup() +{ + _IOWakeup(dev_handle, hid_overlap_read); +} + + // positive = read packet // negative = didn't read packet // zero = error diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 17e867bc7a..c560ceb652 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -247,6 +247,11 @@ bool Wiimote::IsConnected() const return m_connected; } +void Wiimote::IOWakeup() +{ + CFRunLoopStop(m_wiimote_thread_run_loop); +} + int Wiimote::IORead(unsigned char *buf) { input = buf; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index aead9d60fa..ddf54dfc5a 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -52,6 +52,14 @@ Wiimote::Wiimote() , m_need_prepare() { #if defined(__linux__) && HAVE_BLUEZ + int fds[2]; + if (pipe(fds)) + { + ERROR_LOG(WIIMOTE, "pipe failed"); + abort(); + } + wakeup_pipe_w = fds[1]; + wakeup_pipe_r = fds[0]; bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; #endif } @@ -59,9 +67,12 @@ Wiimote::Wiimote() Wiimote::~Wiimote() { StopThread(); - ClearReadQueue(); m_write_reports.Clear(); +#if defined(__linux__) && HAVE_BLUEZ + close(wakeup_pipe_w); + close(wakeup_pipe_r); +#endif } // to be called from CPU thread @@ -82,6 +93,7 @@ void Wiimote::WriteReport(Report rpt) } m_write_reports.Push(std::move(rpt)); + IOWakeup(); } // to be called from CPU thread diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index e48567acbb..314fb2e83c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -84,6 +84,7 @@ public: bdaddr_t bdaddr; // Bluetooth address int cmd_sock; // Command socket int int_sock; // Interrupt socket + int wakeup_pipe_w, wakeup_pipe_r; #elif defined(_WIN32) std::basic_string devicepath; // Unique wiimote reference @@ -103,6 +104,7 @@ private: int IORead(u8* buf); int IOWrite(u8 const* buf, int len); + void IOWakeup(); void ThreadFunc(); void SetReady(); From 5696da0b3ea02a33e64c1de3e389b38c64c47e5a Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 4 Sep 2013 02:55:13 -0500 Subject: [PATCH 056/267] Revert "[NetPlay] Make the Memory Card A/B setting sync across netplay." This reverts commit e110f1049c490f32a32ffb974ed31e34e5b82ee8. This unfixes issue 6575. Reverted due to huge performance hit on behalf of JMC. --- Source/Core/Core/Src/BootManager.cpp | 7 ------- Source/Core/Core/Src/NetPlayClient.cpp | 5 ----- Source/Core/Core/Src/NetPlayProto.h | 4 +--- Source/Core/Core/Src/NetPlayServer.cpp | 2 -- Source/Core/DolphinWX/Src/NetWindow.cpp | 2 -- 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index b2c7dbc058..6454df49d5 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -46,7 +46,6 @@ struct ConfigCache bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread, bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; int iTLBHack, iCPUCore; - TEXIDevices m_EXIDevice[2]; std::string strBackend; }; static ConfigCache config_cache; @@ -95,8 +94,6 @@ bool BootCore(const std::string& _rFilename) config_cache.bHLE_BS2 = StartUp.bHLE_BS2; config_cache.m_EnableJIT = SConfig::GetInstance().m_EnableJIT; config_cache.bDSPThread = StartUp.bDSPThread; - config_cache.m_EXIDevice[0] = SConfig::GetInstance().m_EXIDevice[0]; - config_cache.m_EXIDevice[1] = SConfig::GetInstance().m_EXIDevice[1]; // General settings game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); @@ -147,8 +144,6 @@ bool BootCore(const std::string& _rFilename) StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard; SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT; - SConfig::GetInstance().m_EXIDevice[0] = g_NetPlaySettings.m_EXIDevice[0]; - SConfig::GetInstance().m_EXIDevice[1] = g_NetPlaySettings.m_EXIDevice[1]; } // Run the game @@ -189,8 +184,6 @@ void Stop() VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); StartUp.bHLE_BS2 = config_cache.bHLE_BS2; SConfig::GetInstance().m_EnableJIT = config_cache.m_EnableJIT; - SConfig::GetInstance().m_EXIDevice[0] = config_cache.m_EXIDevice[0]; - SConfig::GetInstance().m_EXIDevice[1] = config_cache.m_EXIDevice[1]; } } diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 2889a44323..4a568c9607 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -237,11 +237,6 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) packet >> g_NetPlaySettings.m_DSPEnableJIT; packet >> g_NetPlaySettings.m_DSPHLE; packet >> g_NetPlaySettings.m_WriteToMemcard; - int tmp; - packet >> tmp; - g_NetPlaySettings.m_EXIDevice[0] = (TEXIDevices) tmp; - packet >> tmp; - g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices) tmp; } m_dialog->OnMsgStartGame(); diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h index 900b08f936..550c7eb2f7 100644 --- a/Source/Core/Core/Src/NetPlayProto.h +++ b/Source/Core/Core/Src/NetPlayProto.h @@ -7,7 +7,6 @@ #include "Common.h" #include "CommonTypes.h" -#include "HW/EXI_Device.h" struct NetSettings { @@ -15,7 +14,6 @@ struct NetSettings bool m_DSPHLE; bool m_DSPEnableJIT; bool m_WriteToMemcard; - TEXIDevices m_EXIDevice[2]; }; struct Rpt : public std::vector @@ -25,7 +23,7 @@ struct Rpt : public std::vector typedef std::vector NetWiimote; -#define NETPLAY_VERSION "Dolphin NetPlay 2013-09-03" +#define NETPLAY_VERSION "Dolphin NetPlay 2013-08-31" // messages enum diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 715fd5048d..c4d2f583ea 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -455,8 +455,6 @@ bool NetPlayServer::StartGame(const std::string &path) spac << m_settings.m_DSPEnableJIT; spac << m_settings.m_DSPHLE; spac << m_settings.m_WriteToMemcard; - spac << m_settings.m_EXIDevice[0]; - spac << m_settings.m_EXIDevice[1]; std::lock_guard lkp(m_crit.players); std::lock_guard lks(m_crit.send); diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index c7ef839198..020ed4e72c 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -408,8 +408,6 @@ void NetPlayDiag::GetNetSettings(NetSettings &settings) settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; settings.m_DSPEnableJIT = instance.m_EnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue(); - settings.m_EXIDevice[0] = instance.m_EXIDevice[0]; - settings.m_EXIDevice[1] = instance.m_EXIDevice[1]; } std::string NetPlayDiag::FindGame() From 872e9ce3da35d3dc56b28a578a41edc6008d49cf Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 04:39:18 -0400 Subject: [PATCH 057/267] Add accidentally omitted code in last commit. (m_wiimote_thread_run_loop was being used but not set, causing Wiimote::IOWakeup to crash on OS X; todo rebase this) --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index ddf54dfc5a..6cb9521981 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -510,6 +510,10 @@ void Wiimote::StopThread() { if (m_wiimote_thread.joinable()) m_wiimote_thread.join(); +#if defined(__APPLE__) + CFRelease(m_wiimote_thread_run_loop); + m_wiimote_thread_run_loop = NULL; +#endif } void Wiimote::SetReady() @@ -536,6 +540,10 @@ void Wiimote::WaitReady() void Wiimote::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Device Thread"); +#if defined(__APPLE__) + m_wiimote_thread_run_loop = (CFRunLoopRef) CFRetain(CFRunLoopGetCurrent()); +#endif + bool ok = ConnectInternal(); SetReady(); From dc87b6d43196537842bc37d1bd6f3f28f911dd36 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 05:29:42 -0400 Subject: [PATCH 058/267] Fix OS X code. - Close the connection properly on destruction. - Work around what seems like an Apple bug. --- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index c560ceb652..0583cbf94c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -140,10 +140,11 @@ void WiimoteScanner::FindWiimotes(std::vector & found_wiimotes, Wiimot [bti setDelegate: sbt]; [bti setInquiryLength: 2]; - if ([bti start] == kIOReturnSuccess) - [bti retain]; - else + if ([bti start] != kIOReturnSuccess) + { ERROR_LOG(WIIMOTE, "Unable to do bluetooth discovery"); + return; + } do { @@ -164,7 +165,7 @@ void WiimoteScanner::FindWiimotes(std::vector & found_wiimotes, Wiimot continue; Wiimote *wm = new Wiimote(); - wm->btd = dev; + wm->btd = [dev retain]; if(IsBalanceBoardName([[dev name] UTF8String])) { @@ -195,17 +196,27 @@ bool Wiimote::ConnectInternal() ConnectBT *cbt = [[ConnectBT alloc] init]; + cchan = ichan = nil; + [btd openL2CAPChannelSync: &cchan withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; [btd openL2CAPChannelSync: &ichan withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt]; - if (ichan == NULL || cchan == NULL) + // Apple docs claim: + // "The L2CAP channel object is already retained when this function returns + // success; the channel must be released when the caller is done with it." + // But without this, the channels get over-autoreleased, even though the + // refcounting behavior here is clearly correct. + [ichan retain]; + [cchan retain]; + if (ichan == nil || cchan == nil) { ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels " "for wiimote %i", index + 1); DisconnectInternal(); - [cbt release]; + [ichan release]; + [cchan release]; return false; } @@ -221,19 +232,18 @@ bool Wiimote::ConnectInternal() // Disconnect a wiimote. void Wiimote::DisconnectInternal() { - if (ichan != NULL) - [ichan release]; - - if (cchan != NULL) - [cchan release]; - - if (btd != NULL) - [btd closeConnection]; - - btd = NULL; - cchan = NULL; + [ichan closeChannel]; + [ichan release]; ichan = NULL; + [cchan closeChannel]; + [cchan release]; + cchan = NULL; + + [btd closeConnection]; + [btd release]; + btd = NULL; + if (!IsConnected()) return; From 8992f587202529a94ee9e2fa3c1a01d10ea1c691 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 4 Sep 2013 05:30:16 -0400 Subject: [PATCH 059/267] Fix Wiimote thread wakeup on externally-triggered destroy. --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 5 ++++- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 6cb9521981..77f84449be 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -503,11 +503,14 @@ bool Wiimote::Connect() void Wiimote::StartThread() { + m_run_thread = true; m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); } void Wiimote::StopThread() { + m_run_thread = false; + IOWakeup(); if (m_wiimote_thread.joinable()) m_wiimote_thread.join(); #if defined(__APPLE__) @@ -554,7 +557,7 @@ void Wiimote::ThreadFunc() } // main loop - while (IsConnected()) + while (IsConnected() && m_run_thread) { if (m_need_prepare) { diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 314fb2e83c..fa94303a66 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -113,8 +113,12 @@ private: bool m_rumble_state; std::thread m_wiimote_thread; - volatile bool m_thread_ready; + // Whether to keep running the thread. + volatile bool m_run_thread; + // Whether to call PrepareOnThread. volatile bool m_need_prepare; + // Whether the thread has finished ConnectInternal. + volatile bool m_thread_ready; std::mutex m_thread_ready_mutex; std::condition_variable m_thread_ready_cond; From bdc04f91199ef57f067b26267b6666d97f67df73 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 06:46:11 -0400 Subject: [PATCH 060/267] [Android] Change the exception logging in NativeLibrary to be an error instead of a warning. Technically not having the required library should be regarded as an error, since the app won't even load without it. Also changed the logging tag in FolderBrowser. --- Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java | 2 +- .../org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java index 7dbec2daf7..d52532fb2e 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -148,7 +148,7 @@ public final class NativeLibrary } catch (UnsatisfiedLinkError ex) { - Log.w("NativeLibrary", ex.toString()); + Log.e("NativeLibrary", ex.toString()); } } } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java index 0ff89816e6..1d5336df31 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java @@ -81,7 +81,7 @@ public final class FolderBrowser extends Fragment } catch (Exception ex) { - Log.e("Exception-FolderBrowser", ex.toString()); + Log.e("FolderBrowser", ex.toString()); } } From a7c2b27a6adb5b0c741a47f3ef710c9d0b847bd1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 07:09:29 -0400 Subject: [PATCH 061/267] [Android] Remove unused strings from the resource XML files. --- Source/Android/res/values-ja/strings.xml | 3 --- Source/Android/res/values/strings.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index 9e53c0a9c7..3dfc3732a9 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -15,7 +15,6 @@ 現在のディレクトリ: 親ディレクトリ - フォルダ ファイルサイズ: @@ -24,7 +23,6 @@ ゲームリスト フォルダの参照 設定 - ゲームパッド設定 について @@ -63,7 +61,6 @@ C-スティック: → 左のトリガー 右のトリガー - %1$sを設定するにはボタンを押して Interpreter diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index bf9fd9eaa1..81490f4c93 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -15,7 +15,6 @@ Current Dir: Parent Directory - Folder File Size: @@ -24,7 +23,6 @@ Game List Browse Folder Settings - Gamepad Config About @@ -63,7 +61,6 @@ C Stick Right Trigger L Trigger R - Press button to configure %1$s Interpreter From a83d4e72261e67b654071c43b136c4954a4b9bfc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 07:19:02 -0400 Subject: [PATCH 062/267] [Android] Correct a typo for the load state menu root in the menu overlay XML. Should be "loadStateRoot", not "loadtateRoot" --- Source/Android/res/menu/emuwindow_overlay.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/res/menu/emuwindow_overlay.xml b/Source/Android/res/menu/emuwindow_overlay.xml index 04c7161699..837f8b23af 100644 --- a/Source/Android/res/menu/emuwindow_overlay.xml +++ b/Source/Android/res/menu/emuwindow_overlay.xml @@ -22,7 +22,7 @@

From 48cda9d26ffa540874cde317f0e86e18fd6fb9f4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 07:32:28 -0400 Subject: [PATCH 063/267] [Android] Display the name of the control that is being bound in the input settings. Makes the binding description more informative. --- Source/Android/res/values-ja/strings.xml | 2 +- Source/Android/res/values/strings.xml | 2 +- .../org/dolphinemu/dolphinemu/settings/InputConfigFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index 3dfc3732a9..31f37a64d4 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -40,7 +40,7 @@ 入力設定 入力バインディング - このコントロールにバインドするための入力を移動または押してください。 + %1$sにバインドするための入力を移動または押してください。 Aボタン Bボタン スタートボタン diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index 81490f4c93..67e00e05ff 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -40,7 +40,7 @@ Input Input Binding - Press or move an input to bind it to this control. + Press or move an input to bind it to %1$s Button A Button B Button Start diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java index 985fb6d45e..1436f4bdd7 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java @@ -183,7 +183,7 @@ public final class InputConfigFragment extends PreferenceFragment // Set the title and description message. dialog.setTitle(R.string.input_binding); - dialog.setMessage(getString(R.string.input_binding_descrip)); + dialog.setMessage(String.format(getString(R.string.input_binding_descrip), pref.getTitle())); // Don't allow the dialog to close when a user taps // outside of it. They must press cancel or provide an input. From 38304a7e42701ba7d95adcabd24d39be6504503d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 07:36:28 -0400 Subject: [PATCH 064/267] [Android] Simplify the JP settings labels. --- Source/Android/res/values-ja/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index 31f37a64d4..c2cf3c5e55 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -38,7 +38,7 @@ スロット 5 - 入力設定 + 入力 入力バインディング %1$sにバインドするための入力を移動または押してください。 Aボタン @@ -68,11 +68,11 @@ JITIL Recompiler JIT ARM Recompiler CPUコア - CPU設定 + CPU 使用するエミュレーションコア デュアルコア 処理のための2つのCPUコアを使用して。速度が向上します。 - ビデオ設定 + ビデオ Software Renderer OpenGL ES 3 ビデオレンダラ From b94a462fcad730f20c5f97014f755611bc00d847 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 07:43:56 -0400 Subject: [PATCH 065/267] [Android] Remove the compareTo implementation from SideMenuItem. We don't perform any operations that require it. --- .../dolphinemu/dolphinemu/sidemenu/SideMenuItem.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java index 334e1058a6..402fad094c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java @@ -10,7 +10,7 @@ package org.dolphinemu.dolphinemu.sidemenu; /** * Represents an item that goes in the sidemenu of the app. */ -public final class SideMenuItem implements Comparable +public final class SideMenuItem { private final String name; private final int id; @@ -46,13 +46,5 @@ public final class SideMenuItem implements Comparable { return id; } - - public int compareTo(SideMenuItem o) - { - if (name != null) - return name.toLowerCase().compareTo(o.getName().toLowerCase()); - else - throw new IllegalArgumentException(); - } } From 10eb9f09b48329b3a4a6e043406ab6dc6eba1a3f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 08:02:32 -0400 Subject: [PATCH 066/267] [Android] Change a check for an empty path from !path.equals("") to !path.isEmpty() in GameListItem. Also simplify the logging exception tag in the constructor. --- .../src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java index a84b901bdd..f65740dec3 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java @@ -42,7 +42,7 @@ public final class GameListItem implements Comparable this.path = path; File file = new File(path); - if (!file.isDirectory() && !path.equals("")) + if (!file.isDirectory() && !path.isEmpty()) { int[] Banner = NativeLibrary.GetBanner(path); if (Banner[0] == 0) @@ -60,7 +60,7 @@ public final class GameListItem implements Comparable } catch (IOException e) { - Log.e("Exception-GameListItem", e.toString()); + Log.e("GameListItem", e.toString()); } } else From 30da36dd1ea56424792a892db911050a52956346 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 4 Sep 2013 09:01:44 -0400 Subject: [PATCH 067/267] Fix an incorrect sizeof in a memset in GDBStub.cpp --- Source/Core/Core/Src/PowerPC/GDBStub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/GDBStub.cpp b/Source/Core/Core/Src/PowerPC/GDBStub.cpp index a6391043a7..763aa24b8a 100644 --- a/Source/Core/Core/Src/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/Src/PowerPC/GDBStub.cpp @@ -197,7 +197,7 @@ static void gdb_bp_remove(u32 type, u32 addr, u32 len) if (p != NULL) { DEBUG_LOG(GDB_STUB, "gdb: removed a breakpoint: %08x bytes at %08x\n", len, addr); p->active = 0; - memset(p, 0, sizeof p); + memset(p, 0, sizeof(gdb_bp_t)); } } while (p != NULL); } From 175707739e60c9c3ac593689e9e786e73514bedb Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 4 Sep 2013 21:47:21 +0200 Subject: [PATCH 068/267] Move LightingUidData to the LightingShaderGen header --- Source/Core/VideoCommon/Src/LightingShaderGen.h | 13 +++++++++++++ Source/Core/VideoCommon/Src/PixelShaderGen.h | 1 + Source/Core/VideoCommon/Src/ShaderGenCommon.h | 17 ----------------- Source/Core/VideoCommon/Src/VertexShaderGen.h | 1 + 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h index fc107a2e2b..09b2dfd257 100644 --- a/Source/Core/VideoCommon/Src/LightingShaderGen.h +++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h @@ -25,6 +25,19 @@ #define LIGHT_DIR "%s[5*%d+4]" #define LIGHT_DIR_PARAMS(lightsName, index) (lightsName), (index) +/** + * Common uid data used for shader generators that use lighting calculations. + */ +struct LightingUidData +{ + u32 matsource : 4; // 4x1 bit + u32 enablelighting : 4; // 4x1 bit + u32 ambsource : 4; // 4x1 bit + u32 diffusefunc : 8; // 4x2 bits + u32 attnfunc : 8; // 4x2 bits + u32 light_mask : 32; // 4x8 bits +}; + template static void GenerateLightShader(T& object, LightingUidData& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 7763cbd574..5fbf28cd69 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -8,6 +8,7 @@ #include "VideoCommon.h" #include "ShaderGenCommon.h" #include "BPMemory.h" +#include "LightingShaderGen.h" #define I_COLORS "color" #define I_KCOLORS "k" diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h index a804c08f13..d2c8ec3710 100644 --- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h @@ -199,23 +199,6 @@ static inline void DeclareUniform(T& object, API_TYPE api_type, bool using_ubos, object.Write(";\n"); } -#pragma pack(1) -/** - * Common uid data used for shader generators that use lighting calculations. - */ -struct LightingUidData -{ - u32 matsource : 4; // 4x1 bit - u32 enablelighting : 4; // 4x1 bit - u32 ambsource : 4; // 4x1 bit - u32 diffusefunc : 8; // 4x2 bits - u32 attnfunc : 8; // 4x2 bits - u32 light_mask : 32; // 4x8 bits - - u32 NumValues() const { return sizeof(LightingUidData); } -}; -#pragma pack() - /** * Checks if there has been */ diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h index ab9a378107..0ec703c07f 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.h +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h @@ -9,6 +9,7 @@ #include "XFMemory.h" #include "VideoCommon.h" #include "ShaderGenCommon.h" +#include "LightingShaderGen.h" // TODO should be reordered #define SHADER_POSITION_ATTRIB 0 From 7acee71c0c2b32ccb9b0d24df600f41c4781fb52 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 4 Sep 2013 21:56:03 +0200 Subject: [PATCH 069/267] Move swapModeTable to a local variable, avoids shader uid generation writing to it --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index b4ad513d37..459ae0733c 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -212,24 +212,9 @@ struct RegisterState bool AuxStored; }; -static char swapModeTable[4][5]; - static char text[16384]; -static inline void BuildSwapModeTable() -{ - static const char *swapColors = "rgba"; - for (int i = 0; i < 4; i++) - { - swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1]; - swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2]; - swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1]; - swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2]; - swapModeTable[i][4] = '\0'; - } -} - -template static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4]); +template static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4], const char swapModeTable[4][5]); template static inline void SampleTexture(T& out, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType); template static inline void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth); template static inline void WriteFog(T& out, pixel_shader_uid_data& uid_data); @@ -595,9 +580,19 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T } // Uid fields for BuildSwapModeTable are set in WriteStage - BuildSwapModeTable(); + char swapModeTable[4][5]; + const char* swapColors = "rgba"; + for (int i = 0; i < 4; i++) + { + swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1]; + swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2]; + swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1]; + swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2]; + swapModeTable[i][4] = '\0'; + } + for (unsigned int i = 0; i < numStages; i++) - WriteStage(out, uid_data, i, ApiType, RegisterStates); // build the equation for this stage + WriteStage(out, uid_data, i, ApiType, RegisterStates, swapModeTable); // build the equation for this stage #define MY_STRUCT_OFFSET(str,elem) ((u32)((u64)&(str).elem-(u64)&(str))) bool enable_pl = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; @@ -767,7 +762,7 @@ static const char *TEVCMPAlphaOPTable[16] = }; template -static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4]) +static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4], const char swapModeTable[4][5]) { int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1); bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens; @@ -881,7 +876,7 @@ static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, AP uid_data.stagehash[n].tevksel_swap2b = bpmem.tevksel[i*2+1].swap2; uid_data.stagehash[n].tevorders_colorchan = bpmem.tevorders[n / 2].getColorChan(n & 1); - char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; + const char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap); out.Write("crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); } @@ -907,7 +902,7 @@ static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, AP uid_data.stagehash[n].tevorders_texmap= bpmem.tevorders[n/2].getTexMap(n&1); - char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; + const char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; int texmap = bpmem.tevorders[n/2].getTexMap(n&1); uid_data.SetTevindrefTexmap(i, texmap); From a7f244e96d0177bad13e81b83f884146da110190 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 4 Sep 2013 19:16:28 -0500 Subject: [PATCH 070/267] Revert "Revert "[NetPlay] Make the Memory Card A/B setting sync across netplay."" This reverts commit 5696da0b3ea02a33e64c1de3e389b38c64c47e5a. JMC messed up, it wasn't due to this commit. --- Source/Core/Core/Src/BootManager.cpp | 7 +++++++ Source/Core/Core/Src/NetPlayClient.cpp | 5 +++++ Source/Core/Core/Src/NetPlayProto.h | 4 +++- Source/Core/Core/Src/NetPlayServer.cpp | 2 ++ Source/Core/DolphinWX/Src/NetWindow.cpp | 2 ++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 6454df49d5..b2c7dbc058 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -46,6 +46,7 @@ struct ConfigCache bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread, bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; int iTLBHack, iCPUCore; + TEXIDevices m_EXIDevice[2]; std::string strBackend; }; static ConfigCache config_cache; @@ -94,6 +95,8 @@ bool BootCore(const std::string& _rFilename) config_cache.bHLE_BS2 = StartUp.bHLE_BS2; config_cache.m_EnableJIT = SConfig::GetInstance().m_EnableJIT; config_cache.bDSPThread = StartUp.bDSPThread; + config_cache.m_EXIDevice[0] = SConfig::GetInstance().m_EXIDevice[0]; + config_cache.m_EXIDevice[1] = SConfig::GetInstance().m_EXIDevice[1]; // General settings game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); @@ -144,6 +147,8 @@ bool BootCore(const std::string& _rFilename) StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard; SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT; + SConfig::GetInstance().m_EXIDevice[0] = g_NetPlaySettings.m_EXIDevice[0]; + SConfig::GetInstance().m_EXIDevice[1] = g_NetPlaySettings.m_EXIDevice[1]; } // Run the game @@ -184,6 +189,8 @@ void Stop() VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); StartUp.bHLE_BS2 = config_cache.bHLE_BS2; SConfig::GetInstance().m_EnableJIT = config_cache.m_EnableJIT; + SConfig::GetInstance().m_EXIDevice[0] = config_cache.m_EXIDevice[0]; + SConfig::GetInstance().m_EXIDevice[1] = config_cache.m_EXIDevice[1]; } } diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 4a568c9607..2889a44323 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -237,6 +237,11 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) packet >> g_NetPlaySettings.m_DSPEnableJIT; packet >> g_NetPlaySettings.m_DSPHLE; packet >> g_NetPlaySettings.m_WriteToMemcard; + int tmp; + packet >> tmp; + g_NetPlaySettings.m_EXIDevice[0] = (TEXIDevices) tmp; + packet >> tmp; + g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices) tmp; } m_dialog->OnMsgStartGame(); diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h index 550c7eb2f7..900b08f936 100644 --- a/Source/Core/Core/Src/NetPlayProto.h +++ b/Source/Core/Core/Src/NetPlayProto.h @@ -7,6 +7,7 @@ #include "Common.h" #include "CommonTypes.h" +#include "HW/EXI_Device.h" struct NetSettings { @@ -14,6 +15,7 @@ struct NetSettings bool m_DSPHLE; bool m_DSPEnableJIT; bool m_WriteToMemcard; + TEXIDevices m_EXIDevice[2]; }; struct Rpt : public std::vector @@ -23,7 +25,7 @@ struct Rpt : public std::vector typedef std::vector NetWiimote; -#define NETPLAY_VERSION "Dolphin NetPlay 2013-08-31" +#define NETPLAY_VERSION "Dolphin NetPlay 2013-09-03" // messages enum diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index c4d2f583ea..715fd5048d 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -455,6 +455,8 @@ bool NetPlayServer::StartGame(const std::string &path) spac << m_settings.m_DSPEnableJIT; spac << m_settings.m_DSPHLE; spac << m_settings.m_WriteToMemcard; + spac << m_settings.m_EXIDevice[0]; + spac << m_settings.m_EXIDevice[1]; std::lock_guard lkp(m_crit.players); std::lock_guard lks(m_crit.send); diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 020ed4e72c..c7ef839198 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -408,6 +408,8 @@ void NetPlayDiag::GetNetSettings(NetSettings &settings) settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; settings.m_DSPEnableJIT = instance.m_EnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue(); + settings.m_EXIDevice[0] = instance.m_EXIDevice[0]; + settings.m_EXIDevice[1] = instance.m_EXIDevice[1]; } std::string NetPlayDiag::FindGame() From 0df597558865eb18b456be837b03b009db6992e7 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Thu, 5 Sep 2013 10:42:43 +0300 Subject: [PATCH 071/267] Gameini database update. Fixes issue 6580. --- Data/User/GameConfig/GMSE01.ini | 2 +- Data/User/GameConfig/GMSJ01.ini | 2 +- Data/User/GameConfig/GMSP01.ini | 2 +- Data/User/GameConfig/SJXD41.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/SJXE41.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/SJXP41.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/W2GE08.ini | 2 ++ Data/User/GameConfig/W2GP08.ini | 19 +++++++++++++++++++ Data/User/GameConfig/W3GE08.ini | 2 ++ Data/User/GameConfig/W3GP08.ini | 19 +++++++++++++++++++ Data/User/GameConfig/WFLE01.ini | 17 +++++++++++++++++ Data/User/GameConfig/WGSE08.ini | 2 ++ Data/User/GameConfig/WGSP08.ini | 23 ++++++++++++----------- Data/User/GameConfig/WPJEJW.ini | 17 +++++++++++++++++ 14 files changed, 156 insertions(+), 14 deletions(-) create mode 100644 Data/User/GameConfig/SJXD41.ini create mode 100644 Data/User/GameConfig/SJXE41.ini create mode 100644 Data/User/GameConfig/SJXP41.ini create mode 100644 Data/User/GameConfig/W2GP08.ini create mode 100644 Data/User/GameConfig/W3GP08.ini create mode 100644 Data/User/GameConfig/WFLE01.ini create mode 100644 Data/User/GameConfig/WPJEJW.ini diff --git a/Data/User/GameConfig/GMSE01.ini b/Data/User/GameConfig/GMSE01.ini index e37c4ec387..1442509fc2 100644 --- a/Data/User/GameConfig/GMSE01.ini +++ b/Data/User/GameConfig/GMSE01.ini @@ -152,7 +152,7 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -PerformanceQueriesEnable = True +PerfQueriesEnable = True [Video_Settings] wideScreenHack = False diff --git a/Data/User/GameConfig/GMSJ01.ini b/Data/User/GameConfig/GMSJ01.ini index d7de859d4d..d5ab074e47 100644 --- a/Data/User/GameConfig/GMSJ01.ini +++ b/Data/User/GameConfig/GMSJ01.ini @@ -24,7 +24,7 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -PerformanceQueriesEnable = True +PerfQueriesEnable = True [Video_Settings] wideScreenHack = False diff --git a/Data/User/GameConfig/GMSP01.ini b/Data/User/GameConfig/GMSP01.ini index fdac93eb91..b44c75d55a 100644 --- a/Data/User/GameConfig/GMSP01.ini +++ b/Data/User/GameConfig/GMSP01.ini @@ -74,7 +74,7 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -PerformanceQueriesEnable = True +PerfQueriesEnable = True [Video_Settings] wideScreenHack = False diff --git a/Data/User/GameConfig/SJXD41.ini b/Data/User/GameConfig/SJXD41.ini new file mode 100644 index 0000000000..10227122e8 --- /dev/null +++ b/Data/User/GameConfig/SJXD41.ini @@ -0,0 +1,21 @@ +# SJXD41 - Just Dance 4 +[Core] +# Values set here will override the main dolphin settings. +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnLoad] +# Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Enhancements] +MaxAnisotropy = 0 +[Gecko] diff --git a/Data/User/GameConfig/SJXE41.ini b/Data/User/GameConfig/SJXE41.ini new file mode 100644 index 0000000000..db62d82610 --- /dev/null +++ b/Data/User/GameConfig/SJXE41.ini @@ -0,0 +1,21 @@ +# SJXE41 - Just Dance 4 +[Core] +# Values set here will override the main dolphin settings. +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnLoad] +# Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Enhancements] +MaxAnisotropy = 0 +[Gecko] diff --git a/Data/User/GameConfig/SJXP41.ini b/Data/User/GameConfig/SJXP41.ini new file mode 100644 index 0000000000..d88bb20622 --- /dev/null +++ b/Data/User/GameConfig/SJXP41.ini @@ -0,0 +1,21 @@ +# SJXP41 - Just Dance 4 +[Core] +# Values set here will override the main dolphin settings. +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnLoad] +# Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Enhancements] +MaxAnisotropy = 0 +[Gecko] diff --git a/Data/User/GameConfig/W2GE08.ini b/Data/User/GameConfig/W2GE08.ini index 6590a12227..62a7b848ea 100644 --- a/Data/User/GameConfig/W2GE08.ini +++ b/Data/User/GameConfig/W2GE08.ini @@ -15,3 +15,5 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/W2GP08.ini b/Data/User/GameConfig/W2GP08.ini new file mode 100644 index 0000000000..0d265ca35d --- /dev/null +++ b/Data/User/GameConfig/W2GP08.ini @@ -0,0 +1,19 @@ +# W2GP08 - Phoenix Wright Ace Attorney Justice For All +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/W3GE08.ini b/Data/User/GameConfig/W3GE08.ini index c21f5b73e0..1759930dea 100644 --- a/Data/User/GameConfig/W3GE08.ini +++ b/Data/User/GameConfig/W3GE08.ini @@ -14,4 +14,6 @@ PH_ZNear = PH_ZFar = [Video_Hacks] EFBEmulateFormatChanges = True +[Video_Settings] +SafeTextureCacheColorSamples = 512 [Gecko] diff --git a/Data/User/GameConfig/W3GP08.ini b/Data/User/GameConfig/W3GP08.ini new file mode 100644 index 0000000000..46c0206e2b --- /dev/null +++ b/Data/User/GameConfig/W3GP08.ini @@ -0,0 +1,19 @@ +# W3GP08 - Phoenix Wright Ace Attorney Trials and Tribulations +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Settings] +SafeTextureCacheColorSamples = 512 +[Gecko] diff --git a/Data/User/GameConfig/WFLE01.ini b/Data/User/GameConfig/WFLE01.ini new file mode 100644 index 0000000000..3b5e8530f4 --- /dev/null +++ b/Data/User/GameConfig/WFLE01.ini @@ -0,0 +1,17 @@ +# WFLE01 - Fluidity +[Core] +[EmuState] +EmulationStateId = 5 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/WGSE08.ini b/Data/User/GameConfig/WGSE08.ini index 09b38270fc..9ede5a162d 100644 --- a/Data/User/GameConfig/WGSE08.ini +++ b/Data/User/GameConfig/WGSE08.ini @@ -19,3 +19,5 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/WGSP08.ini b/Data/User/GameConfig/WGSP08.ini index ec1116fa21..a3eeca61e5 100644 --- a/Data/User/GameConfig/WGSP08.ini +++ b/Data/User/GameConfig/WGSP08.ini @@ -1,22 +1,23 @@ -# WGSP08 - - +# WGSP08 - PWAA Ace Attorney [Core] # Values set here will override the main dolphin settings. - [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = - +EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. - [OnFrame] -# Add memory patches to be applied every frame here. - [ActionReplay] -# Add action replay cheats here. - [Video] ProjectionHack = 0 - +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/WPJEJW.ini b/Data/User/GameConfig/WPJEJW.ini new file mode 100644 index 0000000000..8f3f896d73 --- /dev/null +++ b/Data/User/GameConfig/WPJEJW.ini @@ -0,0 +1,17 @@ +# WPJEJW - Pucca's kisses game +[Core] +[EmuState] +EmulationStateId = 5 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 512 From b2657f6a9b00a82f2c0baafdc7794487cce8fcbf Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 5 Sep 2013 21:29:04 +1000 Subject: [PATCH 072/267] Re-added the HLE code that creates the cdb.vff file on first launch of the Wii sysmenu. Revert "Remove HLE_IPC_CreateVirtualFATFilesystem as it no longer takes 3 minutes to LLE like the comment says." This reverts commit 5d47fd1dde3ccdc286e2248db9967c278d694f5a. --- Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp | 4 ++- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 33 +++++++++++++++++++ .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp index d9d9b03021..519db4a92b 100644 --- a/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp @@ -79,7 +79,9 @@ bool CBoot::Boot_WiiWAD(const char* _pFilename) u64 titleID = ContentLoader.GetTitleID(); // create data directory File::CreateFullPath(Common::GetTitleDataPath(titleID)); - + + if (titleID == TITLEID_SYSMENU) + HLE_IPC_CreateVirtualFATFilesystem(); // setup wii mem if (!SetupWiiMemory(ContentLoader.GetCountry())) return false; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index e65b0c50ac..6e2f02e2be 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -32,6 +32,39 @@ std::string HLE_IPC_BuildFilename(std::string path_wii, int _size) return path_full; } +void HLE_IPC_CreateVirtualFATFilesystem() +{ + const int cdbSize = 0x01400000; + const std::string cdbPath = Common::GetTitleDataPath(TITLEID_SYSMENU) + "cdb.vff"; + if ((int)File::GetSize(cdbPath) < cdbSize) + { + // cdb.vff is a virtual Fat filesystem created on first launch of sysmenu + // we create it here as it is faster ~3 minutes for me when sysmenu does it ~1 second created here + const u8 cdbHDR[0x20] = {'V', 'F', 'F', 0x20, 0xfe, 0xff, 1, 0, 1, 0x40, 0, 0, 0, 0x20}; + const u8 cdbFAT[4] = {0xf0, 0xff, 0xff, 0xff}; + + File::IOFile cdbFile(cdbPath, "wb"); + if (cdbFile) + { + cdbFile.WriteBytes(cdbHDR, 0x20); + cdbFile.WriteBytes(cdbFAT, 0x4); + cdbFile.Seek(0x14020, SEEK_SET); + cdbFile.WriteBytes(cdbFAT, 0x4); + // 20 MiB file + cdbFile.Seek(cdbSize - 1, SEEK_SET); + // write the final 0 to 0 file from the second FAT to 20 MiB + cdbFile.WriteBytes(cdbHDR + 14, 1); + if (!cdbFile.IsGood()) + { + cdbFile.Close(); + File::Delete(cdbPath); + } + cdbFile.Flush(); + cdbFile.Close(); + } + } +} + CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName, false) // not a real hardware , m_Mode(0) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index 0cbfb70022..17dab453db 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -9,6 +9,7 @@ #include "FileUtil.h" std::string HLE_IPC_BuildFilename(std::string _pFilename, int _size); +void HLE_IPC_CreateVirtualFATFilesystem(); class CWII_IPC_HLE_Device_FileIO : public IWII_IPC_HLE_Device { From 3baab41cf43213df83eb9a4aa28eedbbbd23ec44 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 5 Sep 2013 16:09:56 -0400 Subject: [PATCH 073/267] Allow input display to work with netplay even when not recording. --- Source/Core/Core/Src/NetPlayClient.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 2889a44323..7a3febe030 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -557,8 +557,15 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat tmp.substickY = ((u8*)&netvalues->nLo)[2]; tmp.triggerLeft = ((u8*)&netvalues->nLo)[1]; tmp.triggerRight = ((u8*)&netvalues->nLo)[0]; - Movie::RecordInput(&tmp, pad_nb); - Movie::InputUpdate(); + if (Movie::IsRecordingInput()) + { + Movie::RecordInput(&tmp, pad_nb); + Movie::InputUpdate(); + } + else + { + Movie::CheckPadStatus(&tmp, pad_nb); + } return true; } From cd7b97f76764d5bc3993c85676dca7f0f88191ec Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 5 Sep 2013 18:38:47 -0400 Subject: [PATCH 074/267] Make JITDISABLE not defeat grep. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 4 +- .../Core/Src/PowerPC/Jit64/Jit_Branch.cpp | 12 ++-- .../Src/PowerPC/Jit64/Jit_FloatingPoint.cpp | 10 +-- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 62 +++++++++---------- .../Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp | 14 ++--- .../PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 12 ++-- .../Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp | 4 +- .../Core/Src/PowerPC/Jit64/Jit_Paired.cpp | 18 +++--- .../Src/PowerPC/Jit64/Jit_SystemRegisters.cpp | 20 +++--- Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h | 4 +- .../PowerPC/Jit64IL/JitIL_FloatingPoint.cpp | 10 +-- .../Src/PowerPC/Jit64IL/JitIL_Integer.cpp | 48 +++++++------- .../Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp | 20 +++--- .../Jit64IL/JitIL_LoadStoreFloating.cpp | 12 ++-- .../PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp | 4 +- .../Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp | 10 +-- .../PowerPC/Jit64IL/JitIL_SystemRegisters.cpp | 14 ++--- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 4 +- .../Src/PowerPC/JitArm32/JitArm_Branch.cpp | 12 ++-- .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 16 ++--- .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 26 ++++---- .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 4 +- .../JitArm32/JitArm_LoadStoreFloating.cpp | 6 +- .../Src/PowerPC/JitArm32/JitArm_Paired.cpp | 10 +-- .../JitArm32/JitArm_SystemRegisters.cpp | 10 +-- 25 files changed, 183 insertions(+), 183 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 885f7f3c4a..23d95b2852 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -34,9 +34,9 @@ // #define INSTRUCTION_START PPCTables::CountInstruction(inst); #define INSTRUCTION_START -#define JITDISABLE(type) \ +#define JITDISABLE(setting) \ if (Core::g_CoreStartupParameter.bJITOff || \ - Core::g_CoreStartupParameter.bJIT##type##Off) \ + Core::g_CoreStartupParameter.setting) \ {Default(inst); return;} #define MEMCHECK_START \ diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp index 762b6fe5d4..310deaa9c2 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp @@ -31,7 +31,7 @@ using namespace Gen; void Jit64::sc(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); @@ -44,7 +44,7 @@ void Jit64::sc(UGeckoInstruction inst) void Jit64::rfi(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); @@ -64,7 +64,7 @@ void Jit64::rfi(UGeckoInstruction inst) void Jit64::bx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) // We must always process the following sentence // even if the blocks are merged by PPCAnalyst::Flatten(). @@ -107,7 +107,7 @@ void Jit64::bx(UGeckoInstruction inst) void Jit64::bcx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) // USES_CR _assert_msg_(DYNA_REC, js.isLastInstruction, "bcx not last instruction of block"); @@ -155,7 +155,7 @@ void Jit64::bcx(UGeckoInstruction inst) void Jit64::bcctrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); @@ -204,7 +204,7 @@ void Jit64::bcctrx(UGeckoInstruction inst) void Jit64::bclrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) if (!js.isLastInstruction && (inst.BO & (1 << 4)) && (inst.BO & (1 << 2))) { diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp index 87fe51382d..a04114d110 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -75,7 +75,7 @@ static const double one_const = 1.0f; void Jit64::fp_arith_s(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (inst.Rc) { Default(inst); return; } @@ -124,7 +124,7 @@ void Jit64::fp_arith_s(UGeckoInstruction inst) void Jit64::fmaddXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (inst.Rc) { Default(inst); return; } @@ -181,7 +181,7 @@ void Jit64::fmaddXX(UGeckoInstruction inst) void Jit64::fsign(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (inst.Rc) { Default(inst); return; } @@ -212,7 +212,7 @@ void Jit64::fsign(UGeckoInstruction inst) void Jit64::fmrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (inst.Rc) { Default(inst); return; } @@ -228,7 +228,7 @@ void Jit64::fmrx(UGeckoInstruction inst) void Jit64::fcmpx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (jo.fpAccurateFcmp) { Default(inst); return; // turn off from debugger } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 54fa742148..ef69ea8c4a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -236,7 +236,7 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void void Jit64::reg_imm(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 d = inst.RD, a = inst.RA, s = inst.RS; switch (inst.OPCD) { @@ -309,7 +309,7 @@ void Jit64::cmpXX(UGeckoInstruction inst) { // USES_CR INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int b = inst.RB; int crf = inst.CRFD; @@ -551,7 +551,7 @@ void Jit64::cmpXX(UGeckoInstruction inst) void Jit64::boolX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, s = inst.RS, b = inst.RB; _dbg_assert_msg_(DYNA_REC, inst.OPCD == 31, "Invalid boolX"); @@ -814,7 +814,7 @@ void Jit64::boolX(UGeckoInstruction inst) void Jit64::extsbx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, s = inst.RS; if (gpr.R(s).IsImm()) @@ -842,7 +842,7 @@ void Jit64::extsbx(UGeckoInstruction inst) void Jit64::extshx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, s = inst.RS; if (gpr.R(s).IsImm()) @@ -870,7 +870,7 @@ void Jit64::extshx(UGeckoInstruction inst) void Jit64::subfic(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, d = inst.RD; gpr.Lock(a, d); gpr.BindToRegister(d, a == d, true); @@ -921,7 +921,7 @@ void Jit64::subfic(UGeckoInstruction inst) void Jit64::subfcx(UGeckoInstruction inst) { INSTRUCTION_START; - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); @@ -953,7 +953,7 @@ void Jit64::subfcx(UGeckoInstruction inst) void Jit64::subfex(UGeckoInstruction inst) { INSTRUCTION_START; - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); @@ -991,7 +991,7 @@ void Jit64::subfmex(UGeckoInstruction inst) { // USES_XER INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, d = inst.RD; gpr.Lock(a, d); gpr.BindToRegister(d, d == a); @@ -1015,7 +1015,7 @@ void Jit64::subfzex(UGeckoInstruction inst) { // USES_XER INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, d = inst.RD; gpr.Lock(a, d); @@ -1040,7 +1040,7 @@ void Jit64::subfzex(UGeckoInstruction inst) void Jit64::subfx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) @@ -1090,7 +1090,7 @@ void Jit64::subfx(UGeckoInstruction inst) void Jit64::mulli(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, d = inst.RD; u32 imm = inst.SIMM_16; @@ -1137,7 +1137,7 @@ void Jit64::mulli(UGeckoInstruction inst) void Jit64::mullwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) @@ -1213,7 +1213,7 @@ void Jit64::mullwx(UGeckoInstruction inst) void Jit64::mulhwux(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) @@ -1244,7 +1244,7 @@ void Jit64::mulhwux(UGeckoInstruction inst) void Jit64::divwux(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) @@ -1401,7 +1401,7 @@ void Jit64::divwux(UGeckoInstruction inst) void Jit64::divwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) @@ -1475,7 +1475,7 @@ void Jit64::divwx(UGeckoInstruction inst) void Jit64::addx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) @@ -1536,7 +1536,7 @@ void Jit64::addex(UGeckoInstruction inst) { // USES_XER INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if ((d == a) || (d == b)) @@ -1573,7 +1573,7 @@ void Jit64::addex(UGeckoInstruction inst) void Jit64::addcx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, d = inst.RD; if ((d == a) || (d == b)) @@ -1610,7 +1610,7 @@ void Jit64::addmex(UGeckoInstruction inst) { // USES_XER INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, d = inst.RD; if (d == a) @@ -1648,7 +1648,7 @@ void Jit64::addzex(UGeckoInstruction inst) { // USES_XER INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, d = inst.RD; if (d == a) @@ -1685,7 +1685,7 @@ void Jit64::addzex(UGeckoInstruction inst) void Jit64::rlwinmx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int s = inst.RS; if (gpr.R(s).IsImm()) @@ -1752,7 +1752,7 @@ void Jit64::rlwinmx(UGeckoInstruction inst) void Jit64::rlwimix(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int s = inst.RS; @@ -1838,7 +1838,7 @@ void Jit64::rlwimix(UGeckoInstruction inst) void Jit64::rlwnmx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA, b = inst.RB, s = inst.RS; u32 mask = Helper_Mask(inst.MB, inst.ME); @@ -1874,7 +1874,7 @@ void Jit64::rlwnmx(UGeckoInstruction inst) void Jit64::negx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int d = inst.RD; @@ -1912,7 +1912,7 @@ void Jit64::negx(UGeckoInstruction inst) void Jit64::srwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int b = inst.RB; int s = inst.RS; @@ -1964,7 +1964,7 @@ void Jit64::srwx(UGeckoInstruction inst) void Jit64::slwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int b = inst.RB; int s = inst.RS; @@ -2030,7 +2030,7 @@ void Jit64::srawx(UGeckoInstruction inst) { // USES_XER INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int b = inst.RB; int s = inst.RS; @@ -2087,7 +2087,7 @@ void Jit64::srawx(UGeckoInstruction inst) void Jit64::srawix(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int s = inst.RS; int amount = inst.SH; @@ -2134,7 +2134,7 @@ void Jit64::srawix(UGeckoInstruction inst) void Jit64::cntlzwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int s = inst.RS; @@ -2170,7 +2170,7 @@ void Jit64::cntlzwx(UGeckoInstruction inst) void Jit64::twx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) s32 a = inst.RA; diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp index 53ab412070..87a58415a1 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp @@ -24,7 +24,7 @@ void Jit64::lXXx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) int a = inst.RA, b = inst.RB, d = inst.RD; @@ -224,7 +224,7 @@ void Jit64::lXXx(UGeckoInstruction inst) void Jit64::dcbst(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) // If the dcbst instruction is preceded by dcbt, it is flushing a prefetched // memory location. Do not invalidate the JIT cache in this case as the memory @@ -240,7 +240,7 @@ void Jit64::dcbst(UGeckoInstruction inst) void Jit64::dcbz(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) Default(inst); return; @@ -262,7 +262,7 @@ void Jit64::dcbz(UGeckoInstruction inst) void Jit64::stX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) int s = inst.RS; int a = inst.RA; @@ -397,7 +397,7 @@ void Jit64::stX(UGeckoInstruction inst) void Jit64::stXx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) int a = inst.RA, b = inst.RB, s = inst.RS; if (!a || a == s || a == b) @@ -439,7 +439,7 @@ void Jit64::stXx(UGeckoInstruction inst) void Jit64::lmw(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) #ifdef _M_X64 gpr.FlushLockX(ECX); @@ -462,7 +462,7 @@ void Jit64::lmw(UGeckoInstruction inst) void Jit64::stmw(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) #ifdef _M_X64 gpr.FlushLockX(ECX); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 04085cb34a..7083d24276 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -39,7 +39,7 @@ u32 GC_ALIGNED16(temp32); void Jit64::lfs(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) int d = inst.RD; int a = inst.RA; @@ -72,7 +72,7 @@ void Jit64::lfs(UGeckoInstruction inst) void Jit64::lfd(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } @@ -150,7 +150,7 @@ void Jit64::lfd(UGeckoInstruction inst) void Jit64::stfd(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } @@ -235,7 +235,7 @@ void Jit64::stfd(UGeckoInstruction inst) void Jit64::stfs(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) bool update = inst.OPCD & 1; int s = inst.RS; @@ -297,7 +297,7 @@ void Jit64::stfs(UGeckoInstruction inst) void Jit64::stfsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) // We can take a shortcut here - it's not likely that a hardware access would use this instruction. gpr.FlushLockX(ABI_PARAM1); @@ -317,7 +317,7 @@ void Jit64::stfsx(UGeckoInstruction inst) void Jit64::lfsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) MOV(32, R(EAX), gpr.R(inst.RB)); if (inst.RA) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp index e89f414150..00066f4746 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -40,7 +40,7 @@ static void WriteDual32(u64 value, u32 address) void Jit64::psq_st(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStorePaired) + JITDISABLE(bJITLoadStorePairedOff) if (js.memcheck) { Default(inst); return; } @@ -123,7 +123,7 @@ void Jit64::psq_st(UGeckoInstruction inst) void Jit64::psq_l(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStorePaired) + JITDISABLE(bJITLoadStorePairedOff) if (js.memcheck) { Default(inst); return; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp index b028c77298..b58a140497 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp @@ -29,7 +29,7 @@ const double GC_ALIGNED16(psZeroZero[2]) = {0.0, 0.0}; void Jit64::ps_mr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -44,7 +44,7 @@ void Jit64::ps_mr(UGeckoInstruction inst) void Jit64::ps_sel(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) Default(inst); return; @@ -76,7 +76,7 @@ void Jit64::ps_sel(UGeckoInstruction inst) void Jit64::ps_sign(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -113,7 +113,7 @@ void Jit64::ps_sign(UGeckoInstruction inst) void Jit64::ps_rsqrte(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -186,7 +186,7 @@ void Jit64::tri_op(int d, int a, int b, bool reversible, void (XEmitter::*op)(X6 void Jit64::ps_arith(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -206,7 +206,7 @@ void Jit64::ps_arith(UGeckoInstruction inst) void Jit64::ps_sum(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) // TODO: (inst.SUBOP5 == 10) breaks Sonic Colours (black screen) if (inst.Rc || (inst.SUBOP5 == 10)) { Default(inst); return; @@ -248,7 +248,7 @@ void Jit64::ps_sum(UGeckoInstruction inst) void Jit64::ps_muls(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -287,7 +287,7 @@ void Jit64::ps_muls(UGeckoInstruction inst) void Jit64::ps_mergeXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -324,7 +324,7 @@ void Jit64::ps_mergeXX(UGeckoInstruction inst) void Jit64::ps_maddXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp index 9475be947b..9829f06d93 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -20,7 +20,7 @@ void Jit64::mtspr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); int d = inst.RD; @@ -72,7 +72,7 @@ void Jit64::mtspr(UGeckoInstruction inst) void Jit64::mfspr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); int d = inst.RD; switch (iIndex) @@ -100,7 +100,7 @@ void Jit64::mtmsr(UGeckoInstruction inst) { INSTRUCTION_START // Don't interpret this, if we do we get thrown out - //JITDISABLE(SystemRegisters) + //JITDISABLE(bJITSystemRegistersOff) if (!gpr.R(inst.RS).IsImm()) { gpr.Lock(inst.RS); @@ -139,7 +139,7 @@ void Jit64::mtmsr(UGeckoInstruction inst) void Jit64::mfmsr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) //Privileged? gpr.Lock(inst.RD); gpr.BindToRegister(inst.RD, false, true); @@ -150,14 +150,14 @@ void Jit64::mfmsr(UGeckoInstruction inst) void Jit64::mftb(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) mfspr(inst); } void Jit64::mfcr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) // USES_CR int d = inst.RD; gpr.Lock(d); @@ -177,7 +177,7 @@ void Jit64::mfcr(UGeckoInstruction inst) void Jit64::mtcrf(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) // USES_CR u32 crm = inst.CRM; @@ -216,7 +216,7 @@ void Jit64::mtcrf(UGeckoInstruction inst) void Jit64::mcrf(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) // USES_CR if (inst.CRFS != inst.CRFD) @@ -229,7 +229,7 @@ void Jit64::mcrf(UGeckoInstruction inst) void Jit64::mcrxr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) // USES_CR @@ -245,7 +245,7 @@ void Jit64::mcrxr(UGeckoInstruction inst) void Jit64::crXXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) _dbg_assert_msg_(DYNA_REC, inst.OPCD == 19, "Invalid crXXX"); // USES_CR diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h index 34290d4567..30371311a3 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h @@ -32,9 +32,9 @@ // #define INSTRUCTION_START PPCTables::CountInstruction(inst); #define INSTRUCTION_START -#define JITDISABLE(type) \ +#define JITDISABLE(setting) \ if (Core::g_CoreStartupParameter.bJITOff || \ - Core::g_CoreStartupParameter.bJIT##type##Off) \ + Core::g_CoreStartupParameter.setting) \ {Default(inst); return;} #ifdef _M_X64 diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp index 9a0207f85c..6277933e4e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp @@ -17,7 +17,7 @@ void JitIL::fp_arith_s(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (inst.Rc || (inst.SUBOP5 != 25 && inst.SUBOP5 != 20 && inst.SUBOP5 != 21 && inst.SUBOP5 != 26)) { Default(inst); return; @@ -60,7 +60,7 @@ void JitIL::fp_arith_s(UGeckoInstruction inst) void JitIL::fmaddXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (inst.Rc) { Default(inst); return; } @@ -88,7 +88,7 @@ void JitIL::fmaddXX(UGeckoInstruction inst) void JitIL::fmrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) if (inst.Rc) { Default(inst); return; } @@ -100,7 +100,7 @@ void JitIL::fmrx(UGeckoInstruction inst) void JitIL::fcmpx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) IREmitter::InstLoc lhs, rhs, res; lhs = ibuild.EmitLoadFReg(inst.FA); rhs = ibuild.EmitLoadFReg(inst.FB); @@ -113,7 +113,7 @@ void JitIL::fcmpx(UGeckoInstruction inst) void JitIL::fsign(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) Default(inst); return; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp index 0734bea7e0..4ff8361dab 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp @@ -27,7 +27,7 @@ static void ComputeRC(IREmitter::IRBuilder& ibuild, void JitIL::reg_imm(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int d = inst.RD, a = inst.RA, s = inst.RS; IREmitter::InstLoc val, test, c; switch (inst.OPCD) @@ -95,7 +95,7 @@ void JitIL::reg_imm(UGeckoInstruction inst) void JitIL::cmpXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc lhs, rhs, res; lhs = ibuild.EmitLoadGReg(inst.RA); if (inst.OPCD == 31) { @@ -120,7 +120,7 @@ void JitIL::cmpXX(UGeckoInstruction inst) void JitIL::boolX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc a = NULL; IREmitter::InstLoc s = ibuild.EmitLoadGReg(inst.RS); @@ -173,7 +173,7 @@ void JitIL::boolX(UGeckoInstruction inst) void JitIL::extsbx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS); val = ibuild.EmitSExt8(val); ibuild.EmitStoreGReg(val, inst.RA); @@ -184,7 +184,7 @@ void JitIL::extsbx(UGeckoInstruction inst) void JitIL::extshx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS); val = ibuild.EmitSExt16(val); ibuild.EmitStoreGReg(val, inst.RA); @@ -195,7 +195,7 @@ void JitIL::extshx(UGeckoInstruction inst) void JitIL::subfic(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc nota, lhs, val, test; nota = ibuild.EmitXor(ibuild.EmitLoadGReg(inst.RA), ibuild.EmitIntConst(-1)); @@ -214,7 +214,7 @@ void JitIL::subfic(UGeckoInstruction inst) void JitIL::subfcx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) if (inst.OE) PanicAlert("OE: subfcx"); IREmitter::InstLoc val, test, lhs, rhs; lhs = ibuild.EmitLoadGReg(inst.RB); @@ -231,7 +231,7 @@ void JitIL::subfcx(UGeckoInstruction inst) void JitIL::subfex(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) if (inst.OE) PanicAlert("OE: subfex"); IREmitter::InstLoc val, test, lhs, rhs, carry; rhs = ibuild.EmitLoadGReg(inst.RA); @@ -252,7 +252,7 @@ void JitIL::subfex(UGeckoInstruction inst) void JitIL::subfx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) if (inst.OE) PanicAlert("OE: subfx"); IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB); val = ibuild.EmitSub(val, ibuild.EmitLoadGReg(inst.RA)); @@ -264,7 +264,7 @@ void JitIL::subfx(UGeckoInstruction inst) void JitIL::mulli(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RA); val = ibuild.EmitMul(val, ibuild.EmitIntConst(inst.SIMM_16)); ibuild.EmitStoreGReg(val, inst.RD); @@ -273,7 +273,7 @@ void JitIL::mulli(UGeckoInstruction inst) void JitIL::mullwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB); val = ibuild.EmitMul(ibuild.EmitLoadGReg(inst.RA), val); ibuild.EmitStoreGReg(val, inst.RD); @@ -284,7 +284,7 @@ void JitIL::mullwx(UGeckoInstruction inst) void JitIL::mulhwux(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc a = ibuild.EmitLoadGReg(inst.RA); IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB); @@ -322,7 +322,7 @@ void JitIL::divwux(UGeckoInstruction inst) { void JitIL::addx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB); val = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), val); ibuild.EmitStoreGReg(val, inst.RD); @@ -333,7 +333,7 @@ void JitIL::addx(UGeckoInstruction inst) void JitIL::addzex(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc lhs = ibuild.EmitLoadGReg(inst.RA), val, newcarry; val = ibuild.EmitAdd(lhs, ibuild.EmitLoadCarry()); @@ -347,7 +347,7 @@ void JitIL::addzex(UGeckoInstruction inst) void JitIL::addex(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc a = ibuild.EmitLoadGReg(inst.RA); IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB); @@ -370,7 +370,7 @@ void JitIL::addex(UGeckoInstruction inst) void JitIL::rlwinmx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) unsigned mask = Helper_Mask(inst.MB, inst.ME); IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS); val = ibuild.EmitRol(val, ibuild.EmitIntConst(inst.SH)); @@ -384,7 +384,7 @@ void JitIL::rlwinmx(UGeckoInstruction inst) void JitIL::rlwimix(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) unsigned mask = Helper_Mask(inst.MB, inst.ME); IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS); val = ibuild.EmitRol(val, ibuild.EmitIntConst(inst.SH)); @@ -400,7 +400,7 @@ void JitIL::rlwimix(UGeckoInstruction inst) void JitIL::rlwnmx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) unsigned int mask = Helper_Mask(inst.MB, inst.ME); IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS); val = ibuild.EmitRol(val, ibuild.EmitLoadGReg(inst.RB)); @@ -413,7 +413,7 @@ void JitIL::rlwnmx(UGeckoInstruction inst) void JitIL::negx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RA); val = ibuild.EmitSub(ibuild.EmitIntConst(0), val); ibuild.EmitStoreGReg(val, inst.RD); @@ -424,7 +424,7 @@ void JitIL::negx(UGeckoInstruction inst) void JitIL::srwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS), samt = ibuild.EmitLoadGReg(inst.RB), corr; @@ -443,7 +443,7 @@ void JitIL::srwx(UGeckoInstruction inst) void JitIL::slwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS), samt = ibuild.EmitLoadGReg(inst.RB), corr; @@ -462,7 +462,7 @@ void JitIL::slwx(UGeckoInstruction inst) void JitIL::srawx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) // FIXME: We can do a lot better on 64-bit IREmitter::InstLoc val, samt, mask, mask2, test; val = ibuild.EmitLoadGReg(inst.RS); @@ -488,7 +488,7 @@ void JitIL::srawx(UGeckoInstruction inst) void JitIL::srawix(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS), test; val = ibuild.EmitSarl(val, ibuild.EmitIntConst(inst.SH)); ibuild.EmitStoreGReg(val, inst.RA); @@ -505,7 +505,7 @@ void JitIL::srawix(UGeckoInstruction inst) void JitIL::cntlzwx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS); val = ibuild.EmitCntlzw(val); ibuild.EmitStoreGReg(val, inst.RA); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp index 70ccb9d509..98b6726227 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp @@ -25,7 +25,7 @@ void JitIL::lhax(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB); if (inst.RA) @@ -38,7 +38,7 @@ void JitIL::lhax(UGeckoInstruction inst) void JitIL::lXz(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16); if (inst.RA) @@ -58,7 +58,7 @@ void JitIL::lXz(UGeckoInstruction inst) void JitIL::lbzu(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) const IREmitter::InstLoc uAddress = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), ibuild.EmitIntConst((int)inst.SIMM_16)); const IREmitter::InstLoc temp = ibuild.EmitLoad8(uAddress); ibuild.EmitStoreGReg(temp, inst.RD); @@ -68,7 +68,7 @@ void JitIL::lbzu(UGeckoInstruction inst) { void JitIL::lha(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst((s32)(s16)inst.SIMM_16); @@ -82,7 +82,7 @@ void JitIL::lha(UGeckoInstruction inst) void JitIL::lXzx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB); if (inst.RA) { @@ -104,7 +104,7 @@ void JitIL::lXzx(UGeckoInstruction inst) void JitIL::dcbst(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) // If the dcbst instruction is preceded by dcbt, it is flushing a prefetched // memory location. Do not invalidate the JIT cache in this case as the memory @@ -145,7 +145,7 @@ void JitIL::dcbz(UGeckoInstruction inst) void JitIL::stX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16), value = ibuild.EmitLoadGReg(inst.RS); @@ -165,7 +165,7 @@ void JitIL::stX(UGeckoInstruction inst) void JitIL::stXx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB), value = ibuild.EmitLoadGReg(inst.RS); @@ -185,7 +185,7 @@ void JitIL::stXx(UGeckoInstruction inst) void JitIL::lmw(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16); if (inst.RA) @@ -201,7 +201,7 @@ void JitIL::lmw(UGeckoInstruction inst) void JitIL::stmw(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16); if (inst.RA) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp index 8f8297706c..c2bcc4baa1 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp @@ -29,7 +29,7 @@ void JitIL::lfs(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16), val; if (inst.RA) @@ -43,7 +43,7 @@ void JitIL::lfs(UGeckoInstruction inst) void JitIL::lfd(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16), val; if (inst.RA) @@ -58,7 +58,7 @@ void JitIL::lfd(UGeckoInstruction inst) void JitIL::stfd(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16), val = ibuild.EmitLoadFReg(inst.RS); @@ -74,7 +74,7 @@ void JitIL::stfd(UGeckoInstruction inst) void JitIL::stfs(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16), val = ibuild.EmitLoadFReg(inst.RS); @@ -91,7 +91,7 @@ void JitIL::stfs(UGeckoInstruction inst) void JitIL::stfsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB), val = ibuild.EmitLoadFReg(inst.RS); @@ -106,7 +106,7 @@ void JitIL::stfsx(UGeckoInstruction inst) void JitIL::lfsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) if (js.memcheck) { Default(inst); return; } IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB), val; if (inst.RA) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp index 1ff392d731..33b81623c1 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp @@ -23,7 +23,7 @@ void JitIL::psq_st(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStorePaired) + JITDISABLE(bJITLoadStorePairedOff) if (js.memcheck) { Default(inst); return; } if (inst.W) {Default(inst); return;} IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val; @@ -39,7 +39,7 @@ void JitIL::psq_st(UGeckoInstruction inst) void JitIL::psq_l(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStorePaired) + JITDISABLE(bJITLoadStorePairedOff) if (js.memcheck) { Default(inst); return; } if (inst.W) {Default(inst); return;} IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp index 671e022b31..fcbb26a3c2 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp @@ -35,7 +35,7 @@ void JitIL::ps_rsqrte(UGeckoInstruction inst) void JitIL::ps_arith(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc || (inst.SUBOP5 != 21 && inst.SUBOP5 != 20 && inst.SUBOP5 != 25)) { Default(inst); return; } @@ -68,7 +68,7 @@ void JitIL::ps_sum(UGeckoInstruction inst) // TODO: ps_sum breaks Sonic Colours (black screen) Default(inst); return; INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc || inst.SUBOP5 != 10) { Default(inst); return; } @@ -87,7 +87,7 @@ void JitIL::ps_sum(UGeckoInstruction inst) void JitIL::ps_muls(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -112,7 +112,7 @@ void JitIL::ps_muls(UGeckoInstruction inst) void JitIL::ps_mergeXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } @@ -145,7 +145,7 @@ void JitIL::ps_mergeXX(UGeckoInstruction inst) void JitIL::ps_maddXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) if (inst.Rc) { Default(inst); return; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp index 0fb9d68f81..cb3ab91b32 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp @@ -21,7 +21,7 @@ void JitIL::mtspr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); switch(iIndex) { case SPR_TL: @@ -57,7 +57,7 @@ void JitIL::mtspr(UGeckoInstruction inst) void JitIL::mfspr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); switch (iIndex) { @@ -102,21 +102,21 @@ void JitIL::mtmsr(UGeckoInstruction inst) void JitIL::mfmsr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) ibuild.EmitStoreGReg(ibuild.EmitLoadMSR(), inst.RD); } void JitIL::mftb(UGeckoInstruction inst) { INSTRUCTION_START; - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) mfspr(inst); } void JitIL::mfcr(UGeckoInstruction inst) { INSTRUCTION_START; - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) IREmitter::InstLoc d = ibuild.EmitIntConst(0); for (int i = 0; i < 8; ++i) @@ -130,7 +130,7 @@ void JitIL::mfcr(UGeckoInstruction inst) void JitIL::mtcrf(UGeckoInstruction inst) { INSTRUCTION_START; - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) IREmitter::InstLoc s = ibuild.EmitLoadGReg(inst.RS); for (int i = 0; i < 8; ++i) @@ -148,7 +148,7 @@ void JitIL::mtcrf(UGeckoInstruction inst) void JitIL::mcrf(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) if (inst.CRFS != inst.CRFD) { diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 264ec588e3..2f9287c80e 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -43,9 +43,9 @@ // #define INSTRUCTION_START Default(inst); return; // #define INSTRUCTION_START PPCTables::CountInstruction(inst); #define INSTRUCTION_START -#define JITDISABLE(type) \ +#define JITDISABLE(setting) \ if (Core::g_CoreStartupParameter.bJITOff || \ - Core::g_CoreStartupParameter.bJIT##type##Off) \ + Core::g_CoreStartupParameter.setting) \ {Default(inst); return;} #define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0])) class JitArm : public JitBase, public ArmGen::ARMXCodeBlock diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp index 5a1a4659a6..b1a63aece6 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp @@ -43,7 +43,7 @@ using namespace ArmGen; void JitArm::sc(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) gpr.Flush(); fpr.Flush(); @@ -62,7 +62,7 @@ void JitArm::sc(UGeckoInstruction inst) void JitArm::rfi(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) gpr.Flush(); fpr.Flush(); @@ -110,7 +110,7 @@ void JitArm::rfi(UGeckoInstruction inst) void JitArm::bx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) // We must always process the following sentence // even if the blocks are merged by PPCAnalyst::Flatten(). if (inst.LK) @@ -155,7 +155,7 @@ void JitArm::bx(UGeckoInstruction inst) void JitArm::bcx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) // USES_CR _assert_msg_(DYNA_REC, js.isLastInstruction, "bcx not last instruction of block"); @@ -216,7 +216,7 @@ void JitArm::bcx(UGeckoInstruction inst) void JitArm::bcctrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) gpr.Flush(); fpr.Flush(); @@ -283,7 +283,7 @@ void JitArm::bcctrx(UGeckoInstruction inst) void JitArm::bclrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Branch) + JITDISABLE(bJITBranchOff) if (!js.isLastInstruction && (inst.BO & (1 << 4)) && (inst.BO & (1 << 2))) { if (inst.LK) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index c553397708..3dcaf902d1 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -41,7 +41,7 @@ void JitArm::Helper_UpdateCR1(ARMReg value) void JitArm::fabsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vD = fpr.R0(inst.FD); ARMReg vB = fpr.R0(inst.FB); @@ -54,7 +54,7 @@ void JitArm::fabsx(UGeckoInstruction inst) void JitArm::faddsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vA = fpr.R0(inst.FA); ARMReg vB = fpr.R0(inst.FB); @@ -69,7 +69,7 @@ void JitArm::faddsx(UGeckoInstruction inst) void JitArm::faddx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vD = fpr.R0(inst.FD); ARMReg vA = fpr.R0(inst.FA); @@ -82,7 +82,7 @@ void JitArm::faddx(UGeckoInstruction inst) void JitArm::fsubsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vA = fpr.R0(inst.FA); ARMReg vB = fpr.R0(inst.FB); @@ -97,7 +97,7 @@ void JitArm::fsubsx(UGeckoInstruction inst) void JitArm::fsubx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vD = fpr.R0(inst.FD); ARMReg vA = fpr.R0(inst.FA); @@ -110,7 +110,7 @@ void JitArm::fsubx(UGeckoInstruction inst) void JitArm::fmulsx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vA = fpr.R0(inst.FA); ARMReg vC = fpr.R0(inst.FC); @@ -125,7 +125,7 @@ void JitArm::fmulsx(UGeckoInstruction inst) void JitArm::fmulx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vD0 = fpr.R0(inst.FD); ARMReg vA = fpr.R0(inst.FA); @@ -137,7 +137,7 @@ void JitArm::fmulx(UGeckoInstruction inst) void JitArm::fmrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(FloatingPoint) + JITDISABLE(bJITFloatingPointOff) ARMReg vD = fpr.R0(inst.FD); ARMReg vB = fpr.R0(inst.FB); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index 572ee6aae7..672fd6edfd 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -129,7 +129,7 @@ u32 Xor(u32 a, u32 b) {return a ^ b;} void JitArm::arith(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 a = inst.RA, b = inst.RB, d = inst.RD, s = inst.RS; ARMReg RA, RB, RD, RS; @@ -517,7 +517,7 @@ void JitArm::arith(UGeckoInstruction inst) void JitArm::addex(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 a = inst.RA, b = inst.RB, d = inst.RD; Default(inst); return; ARMReg RA = gpr.R(a); @@ -534,7 +534,7 @@ void JitArm::addex(UGeckoInstruction inst) void JitArm::mulhwux(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 a = inst.RA, b = inst.RB, d = inst.RD; @@ -549,7 +549,7 @@ void JitArm::mulhwux(UGeckoInstruction inst) void JitArm::extshx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 a = inst.RA, s = inst.RS; if (gpr.IsImm(s)) @@ -569,7 +569,7 @@ void JitArm::extshx(UGeckoInstruction inst) void JitArm::extsbx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 a = inst.RA, s = inst.RS; if (gpr.IsImm(s)) @@ -589,7 +589,7 @@ void JitArm::extsbx(UGeckoInstruction inst) void JitArm::cmp (UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int crf = inst.CRFD; u32 a = inst.RA, b = inst.RB; @@ -609,7 +609,7 @@ void JitArm::cmp (UGeckoInstruction inst) void JitArm::cmpi(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 a = inst.RA; int crf = inst.CRFD; if (gpr.IsImm(a)) @@ -632,7 +632,7 @@ void JitArm::cmpi(UGeckoInstruction inst) void JitArm::cmpl(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) ARMReg RA = gpr.R(inst.RA); ARMReg RB = gpr.R(inst.RB); @@ -654,7 +654,7 @@ void JitArm::cmpl(UGeckoInstruction inst) void JitArm::cmpli(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) ARMReg RA = gpr.R(inst.RA); ARMReg rA = gpr.GetReg(); @@ -684,7 +684,7 @@ void JitArm::cmpli(UGeckoInstruction inst) void JitArm::negx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) ARMReg RA = gpr.R(inst.RA); ARMReg RD = gpr.R(inst.RD); @@ -703,7 +703,7 @@ void JitArm::negx(UGeckoInstruction inst) void JitArm::rlwimix(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 mask = Helper_Mask(inst.MB,inst.ME); ARMReg RA = gpr.R(inst.RA); @@ -731,7 +731,7 @@ void JitArm::rlwimix(UGeckoInstruction inst) void JitArm::rlwinmx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) u32 mask = Helper_Mask(inst.MB,inst.ME); ARMReg RA = gpr.R(inst.RA); @@ -754,7 +754,7 @@ void JitArm::rlwinmx(UGeckoInstruction inst) void JitArm::srawix(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Integer) + JITDISABLE(bJITIntegerOff) int a = inst.RA; int s = inst.RS; int amount = inst.SH; diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index b3f8a3cbb1..391f7b0537 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -313,7 +313,7 @@ void JitArm::SafeLoadToReg(bool fastmem, u32 dest, s32 addr, s32 offsetReg, int void JitArm::lXX(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) u32 a = inst.RA, b = inst.RB, d = inst.RD; s32 offset = inst.SIMM_16; u32 accessSize = 0; @@ -477,7 +477,7 @@ void JitArm::lmw(UGeckoInstruction inst) void JitArm::dcbst(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStore) + JITDISABLE(bJITLoadStoreOff) // If the dcbst instruction is preceded by dcbt, it is flushing a prefetched // memory location. Do not invalidate the JIT cache in this case as the memory diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index 66a0912a18..2559c9f49e 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -35,7 +35,7 @@ void JitArm::lfs(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); @@ -78,7 +78,7 @@ void JitArm::lfs(UGeckoInstruction inst) void JitArm::lfd(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); @@ -120,7 +120,7 @@ void JitArm::lfd(UGeckoInstruction inst) void JitArm::stfs(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(LoadStoreFloating) + JITDISABLE(bJITLoadStoreFloatingOff) ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 148e2f086b..e6a084716a 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -30,7 +30,7 @@ void JitArm::ps_add(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) u32 a = inst.FA, b = inst.FB, d = inst.FD; if (inst.Rc){ @@ -52,7 +52,7 @@ void JitArm::ps_add(UGeckoInstruction inst) void JitArm::ps_madd(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) Default(inst); return; @@ -89,7 +89,7 @@ void JitArm::ps_madd(UGeckoInstruction inst) void JitArm::ps_sum0(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; @@ -110,7 +110,7 @@ void JitArm::ps_sum0(UGeckoInstruction inst) void JitArm::ps_sub(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) u32 a = inst.FA, b = inst.FB, d = inst.FD; if (inst.Rc){ @@ -131,7 +131,7 @@ void JitArm::ps_sub(UGeckoInstruction inst) void JitArm::ps_mul(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(Paired) + JITDISABLE(bJITPairedOff) u32 a = inst.FA, c = inst.FC, d = inst.FD; if (inst.Rc){ diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index 0c58b43ff3..e1f27560a3 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -30,7 +30,7 @@ void JitArm::mtspr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); @@ -75,13 +75,13 @@ void JitArm::mtspr(UGeckoInstruction inst) void JitArm::mftb(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) mfspr(inst); } void JitArm::mfspr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); ARMReg RD = gpr.R(inst.RD); @@ -102,7 +102,7 @@ void JitArm::mtmsr(UGeckoInstruction inst) { INSTRUCTION_START // Don't interpret this, if we do we get thrown out - //JITDISABLE(SystemRegisters) + //JITDISABLE(bJITSystemRegistersOff) STR(gpr.R(inst.RS), R9, PPCSTATE_OFF(msr)); @@ -114,7 +114,7 @@ void JitArm::mtmsr(UGeckoInstruction inst) void JitArm::mfmsr(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(SystemRegisters) + JITDISABLE(bJITSystemRegistersOff) LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(msr)); } From ef05a147578b070fdab6042f68422dfe20f91e23 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 7 Sep 2013 00:19:32 +0000 Subject: [PATCH 075/267] [ARM] Clean up FPR cache. Rapid fire floating point instruction implementations. Adds 13 new instructions. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 13 + .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 54 +++- .../Src/PowerPC/JitArm32/JitArm_Paired.cpp | 246 +++++++++++++++++- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 26 +- .../Core/Src/PowerPC/JitArm32/JitFPRCache.cpp | 135 ++++++---- .../Core/Src/PowerPC/JitArm32/JitFPRCache.h | 3 + .../Core/Src/PowerPC/JitArm32/JitRegCache.cpp | 4 +- .../Core/Src/PowerPC/JitArm32/JitRegCache.h | 49 ++-- 8 files changed, 412 insertions(+), 118 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 2f9287c80e..072a6d40fa 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -186,6 +186,8 @@ public: // Floating point void fabsx(UGeckoInstruction _inst); + void fnabsx(UGeckoInstruction _inst); + void fnegx(UGeckoInstruction _inst); void faddsx(UGeckoInstruction _inst); void faddx(UGeckoInstruction _inst); void fsubsx(UGeckoInstruction _inst); @@ -202,9 +204,20 @@ public: // Paired Singles void ps_add(UGeckoInstruction _inst); void ps_sum0(UGeckoInstruction _inst); + void ps_sum1(UGeckoInstruction _inst); void ps_madd(UGeckoInstruction _inst); void ps_sub(UGeckoInstruction _inst); void ps_mul(UGeckoInstruction _inst); + void ps_muls0(UGeckoInstruction _inst); + void ps_muls1(UGeckoInstruction _inst); + void ps_merge00(UGeckoInstruction _inst); + void ps_merge01(UGeckoInstruction _inst); + void ps_merge10(UGeckoInstruction _inst); + void ps_merge11(UGeckoInstruction _inst); + void ps_mr(UGeckoInstruction _inst); + void ps_neg(UGeckoInstruction _inst); + void ps_abs(UGeckoInstruction _inst); + void ps_nabs(UGeckoInstruction _inst); }; #endif // _JIT64_H diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 3dcaf902d1..02a48740ce 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -43,14 +43,46 @@ void JitArm::fabsx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(bJITFloatingPointOff) - ARMReg vD = fpr.R0(inst.FD); ARMReg vB = fpr.R0(inst.FB); + ARMReg vD = fpr.R0(inst.FD, false); VABS(vD, vB); if (inst.Rc) Helper_UpdateCR1(vD); } +void JitArm::fnabsx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITFloatingPointOff) + + ARMReg vB = fpr.R0(inst.FB); + ARMReg vD = fpr.R0(inst.FD, false); + ARMReg V0 = fpr.GetReg(); + + // XXX: Could be done quicker + VABS(vD, vB); + VMOV(V0, vD); + VSUB(vD, vD, V0); + VSUB(vD, vD, V0); + + fpr.Unlock(V0); + if (inst.Rc) Helper_UpdateCR1(vD); +} + +void JitArm::fnegx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITFloatingPointOff) + + ARMReg vB = fpr.R0(inst.FB); + ARMReg vD = fpr.R0(inst.FD, false); + + VNEG(vD, vB); + + if (inst.Rc) Helper_UpdateCR1(vD); +} + void JitArm::faddsx(UGeckoInstruction inst) { INSTRUCTION_START @@ -58,8 +90,8 @@ void JitArm::faddsx(UGeckoInstruction inst) ARMReg vA = fpr.R0(inst.FA); ARMReg vB = fpr.R0(inst.FB); - ARMReg vD0 = fpr.R0(inst.FD); - ARMReg vD1 = fpr.R1(inst.FD); + ARMReg vD0 = fpr.R0(inst.FD, false); + ARMReg vD1 = fpr.R1(inst.FD, false); VADD(vD0, vA, vB); VMOV(vD1, vD0); @@ -71,9 +103,9 @@ void JitArm::faddx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(bJITFloatingPointOff) - ARMReg vD = fpr.R0(inst.FD); ARMReg vA = fpr.R0(inst.FA); ARMReg vB = fpr.R0(inst.FB); + ARMReg vD = fpr.R0(inst.FD, false); VADD(vD, vA, vB); if (inst.Rc) Helper_UpdateCR1(vD); @@ -86,8 +118,8 @@ void JitArm::fsubsx(UGeckoInstruction inst) ARMReg vA = fpr.R0(inst.FA); ARMReg vB = fpr.R0(inst.FB); - ARMReg vD0 = fpr.R0(inst.FD); - ARMReg vD1 = fpr.R1(inst.FD); + ARMReg vD0 = fpr.R0(inst.FD, false); + ARMReg vD1 = fpr.R1(inst.FD, false); VSUB(vD0, vA, vB); VMOV(vD1, vD0); @@ -99,9 +131,9 @@ void JitArm::fsubx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(bJITFloatingPointOff) - ARMReg vD = fpr.R0(inst.FD); ARMReg vA = fpr.R0(inst.FA); ARMReg vB = fpr.R0(inst.FB); + ARMReg vD = fpr.R0(inst.FD, false); VSUB(vD, vA, vB); if (inst.Rc) Helper_UpdateCR1(vD); @@ -114,8 +146,8 @@ void JitArm::fmulsx(UGeckoInstruction inst) ARMReg vA = fpr.R0(inst.FA); ARMReg vC = fpr.R0(inst.FC); - ARMReg vD0 = fpr.R0(inst.FD); - ARMReg vD1 = fpr.R1(inst.FD); + ARMReg vD0 = fpr.R0(inst.FD, false); + ARMReg vD1 = fpr.R1(inst.FD, false); VMUL(vD0, vA, vC); VMOV(vD1, vD0); @@ -127,9 +159,9 @@ void JitArm::fmulx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(bJITFloatingPointOff) - ARMReg vD0 = fpr.R0(inst.FD); ARMReg vA = fpr.R0(inst.FA); ARMReg vC = fpr.R0(inst.FC); + ARMReg vD0 = fpr.R0(inst.FD, false); VMUL(vD0, vA, vC); if (inst.Rc) Helper_UpdateCR1(vD0); @@ -139,8 +171,8 @@ void JitArm::fmrx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(bJITFloatingPointOff) - ARMReg vD = fpr.R0(inst.FD); ARMReg vB = fpr.R0(inst.FB); + ARMReg vD = fpr.R0(inst.FD, false); VMOV(vD, vB); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index e6a084716a..4f4751c02f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -40,12 +40,11 @@ void JitArm::ps_add(UGeckoInstruction inst) ARMReg vA1 = fpr.R1(a); ARMReg vB0 = fpr.R0(b); ARMReg vB1 = fpr.R1(b); - ARMReg vD0 = fpr.R0(d); - ARMReg vD1 = fpr.R1(d); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); VADD(vD0, vA0, vB0); VADD(vD1, vA1, vB1); - fpr.Flush(); } // Wrong, THP videos like SMS and Ikaruga show artifacts @@ -67,8 +66,8 @@ void JitArm::ps_madd(UGeckoInstruction inst) ARMReg vB1 = fpr.R1(b); ARMReg vC0 = fpr.R0(c); ARMReg vC1 = fpr.R1(c); - ARMReg vD0 = fpr.R0(d); - ARMReg vD1 = fpr.R1(d); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); ARMReg V0 = fpr.GetReg(); ARMReg V1 = fpr.GetReg(); @@ -99,14 +98,35 @@ void JitArm::ps_sum0(UGeckoInstruction inst) ARMReg vA0 = fpr.R0(a); ARMReg vB1 = fpr.R1(b); ARMReg vC1 = fpr.R1(c); - ARMReg vD0 = fpr.R0(d); - ARMReg vD1 = fpr.R1(d); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); VADD(vD0, vA0, vB1); VMOV(vD1, vC1); - fpr.Flush(); + } +void JitArm::ps_sum1(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + if (inst.Rc) { + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vB1 = fpr.R1(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + + VMOV(vD0, vC0); + VADD(vD1, vA0, vB1); +} + + void JitArm::ps_sub(UGeckoInstruction inst) { INSTRUCTION_START @@ -120,12 +140,11 @@ void JitArm::ps_sub(UGeckoInstruction inst) ARMReg vA1 = fpr.R1(a); ARMReg vB0 = fpr.R0(b); ARMReg vB1 = fpr.R1(b); - ARMReg vD0 = fpr.R0(d); - ARMReg vD1 = fpr.R1(d); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); VSUB(vD0, vA0, vB0); VSUB(vD1, vA1, vB1); - fpr.Flush(); } void JitArm::ps_mul(UGeckoInstruction inst) @@ -141,11 +160,210 @@ void JitArm::ps_mul(UGeckoInstruction inst) ARMReg vA1 = fpr.R1(a); ARMReg vC0 = fpr.R0(c); ARMReg vC1 = fpr.R1(c); - ARMReg vD0 = fpr.R0(d); - ARMReg vD1 = fpr.R1(d); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); VMUL(vD0, vA0, vC0); VMUL(vD1, vA1, vC1); - fpr.Flush(); } +void JitArm::ps_muls0(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, c = inst.FC, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vC0 = fpr.R0(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + + + VMUL(V0, vA0, vC0); + VMUL(V1, vA1, vC0); + VMOV(vD0, V0); + VMOV(vD1, V1); + + fpr.Unlock(V0); + fpr.Unlock(V1); +} + +void JitArm::ps_muls1(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, c = inst.FC, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vC1 = fpr.R1(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + + + VMUL(V0, vA0, vC1); + VMUL(V1, vA1, vC1); + VMOV(vD0, V0); + VMOV(vD1, V1); + + fpr.Unlock(V0); + fpr.Unlock(V1); +} + +void JitArm::ps_merge00(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 a = inst.FA, b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vA0 = fpr.R0(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + VMOV(vD0, vA0); + VMOV(vD1, vB0); +} + +void JitArm::ps_merge01(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 a = inst.FA, b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vA0 = fpr.R0(a); + ARMReg vB1 = fpr.R1(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + VMOV(vD0, vA0); + VMOV(vD1, vB1); +} + +void JitArm::ps_merge10(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 a = inst.FA, b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vA1 = fpr.R1(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + VMOV(vD0, vA1); + VMOV(vD1, vB0); +} + +void JitArm::ps_merge11(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 a = inst.FA, b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vA1 = fpr.R1(a); + ARMReg vB1 = fpr.R1(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + VMOV(vD0, vA1); + VMOV(vD1, vB1); +} + +void JitArm::ps_mr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + VMOV(vD0, vB0); + VMOV(vD1, vB1); +} + +void JitArm::ps_neg(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + VNEG(vD0, vB0); + VNEG(vD1, vB1); +} + +void JitArm::ps_abs(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + VABS(vD0, vB0); + VABS(vD1, vB1); +} + +void JitArm::ps_nabs(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + u32 b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + ARMReg V0 = fpr.GetReg(); + + // XXX: Could be done quicker + VABS(vD0, vB0); + VMOV(V0, vD0); + VSUB(vD0, vD0, V0); + VSUB(vD0, vD0, V0); + VABS(vD1, vB1); + VMOV(V0, vD1); + VSUB(vD1, vD1, V0); + VSUB(vD1, vD1, V0); + + fpr.Unlock(V0); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 338de355df..4a1aa9d28f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -127,16 +127,16 @@ static GekkoOPTemplate table4[] = { //SUBOP10 {0, &JitArm::Default}, //"ps_cmpu0", OPTYPE_PS, FL_SET_CRn}}, {32, &JitArm::Default}, //"ps_cmpo0", OPTYPE_PS, FL_SET_CRn}}, - {40, &JitArm::Default}, //"ps_neg", OPTYPE_PS, FL_RC_BIT}}, - {136, &JitArm::Default}, //"ps_nabs", OPTYPE_PS, FL_RC_BIT}}, - {264, &JitArm::Default}, //"ps_abs", OPTYPE_PS, FL_RC_BIT}}, + {40, &JitArm::ps_neg}, //"ps_neg", OPTYPE_PS, FL_RC_BIT}}, + {136, &JitArm::ps_nabs}, //"ps_nabs", OPTYPE_PS, FL_RC_BIT}}, + {264, &JitArm::ps_abs}, //"ps_abs", OPTYPE_PS, FL_RC_BIT}}, {64, &JitArm::Default}, //"ps_cmpu1", OPTYPE_PS, FL_RC_BIT}}, - {72, &JitArm::Default}, //"ps_mr", OPTYPE_PS, FL_RC_BIT}}, + {72, &JitArm::ps_mr}, //"ps_mr", OPTYPE_PS, FL_RC_BIT}}, {96, &JitArm::Default}, //"ps_cmpo1", OPTYPE_PS, FL_RC_BIT}}, - {528, &JitArm::Default}, //"ps_merge00", OPTYPE_PS, FL_RC_BIT}}, - {560, &JitArm::Default}, //"ps_merge01", OPTYPE_PS, FL_RC_BIT}}, - {592, &JitArm::Default}, //"ps_merge10", OPTYPE_PS, FL_RC_BIT}}, - {624, &JitArm::Default}, //"ps_merge11", OPTYPE_PS, FL_RC_BIT}}, + {528, &JitArm::ps_merge00}, //"ps_merge00", OPTYPE_PS, FL_RC_BIT}}, + {560, &JitArm::ps_merge01}, //"ps_merge01", OPTYPE_PS, FL_RC_BIT}}, + {592, &JitArm::ps_merge10}, //"ps_merge10", OPTYPE_PS, FL_RC_BIT}}, + {624, &JitArm::ps_merge11}, //"ps_merge11", OPTYPE_PS, FL_RC_BIT}}, {1014, &JitArm::Default}, //"dcbz_l", OPTYPE_SYSTEM, 0}}, }; @@ -144,9 +144,9 @@ static GekkoOPTemplate table4[] = static GekkoOPTemplate table4_2[] = { {10, &JitArm::ps_sum0}, //"ps_sum0", OPTYPE_PS, 0}}, - {11, &JitArm::Default}, //"ps_sum1", OPTYPE_PS, 0}}, - {12, &JitArm::Default}, //"ps_muls0", OPTYPE_PS, 0}}, - {13, &JitArm::Default}, //"ps_muls1", OPTYPE_PS, 0}}, + {11, &JitArm::ps_sum1}, //"ps_sum1", OPTYPE_PS, 0}}, + {12, &JitArm::ps_muls0}, //"ps_muls0", OPTYPE_PS, 0}}, + {13, &JitArm::ps_muls1}, //"ps_muls1", OPTYPE_PS, 0}}, {14, &JitArm::Default}, //"ps_madds0", OPTYPE_PS, 0}}, {15, &JitArm::Default}, //"ps_madds1", OPTYPE_PS, 0}}, {18, &JitArm::Default}, //"ps_div", OPTYPE_PS, 0, 16}}, @@ -352,8 +352,8 @@ static GekkoOPTemplate table63[] = {14, &JitArm::Default}, //"fctiwx", OPTYPE_FPU, FL_RC_BIT_F}}, {15, &JitArm::Default}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}}, {72, &JitArm::fmrx}, //"fmrx", OPTYPE_FPU, FL_RC_BIT_F}}, - {136, &JitArm::Default}, //"fnabsx", OPTYPE_FPU, FL_RC_BIT_F}}, - {40, &JitArm::Default}, //"fnegx", OPTYPE_FPU, FL_RC_BIT_F}}, + {136, &JitArm::fnabsx}, //"fnabsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {40, &JitArm::fnegx}, //"fnegx", OPTYPE_FPU, FL_RC_BIT_F}}, {12, &JitArm::Default}, //"frspx", OPTYPE_FPU, FL_RC_BIT_F}}, {64, &JitArm::Default}, //"mcrfs", OPTYPE_SYSTEMFP, 0}}, diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp index 359c497b3c..802f767f72 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp @@ -35,7 +35,6 @@ void ArmFPRCache::Init(ARMXEmitter *emitter) ArmCRegs[a].Reg = PPCRegs[a]; ArmCRegs[a].LastLoad = 0; ArmCRegs[a].PS1 = false; - ArmCRegs[a].Away = true; } for(u8 a = 0; a < NUMARMREG; ++a) { @@ -43,14 +42,11 @@ void ArmFPRCache::Init(ARMXEmitter *emitter) ArmRegs[a].free = true; } } + void ArmFPRCache::Start(PPCAnalyst::BlockRegStats &stats) { - for(u8 a = 0; a < NUMPPCREG; ++a) - { - ArmCRegs[a].PPCReg = 33; - ArmCRegs[a].LastLoad = 0; - } } + ARMReg *ArmFPRCache::GetPPCAllocationOrder(int &count) { // This will return us the allocation order of the registers we can use on @@ -101,59 +97,78 @@ void ArmFPRCache::Unlock(ARMReg V0) } } } -ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad) +u32 ArmFPRCache::GetLeastUsedRegister(bool increment) { u32 HighestUsed = 0; - u8 Num = 0; + u8 lastRegIndex = 0; for(u8 a = 0; a < NUMPPCREG; ++a){ - ++ArmCRegs[a].LastLoad; + if (increment) + ++ArmCRegs[a].LastLoad; if (ArmCRegs[a].LastLoad > HighestUsed) { HighestUsed = ArmCRegs[a].LastLoad; - Num = a; + lastRegIndex = a; } } - // Check if already Loaded - for(u8 a = 0; a < NUMPPCREG; ++a) - if (ArmCRegs[a].PPCReg == preg && ArmCRegs[a].PS1 == PS1) - { - ArmCRegs[a].LastLoad = 0; - // Check if the value is actually in the reg - if (ArmCRegs[a].Away && preLoad) - { - // Load it now since we want it - s16 offset = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); - emit->VLDR(ArmCRegs[a].Reg, R9, offset); - ArmCRegs[a].Away = false; - } - return ArmCRegs[a].Reg; - } - // Check if we have a free register + return lastRegIndex; +} +bool ArmFPRCache::FindFreeRegister(u32 ®index) +{ for (u8 a = 0; a < NUMPPCREG; ++a) if (ArmCRegs[a].PPCReg == 33) { - s16 offset = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); - if (preLoad) - emit->VLDR(ArmCRegs[a].Reg, R9, offset); - ArmCRegs[a].PPCReg = preg; - ArmCRegs[a].LastLoad = 0; - ArmCRegs[a].PS1 = PS1; - ArmCRegs[a].Away = !preLoad; - return ArmCRegs[a].Reg; + regindex = a; + return true; } - // Alright, we couldn't get a free space, dump that least used register - s16 offsetOld = PPCSTATE_OFF(ps) + (ArmCRegs[Num].PPCReg * 16) + (ArmCRegs[Num].PS1 ? 8 : 0); - emit->VSTR(ArmCRegs[Num].Reg, R9, offsetOld); - - s16 offsetNew = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); - if (preLoad) - emit->VLDR(ArmCRegs[Num].Reg, R9, offsetNew); - ArmCRegs[Num].PPCReg = preg; - ArmCRegs[Num].LastLoad = 0; - ArmCRegs[Num].PS1 = PS1; - ArmCRegs[Num].Away = !preLoad; - return ArmCRegs[Num].Reg; + return false; +} +ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad) +{ + u32 lastRegIndex = GetLeastUsedRegister(true); + + if (_regs[preg][PS1].GetType() != REG_NOTLOADED) + { + u8 a = _regs[preg][PS1].GetRegIndex(); + ArmCRegs[a].LastLoad = 0; + if (_regs[preg][PS1].GetType() == REG_AWAY && preLoad) + { + s16 offset = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); + emit->VLDR(ArmCRegs[a].Reg, R9, offset); + _regs[preg][PS1].LoadToReg(a); + } + return ArmCRegs[a].Reg; + } + + u32 regindex; + if (FindFreeRegister(regindex)) + { + s16 offset = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); + emit->VLDR(ArmCRegs[regindex].Reg, R9, offset); + + ArmCRegs[regindex].PPCReg = preg; + ArmCRegs[regindex].LastLoad = 0; + + _regs[preg][PS1].LoadToReg(regindex); + return ArmCRegs[regindex].Reg; + } + + // Alright, we couldn't get a free space, dump that least used register + s16 offsetOld = PPCSTATE_OFF(ps) + (ArmCRegs[lastRegIndex].PPCReg * 16) + (ArmCRegs[lastRegIndex].PS1 ? 8 : 0); + s16 offsetNew = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); + + emit->VSTR(ArmCRegs[lastRegIndex].Reg, R9, offsetOld); + emit->VLDR(ArmCRegs[lastRegIndex].Reg, R9, offsetNew); + + _regs[ArmCRegs[lastRegIndex].PPCReg][PS1].Flush(); + + ArmCRegs[lastRegIndex].PPCReg = preg; + ArmCRegs[lastRegIndex].LastLoad = 0; + ArmCRegs[lastRegIndex].PS1 = PS1; + + _regs[preg][PS1].LoadToReg(lastRegIndex); + + return ArmCRegs[lastRegIndex].Reg; } ARMReg ArmFPRCache::R0(u32 preg, bool preLoad) @@ -168,14 +183,28 @@ ARMReg ArmFPRCache::R1(u32 preg, bool preLoad) void ArmFPRCache::Flush() { - for(u8 a = 0; a < NUMPPCREG; ++a) - if (ArmCRegs[a].PPCReg != 33) + for (u8 a = 0; a < 32; ++a) + { + if (_regs[a][0].GetType() == REG_REG) { - s16 offset = PPCSTATE_OFF(ps) + (ArmCRegs[a].PPCReg * 16) + (ArmCRegs[a].PS1 ? 8 : 0); - emit->VSTR(ArmCRegs[a].Reg, R9, offset); - ArmCRegs[a].PPCReg = 33; - ArmCRegs[a].LastLoad = 0; - ArmCRegs[a].Away = true; + s16 offset = PPCSTATE_OFF(ps) + (a * 16); + u32 regindex = _regs[a][0].GetRegIndex(); + emit->VSTR(ArmCRegs[regindex].Reg, R9, offset); + + ArmCRegs[regindex].PPCReg = 33; + ArmCRegs[regindex].LastLoad = 0; + _regs[a][0].Flush(); } + if (_regs[a][1].GetType() == REG_REG) + { + s16 offset = PPCSTATE_OFF(ps) + (a * 16) + 8; + u32 regindex = _regs[a][1].GetRegIndex(); + emit->VSTR(ArmCRegs[regindex].Reg, R9, offset); + + ArmCRegs[regindex].PPCReg = 33; + ArmCRegs[regindex].LastLoad = 0; + _regs[a][1].Flush(); + } + } } diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h index b8c17f470f..10a3520d56 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h @@ -29,6 +29,7 @@ using namespace ArmGen; class ArmFPRCache { private: + OpArg _regs[32][2]; // One for each FPR reg JRCPPC ArmCRegs[ARMFPUREGS]; JRCReg ArmRegs[ARMFPUREGS]; @@ -40,6 +41,8 @@ private: ARMReg GetPPCReg(u32 preg, bool PS1, bool preLoad); + u32 GetLeastUsedRegister(bool increment); + bool FindFreeRegister(u32 ®index); protected: ARMXEmitter *emit; diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp index be79bd4b71..562770e367 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp @@ -126,10 +126,8 @@ bool ArmRegCache::FindFreeRegister(u32 ®index) ARMReg ArmRegCache::R(u32 preg) { if (regs[preg].GetType() == REG_IMM) - { return BindToRegister(preg); - //asm ("bkpt #1;"); - } + u32 lastRegIndex = GetLeastUsedRegister(true); // Check if already Loaded diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h index 9eac9eeee8..d41af42d6e 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h @@ -38,55 +38,57 @@ using namespace ArmGen; enum RegType { REG_NOTLOADED = 0, - REG_REG, - REG_IMM, + REG_REG, // Reg type is register + REG_IMM, // Reg is really a IMM + REG_AWAY, // Bound to a register, but not preloaded }; class OpArg { private: - class Reg{ - public: - RegType m_type; - u8 m_reg; // index to register - u32 m_value; - Reg() - { - m_type = REG_NOTLOADED; - m_reg = 33; - m_value = 0; - } - } Reg; + RegType m_type; // store type + u8 m_reg; // index to register + u32 m_value; // IMM value public: - OpArg(){} + OpArg() + { + m_type = REG_NOTLOADED; + m_reg = 33; + m_value = 0; + } RegType GetType() { - return Reg.m_type; + return m_type; } u8 GetRegIndex() { - return Reg.m_reg; + return m_reg; } u32 GetImm() { - return Reg.m_value; + return m_value; + } + void LoadToAway(u8 reg) + { + m_type = REG_AWAY; + m_reg = reg; } void LoadToReg(u8 reg) { - Reg.m_type = REG_REG; - Reg.m_reg = reg; + m_type = REG_REG; + m_reg = reg; } void LoadToImm(u32 imm) { - Reg.m_type = REG_IMM; - Reg.m_value = imm; + m_type = REG_IMM; + m_value = imm; } void Flush() { - Reg.m_type = REG_NOTLOADED; + m_type = REG_NOTLOADED; } }; @@ -96,7 +98,6 @@ struct JRCPPC bool PS1; ARMReg Reg; // Tied to which ARM Register u32 LastLoad; - bool Away; // Only used in FPR cache }; struct JRCReg { From 67c65831bc43a24d39421911041e155bb1858c81 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 7 Sep 2013 00:35:12 +0000 Subject: [PATCH 076/267] [ARM] Make fnabsx and ps_nabs quicker. Sleep deprivation got the better of me. --- .../Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 5 +---- .../Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp | 11 +++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 02a48740ce..2295809b3f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -60,11 +60,8 @@ void JitArm::fnabsx(UGeckoInstruction inst) ARMReg vD = fpr.R0(inst.FD, false); ARMReg V0 = fpr.GetReg(); - // XXX: Could be done quicker VABS(vD, vB); - VMOV(V0, vD); - VSUB(vD, vD, V0); - VSUB(vD, vD, V0); + VNEG(vD, vD); fpr.Unlock(V0); if (inst.Rc) Helper_UpdateCR1(vD); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 4f4751c02f..a5f7d1a1de 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -355,15 +355,10 @@ void JitArm::ps_nabs(UGeckoInstruction inst) ARMReg vD1 = fpr.R1(d, false); ARMReg V0 = fpr.GetReg(); - // XXX: Could be done quicker VABS(vD0, vB0); - VMOV(V0, vD0); - VSUB(vD0, vD0, V0); - VSUB(vD0, vD0, V0); + VNEG(vD0, vD0); VABS(vD1, vB1); - VMOV(V0, vD1); - VSUB(vD1, vD1, V0); - VSUB(vD1, vD1, V0); - + VNEG(vD1, vD1); + fpr.Unlock(V0); } From d25a8bb6cb57b4ae3d14a5f6320262955ab88514 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sat, 7 Sep 2013 13:01:59 +1200 Subject: [PATCH 077/267] Fix reply after shutdown error. Fixes Issue 6577 --- .../Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp | 20 +++++++++++++++++++ .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h | 1 + 2 files changed, 21 insertions(+) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp index 243696f652..e663d737c2 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp @@ -37,6 +37,7 @@ void CWII_IPC_HLE_Device_hid::checkUsbUpdates(CWII_IPC_HLE_Device_hid* hid) static u16 timeToFill = 0; if (timeToFill == 0) { + std::lock_guard lk(hid->s_device_list_reply); if (hid->deviceCommandAddress != 0){ hid->FillOutDevices(Memory::Read_U32(hid->deviceCommandAddress + 0x18), Memory::Read_U32(hid->deviceCommandAddress + 0x1C)); @@ -255,6 +256,25 @@ bool CWII_IPC_HLE_Device_hid::IOCtl(u32 _CommandAddress) return false; break; } + case IOCTL_HID_SHUTDOWN: + { + std::lock_guard lk(s_device_list_reply); + if (deviceCommandAddress != 0){ + Memory::Write_U32(0xFFFFFFFF, Memory::Read_U32(deviceCommandAddress + 0x18)); + + Memory::Write_U32(8, deviceCommandAddress); + // IOS seems to write back the command that was responded to + Memory::Write_U32(/*COMMAND_IOCTL*/ 6, deviceCommandAddress + 8); + + // Return value + Memory::Write_U32(-1, deviceCommandAddress + 4); + WII_IPC_HLE_Interface::EnqueReplyCallback(deviceCommandAddress); + deviceCommandAddress = 0; + } + DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Shutdown) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)", + BufferIn, BufferInSize, BufferOut, BufferOutSize); + break; + } default: { DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(0x%x) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)", diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h index a8c2604edf..74169a50b3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h @@ -123,6 +123,7 @@ private: struct libusb_device_handle * GetDeviceByDevNum(u32 devNum); std::map open_devices; std::mutex s_open_devices; + std::mutex s_device_list_reply; std::map device_identifiers; std::thread usb_thread; From f1c63577502f1f196f75784a37945b986864a653 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 6 Sep 2013 21:02:11 -0500 Subject: [PATCH 078/267] Enable translation of the about dialog. --- Source/Core/DolphinWX/Src/AboutDolphin.cpp | 67 +++++++++++----------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 72d488e7af..f1981efdd2 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -18,39 +18,40 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, wxStaticBitmap* const sbDolphinLogo = new wxStaticBitmap(this, wxID_ANY, wxBitmap(iDolphinLogo)); - std::string Text = "Dolphin " SCM_DESC_STR "\n" - "Copyright (c) 2003-2013+ Dolphin Team\n" - "\n" - "Branch: " SCM_BRANCH_STR "\n" - "Revision: " SCM_REV_STR "\n" - "Compiled: " __DATE__ " @ " __TIME__ "\n" - "\n" - "Dolphin is a Gamecube/Wii emulator, which was\n" - "originally written by F|RES and ector.\n" - "Today Dolphin is an open source project with many\n" - "contributors, too many to list.\n" - "If interested, just go check out the project page at\n" - "http://code.google.com/p/dolphin-emu/ .\n" - "\n" - "Special thanks to Bushing, Costis, CrowTRobo,\n" - "Marcan, Segher, Titanik, or9 and Hotquik for their\n" - "reverse engineering and docs/demos.\n" - "\n" - "Big thanks to Gilles Mouchard whose Microlib PPC\n" - "emulator gave our development a kickstart.\n" - "\n" - "Thanks to Frank Wille for his PowerPC disassembler,\n" - "which or9 and we modified to include Gekko specifics.\n" - "\n" - "Thanks to hcs/destop for their GC ADPCM decoder.\n" - "\n" - "We are not affiliated with Nintendo in any way.\n" - "Gamecube and Wii are trademarks of Nintendo.\n" - "The emulator is for educational purposes only\n" - "and should not be used to play games you do\n" - "not legally own."; - wxStaticText* const Message = new wxStaticText(this, wxID_ANY, - StrToWxStr(Text)); + const wxString Text = wxString::Format(_("Dolphin %s\n" + "Copyright (c) 2003-2013+ Dolphin Team\n" + "\n" + "Branch: %s\n" + "Revision: %s\n" + "Compiled: %s @ %s\n" + "\n" + "Dolphin is a Gamecube/Wii emulator, which was\n" + "originally written by F|RES and ector.\n" + "Today Dolphin is an open source project with many\n" + "contributors, too many to list.\n" + "If interested, just go check out the project page at\n" + "http://code.google.com/p/dolphin-emu/ .\n" + "\n" + "Special thanks to Bushing, Costis, CrowTRobo,\n" + "Marcan, Segher, Titanik, or9 and Hotquik for their\n" + "reverse engineering and docs/demos.\n" + "\n" + "Big thanks to Gilles Mouchard whose Microlib PPC\n" + "emulator gave our development a kickstart.\n" + "\n" + "Thanks to Frank Wille for his PowerPC disassembler,\n" + "which or9 and we modified to include Gekko specifics.\n" + "\n" + "Thanks to hcs/destop for their GC ADPCM decoder.\n" + "\n" + "We are not affiliated with Nintendo in any way.\n" + "Gamecube and Wii are trademarks of Nintendo.\n" + "The emulator is for educational purposes only\n" + "and should not be used to play games you do\n" + "not legally own."), + SCM_DESC_STR, SCM_BRANCH_STR, SCM_REV_STR, __DATE__, __TIME__); + + wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); Message->Wrap(GetSize().GetWidth()); wxBoxSizer* const sInfo = new wxBoxSizer(wxVERTICAL); From 2bc44f98c303b4f2d60e740c44bd8b6fb08531aa Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 7 Sep 2013 00:06:03 -0400 Subject: [PATCH 079/267] Disable gui controls for gc controllers and memory cards during netplay and movies. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 0f82378f50..7ebd617b8a 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -30,6 +30,7 @@ #include "HotkeyDlg.h" #include "Main.h" #include "VideoBackendBase.h" +#include "NetPlayClient.h" #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) @@ -740,6 +741,8 @@ void CConfigMain::CreateGUIControls() sbGamecubeEXIDevSettings->Add(GCEXIDeviceText[i], wxGBPosition(i, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); sbGamecubeEXIDevSettings->Add(GCEXIDevice[i], wxGBPosition(i, 1), wxGBSpan(1, (i < 2)?1:2), wxALIGN_CENTER_VERTICAL); if (i < 2) sbGamecubeEXIDevSettings->Add(GCMemcardPath[i], wxGBPosition(i, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + if (NetPlay::IsNetPlayRunning()) + GCEXIDevice[i]->Disable(); } sbGamecubeDeviceSettings->Add(sbGamecubeEXIDevSettings, 0, wxALL, 5); @@ -748,6 +751,10 @@ void CConfigMain::CreateGUIControls() { sbGamecubeDevSettings->Add(GCSIDeviceText[i], 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0); sbGamecubeDevSettings->Add(GCSIDevice[i], 1, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 0); + if (NetPlay::IsNetPlayRunning() || Movie::IsRecordingInput() || Movie::IsPlayingInput()) + { + GCSIDevice[i]->Disable(); + } } sbGamecubeDeviceSettings->Add(sbGamecubeDevSettings, 0, wxALL, 5); From 33fb1b562fdb1b1280cfbbf194287078929fa932 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 7 Sep 2013 00:27:35 -0400 Subject: [PATCH 080/267] Move some code from NetPlayClient.h to NetPlayProto.h, and only include that outside of NetPlay. --- Source/Core/Core/Src/BootManager.cpp | 2 +- Source/Core/Core/Src/HW/SI.cpp | 2 +- Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 2 +- Source/Core/Core/Src/NetPlayClient.h | 8 -------- Source/Core/Core/Src/NetPlayProto.h | 8 ++++++++ Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index b2c7dbc058..ec388e4974 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -34,7 +34,7 @@ #include "Host.h" #include "VideoBackendBase.h" #include "Movie.h" -#include "NetPlayClient.h" +#include "NetPlayProto.h" namespace BootManager { diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp index ff9057aa4f..76810b7f6d 100644 --- a/Source/Core/Core/Src/HW/SI.cpp +++ b/Source/Core/Core/Src/HW/SI.cpp @@ -7,7 +7,7 @@ #include "../ConfigManager.h" #include "../CoreTiming.h" #include "../Movie.h" -#include "../NetPlayClient.h" +#include "../NetPlayProto.h" #include "SystemTimers.h" #include "ProcessorInterface.h" diff --git a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp index 80e8334989..0caa2ed7e8 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp @@ -6,7 +6,7 @@ #include "WII_IPC_HLE.h" #include "WII_IPC_HLE_Device.h" // No Wii socket support while using NetPlay or TAS -#include "NetPlayClient.h" +#include "NetPlayProto.h" #include "Movie.h" using WII_IPC_HLE_Interface::ECommandType; diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 5e9804cd25..ddd971c9c1 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -24,7 +24,7 @@ #include "../../Common/Src/NandPaths.h" #include "polarssl/md5.h" #include "scmrev.h" -#include "NetPlayClient.h" +#include "NetPlayProto.h" // The chunk to allocate movie data in multiples of. #define DTM_BASE_LENGTH (1024) diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index db949aaa7c..d6b121a18d 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -22,8 +22,6 @@ #include "FifoQueue.h" -const int NETPLAY_INITIAL_GCTIME = 1272737767; - class NetPad { public: @@ -51,8 +49,6 @@ public: virtual bool IsRecording() = 0; }; -extern NetSettings g_NetPlaySettings; - class Player { public: @@ -131,10 +127,6 @@ private: std::map m_players; }; -namespace NetPlay { - bool IsNetPlayRunning(); -}; - void NetPlay_Enable(NetPlayClient* const np); void NetPlay_Disable(); diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h index 900b08f936..2b4c49d97c 100644 --- a/Source/Core/Core/Src/NetPlayProto.h +++ b/Source/Core/Core/Src/NetPlayProto.h @@ -18,6 +18,8 @@ struct NetSettings TEXIDevices m_EXIDevice[2]; }; +extern NetSettings g_NetPlaySettings; + struct Rpt : public std::vector { u16 channel; @@ -27,6 +29,8 @@ typedef std::vector NetWiimote; #define NETPLAY_VERSION "Dolphin NetPlay 2013-09-03" +const int NETPLAY_INITIAL_GCTIME = 1272737767; + // messages enum { @@ -67,4 +71,8 @@ enum CON_ERR_VERSION_MISMATCH }; +namespace NetPlay { + bool IsNetPlayRunning(); +}; + #endif diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 7ebd617b8a..168e046c29 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -30,7 +30,7 @@ #include "HotkeyDlg.h" #include "Main.h" #include "VideoBackendBase.h" -#include "NetPlayClient.h" +#include "NetPlayProto.h" #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) From 86d10ec19e789700fcd8d22ef6a77f6523bf7e91 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 7 Sep 2013 06:19:24 -0400 Subject: [PATCH 081/267] [Android] Fix the input binding string. Forgot a period at the end. Thanks for pointing that out pauldachz --- Source/Android/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index 67e00e05ff..f474984809 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -40,7 +40,7 @@ Input Input Binding - Press or move an input to bind it to %1$s + Press or move an input to bind it to %1$s. Button A Button B Button Start From a3d86ceead3e8e0762880e68a4c175cbe19b3c0e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 7 Sep 2013 12:24:32 -0500 Subject: [PATCH 082/267] When checking for glew via cmake check to see that the system version of glew is at least 1.8 and has the methods of glew 1.9. This is an annoying hack to deal with Ubuntu's glew setup, which is glew 1.8 with 1.9 methods patched in. --- CMakeLists.txt | 2 +- CMakeTests/FindGLEW.cmake | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 CMakeTests/FindGLEW.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b2ba4f44f..f2571e824b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -646,7 +646,7 @@ if(WIN32) else() if(NOT ANDROID) if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - check_lib(GLEW GLEW GL/glew.h) + include(FindGLEW) endif() if(NOT GLEW_FOUND) message("Using static GLEW from Externals") diff --git a/CMakeTests/FindGLEW.cmake b/CMakeTests/FindGLEW.cmake new file mode 100644 index 0000000000..33c60d0439 --- /dev/null +++ b/CMakeTests/FindGLEW.cmake @@ -0,0 +1,35 @@ +include(FindPkgConfig OPTIONAL) + +# This is a hack to deal with Ubuntu's mess. +# Ubuntu's version of glew is 1.8, but they have patched in most of glew 1.9. +# So Ubuntu's version works for dolphin. +macro(test_glew) + set(CMAKE_REQUIRED_INCLUDES ${GLEW_INCLUDE_DIRS}) + set(CMAKE_REQUIRED_LIBRARIES GLEW) + check_cxx_source_runs(" + #include + int main() + { + #ifdef GLEW_ARB_shader_image_load_store + return 0; + #else + return 1; + #endif + }" + GLEW_HAS_1_9_METHODS) +endmacro() + +if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND) + pkg_search_module(GLEW REQUIRED glew>=1.8) +endif() + +if(GLEW_FOUND) + test_glew() + if (GLEW_HAS_1_9_METHODS) + include_directories(${GLEW_INCLUDE_DIRS}) + message("GLEW found") + else() + set($GLEW_FOUND 0 CACHE INTERNAL "") + message(FATAL_ERROR "A version of GLEW with the required methods was not found") + endif() +endif() From d617efc5ef1af2c6fa563c7b1aeeed911d7886a4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 7 Sep 2013 12:40:40 -0500 Subject: [PATCH 083/267] When checking for glew, don't fail if a working system version is not found so we can fall back to the Externals version. --- CMakeLists.txt | 4 ++-- CMakeTests/FindGLEW.cmake | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2571e824b..48504d66af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -648,11 +648,11 @@ else() if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(FindGLEW) endif() - if(NOT GLEW_FOUND) + if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS) message("Using static GLEW from Externals") add_subdirectory(Externals/GLew) include_directories(Externals/GLew/include) - endif(NOT GLEW_FOUND) + endif() endif() endif() diff --git a/CMakeTests/FindGLEW.cmake b/CMakeTests/FindGLEW.cmake index 33c60d0439..cb1e09021a 100644 --- a/CMakeTests/FindGLEW.cmake +++ b/CMakeTests/FindGLEW.cmake @@ -28,8 +28,5 @@ if(GLEW_FOUND) if (GLEW_HAS_1_9_METHODS) include_directories(${GLEW_INCLUDE_DIRS}) message("GLEW found") - else() - set($GLEW_FOUND 0 CACHE INTERNAL "") - message(FATAL_ERROR "A version of GLEW with the required methods was not found") endif() endif() From 614a7c20813b8fdc637d2d97d8771c6026e6b1ba Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 7 Sep 2013 01:27:17 +0000 Subject: [PATCH 084/267] [ARM] Clean up some host side register allocations I missed. --- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 2 -- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp | 3 --- 2 files changed, 5 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 2295809b3f..36ba7054e5 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -58,12 +58,10 @@ void JitArm::fnabsx(UGeckoInstruction inst) ARMReg vB = fpr.R0(inst.FB); ARMReg vD = fpr.R0(inst.FD, false); - ARMReg V0 = fpr.GetReg(); VABS(vD, vB); VNEG(vD, vD); - fpr.Unlock(V0); if (inst.Rc) Helper_UpdateCR1(vD); } diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index a5f7d1a1de..8a0f09f463 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -353,12 +353,9 @@ void JitArm::ps_nabs(UGeckoInstruction inst) ARMReg vB1 = fpr.R1(b); ARMReg vD0 = fpr.R0(d, false); ARMReg vD1 = fpr.R1(d, false); - ARMReg V0 = fpr.GetReg(); VABS(vD0, vB0); VNEG(vD0, vD0); VABS(vD1, vB1); VNEG(vD1, vD1); - - fpr.Unlock(V0); } From 31b69c53f75e2194020c2370a3fd56ec9810fee3 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 7 Sep 2013 17:44:00 +0000 Subject: [PATCH 085/267] [ARM] Implement psq_l for 2x float loads. Couldn't find a game using quantized loads. Huge speed boost to Ikaruga and THP movies with this one. --- Source/Core/Core/CMakeLists.txt | 1 + Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 3 + .../JitArm32/JitArm_LoadStorePaired.cpp | 59 ++++++++++++ .../JitArm32/JitArm_SystemRegisters.cpp | 19 +--- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- .../Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp | 91 +++++++++++++------ 6 files changed, 129 insertions(+), 46 deletions(-) create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 072edded23..8989dcfcc5 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -215,6 +215,7 @@ if(_M_ARM) Src/PowerPC/JitArm32/JitArm_LoadStore.cpp Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp Src/PowerPC/JitArm32/JitArm_Paired.cpp + Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp) endif() diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 072a6d40fa..5d5d2dd19b 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -218,6 +218,9 @@ public: void ps_neg(UGeckoInstruction _inst); void ps_abs(UGeckoInstruction _inst); void ps_nabs(UGeckoInstruction _inst); + + // LoadStore paired + void psq_l(UGeckoInstruction _inst); }; #endif // _JIT64_H diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp new file mode 100644 index 0000000000..5e2cc1f876 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp @@ -0,0 +1,59 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" + +void JitArm::psq_l(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStorePairedOff) + + bool update = inst.OPCD == 57; + s32 offset = inst.SIMM_12; + + // R12 contains scale + // R11 contains type + // R10 is the ADDR + + if (js.memcheck) { Default(inst); return; } + + if (inst.W) { + // Enable when supporting single loads + Default(inst); + return; + } + + LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I])); + //UBFX(R12, R11, 2, 6); // Scale + UBFX(R11, R11, 13, 3); // Type + + MOVI2R(R10, (u32)offset); + if (inst.RA) + ADD(R10, R10, gpr.R(inst.RA)); + if (update) + MOV(gpr.R(inst.RA), R10); + if (inst.W) + ADD(R11, R11, 8); + MOVI2R(R14, (u32)asm_routines.pairedLoadQuantized); + ADD(R14, R14, R11); + LDR(R14, R14); + + // Values returned in S0, S1 + BL(R14); // Jump to the quantizer Load + + ARMReg vD0 = fpr.R0(inst.RS, false); + ARMReg vD1 = fpr.R1(inst.RS, false); + VCVT(vD0, S0, 0); + VCVT(vD1, S1, 0); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index e1f27560a3..f3ab4f695b 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -39,9 +39,6 @@ void JitArm::mtspr(UGeckoInstruction inst) case SPR_LR: case SPR_CTR: case SPR_XER: - // These are safe to do the easy way, see the bottom of this function. - break; - case SPR_GQR0: case SPR_GQR0 + 1: case SPR_GQR0 + 2: @@ -50,19 +47,9 @@ void JitArm::mtspr(UGeckoInstruction inst) case SPR_GQR0 + 5: case SPR_GQR0 + 6: case SPR_GQR0 + 7: - // Prevent recompiler from compiling in old quantizer values. - // If the value changed, destroy all blocks using this quantizer - // This will create a little bit of block churn, but hopefully not too bad. - { - /* - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[iIndex])); // Load old value - CMP(32, R(EAX), gpr.R(inst.RD)); - FixupBranch skip_destroy = J_CC(CC_E, false); - int gqr = iIndex - SPR_GQR0; - ABI_CallFunctionC(ProtectFunction(&Jit64::DestroyBlocksWithFlag, 1), (u32)BLOCK_USE_GQR0 << gqr); - SetJumpTarget(skip_destroy);*/ - } - // TODO - break block if quantizers are written to. + // These are safe to do the easy way, see the bottom of this function. + break; + default: Default(inst); return; diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 4a1aa9d28f..23c5ab56a5 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -107,7 +107,7 @@ static GekkoOPTemplate primarytable[] = {54, &JitArm::Default}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, {55, &JitArm::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, - {56, &JitArm::Default}, //"psq_l", OPTYPE_PS, FL_IN_A}}, + {56, &JitArm::psq_l}, //"psq_l", OPTYPE_PS, FL_IN_A}}, {57, &JitArm::Default}, //"psq_lu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, {60, &JitArm::Default}, //"psq_st", OPTYPE_PS, FL_IN_A}}, {61, &JitArm::Default}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp index 0c3a73c38e..6cf761c949 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp @@ -137,40 +137,73 @@ void JitArmAsmRoutineManager::Generate() ADD(_SP, _SP, 4); POP(9, R4, R5, R6, R7, R8, R9, R10, R11, _PC); // Returns + + GenerateCommon(); + FlushIcache(); } void JitArmAsmRoutineManager::GenerateCommon() { -/* fifoDirectWrite8 = AlignCode4(); - GenFifoWrite(8); - fifoDirectWrite16 = AlignCode4(); - GenFifoWrite(16); - fifoDirectWrite32 = AlignCode4(); - GenFifoWrite(32); - fifoDirectWriteFloat = AlignCode4(); - GenFifoFloatWrite(); - fifoDirectWriteXmm64 = AlignCode4(); - GenFifoXmm64Write(); + const u8* loadPairedIllegal = GetCodePtr(); + BKPT(0x10); - GenQuantizedLoads(); - GenQuantizedStores(); - GenQuantizedSingleStores(); -*/ - //CMPSD(R(XMM0), M(&zero), - // TODO + const u8* loadPairedFloatTwo = GetCodePtr(); + PUSH(2, R12, _LR); + // R12, R14 is scratch + // R10 is the address + MOVI2R(R14, Memory::MEMVIEW32_MASK); + AND(R10, R10, R14); + MOVI2R(R14, (u32)Memory::base); + ADD(R10, R10, R14); + + LDR(R12, R10); + REV(R12, R12); + VMOV(S0, R12); + + LDR(R12, R10, 4); + REV(R12, R12); + VMOV(S1, R12); + + POP(2, R12, _PC); + const u8* loadPairedFloatOne = GetCodePtr(); + BKPT(0x12); + const u8* loadPairedU8Two = GetCodePtr(); + BKPT(0x13); + const u8* loadPairedU8One = GetCodePtr(); + BKPT(0x14); + const u8* loadPairedS8Two = GetCodePtr(); + BKPT(0x15); + const u8* loadPairedS8One = GetCodePtr(); + BKPT(0x16); + const u8* loadPairedU16Two = GetCodePtr(); + BKPT(0x17); + const u8* loadPairedU16One = GetCodePtr(); + BKPT(0x18); + const u8* loadPairedS16Two = GetCodePtr(); + BKPT(0x19); + const u8* loadPairedS16One = GetCodePtr(); + BKPT(0x20); + + pairedLoadQuantized = reinterpret_cast(const_cast(AlignCode16())); + ReserveCodeSpace(16 * sizeof(u8*)); + + pairedLoadQuantized[0] = loadPairedFloatTwo; + pairedLoadQuantized[1] = loadPairedIllegal; + pairedLoadQuantized[2] = loadPairedIllegal; + pairedLoadQuantized[3] = loadPairedIllegal; + pairedLoadQuantized[4] = loadPairedU8Two; + pairedLoadQuantized[5] = loadPairedU16Two; + pairedLoadQuantized[6] = loadPairedS8Two; + pairedLoadQuantized[7] = loadPairedS16Two; + + pairedLoadQuantized[8] = loadPairedFloatOne; + pairedLoadQuantized[9] = loadPairedIllegal; + pairedLoadQuantized[10] = loadPairedIllegal; + pairedLoadQuantized[11] = loadPairedIllegal; + pairedLoadQuantized[12] = loadPairedU8One; + pairedLoadQuantized[13] = loadPairedU16One; + pairedLoadQuantized[14] = loadPairedS8One; + pairedLoadQuantized[15] = loadPairedS16One; - // Fast write routines - special case the most common hardware write - // TODO: use this. - // Even in x86, the param values will be in the right registers. - /* - const u8 *fastMemWrite8 = AlignCode16(); - CMP(32, R(ABI_PARAM2), Imm32(0xCC008000)); - FixupBranch skip_fast_write = J_CC(CC_NE, false); - MOV(32, EAX, M(&m_gatherPipeCount)); - MOV(8, MDisp(EAX, (u32)&m_gatherPipe), ABI_PARAM1); - ADD(32, 1, M(&m_gatherPipeCount)); - RET(); - SetJumpTarget(skip_fast_write); - CALL((void *)&Memory::Write_U8);*/ } From f4586570acba4a02750718caa4482d9034479397 Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 7 Sep 2013 15:43:17 -0400 Subject: [PATCH 086/267] Use SetEvent instead of CancelIoEx for XP compatibility. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 206c11ab64..91bd1bec6c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -560,7 +560,7 @@ bool Wiimote::IsConnected() const void _IOWakeup(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read) { - CancelIoEx(dev_handle, &hid_overlap_read); + SetEvent(hid_overlap_read.hEvent); } // positive = read packet @@ -582,26 +582,22 @@ int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index if (ERROR_IO_PENDING == read_err) { auto const wait_result = WaitForSingleObject(hid_overlap_read.hEvent, INFINITE); - if (WAIT_TIMEOUT == wait_result) - { - CancelIo(dev_handle); - } - else if (WAIT_FAILED == wait_result) + + // In case the event was signalled by _IOWakeup before the read completed, cancel it. + CancelIo(dev_handle); + + if (WAIT_FAILED == wait_result) { WARN_LOG(WIIMOTE, "A wait error occurred on reading from Wiimote %i.", index + 1); - CancelIo(dev_handle); } - if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, TRUE)) + if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, FALSE)) { auto const overlapped_err = GetLastError(); if (ERROR_OPERATION_ABORTED == overlapped_err) { - /* - if (buf[1] != 0) - WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem."); - */ + // It was. return -1; } From b31502893fc074a566358f9f84f6b432a7a6502b Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 7 Sep 2013 16:13:39 -0400 Subject: [PATCH 087/267] Fix lifetime issues in IOWakeup. --- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 22 +++++++++++++ Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 27 ++++++++++------ .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 24 +++++++++++++- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 31 ++----------------- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 3 ++ 5 files changed, 69 insertions(+), 38 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 826b9e67ce..f06bec2dde 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -133,6 +133,28 @@ void WiimoteScanner::FindWiimotes(std::vector & found_wiimotes, Wiimot } +void Wiimote::InitInternal() +{ + cmd_sock = -1; + int_sock = -1; + + int fds[2]; + if (pipe(fds)) + { + ERROR_LOG(WIIMOTE, "pipe failed"); + abort(); + } + wakeup_pipe_w = fds[1]; + wakeup_pipe_r = fds[0]; + bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; +} + +void Wiimote::TeardownInternal() +{ + close(wakeup_pipe_w); + close(wakeup_pipe_r); +} + // Connect to a wiimote with a known address. bool Wiimote::ConnectInternal() { diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 91bd1bec6c..58ebfbfa64 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -514,12 +514,6 @@ bool Wiimote::ConnectInternal() } #endif - hid_overlap_read = OVERLAPPED(); - hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL); - - hid_overlap_write = OVERLAPPED(); - hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL); - // TODO: thread isn't started here now, do this elsewhere // This isn't as drastic as it sounds, since the process in which the threads // reside is normal priority. Needed for keeping audio reports at a decent rate @@ -544,15 +538,30 @@ void Wiimote::DisconnectInternal() CloseHandle(dev_handle); dev_handle = 0; - CloseHandle(hid_overlap_read.hEvent); - CloseHandle(hid_overlap_write.hEvent); - #ifdef SHARE_WRITE_WIIMOTES std::lock_guard lk(g_connected_wiimotes_lock); g_connected_wiimotes.erase(devicepath); #endif } +void Wiimote::InitInternal() +{ + dev_handle = 0; + stack = MSBT_STACK_UNKNOWN; + + hid_overlap_read = OVERLAPPED(); + hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL); + + hid_overlap_write = OVERLAPPED(); + hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL); +} + +void Wiimote::TeardownInternal() +{ + CloseHandle(hid_overlap_read.hEvent); + CloseHandle(hid_overlap_write.hEvent); +} + bool Wiimote::IsConnected() const { return dev_handle != 0; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 0583cbf94c..e7e9033338 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -188,6 +188,22 @@ bool WiimoteScanner::IsReady() const return true; } +void Wiimote::InitInternal() +{ + inputlen = 0; + m_connected = false; + m_wiimote_thread_run_loop = NULL; +} + +void Wiimote::TeardownInternal() +{ + if (m_wiimote_thread_run_loop) + { + CFRelease(m_wiimote_thread_run_loop); + m_wiimote_thread_run_loop = NULL; + } +} + // Connect to a wiimote with a known address. bool Wiimote::ConnectInternal() { @@ -226,6 +242,9 @@ bool Wiimote::ConnectInternal() m_connected = true; [cbt release]; + + m_wiimote_thread_run_loop = (CFRunLoopRef) CFRetain(CFRunLoopGetCurrent()); + return true; } @@ -259,7 +278,10 @@ bool Wiimote::IsConnected() const void Wiimote::IOWakeup() { - CFRunLoopStop(m_wiimote_thread_run_loop); + if (m_wiimote_thread_run_loop) + { + CFRunLoopStop(m_wiimote_thread_run_loop); + } } int Wiimote::IORead(unsigned char *buf) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 77f84449be..ee6de5f19d 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -39,29 +39,12 @@ WiimoteScanner g_wiimote_scanner; Wiimote::Wiimote() : index() -#ifdef __APPLE__ - , btd(), ichan(), cchan(), input(), inputlen(), m_connected() -#elif defined(__linux__) && HAVE_BLUEZ - , cmd_sock(-1), int_sock(-1) -#elif defined(_WIN32) - , dev_handle(0), stack(MSBT_STACK_UNKNOWN) -#endif , m_last_input_report() , m_channel(0) , m_rumble_state() , m_need_prepare() { -#if defined(__linux__) && HAVE_BLUEZ - int fds[2]; - if (pipe(fds)) - { - ERROR_LOG(WIIMOTE, "pipe failed"); - abort(); - } - wakeup_pipe_w = fds[1]; - wakeup_pipe_r = fds[0]; - bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; -#endif + InitInternal(); } Wiimote::~Wiimote() @@ -69,10 +52,7 @@ Wiimote::~Wiimote() StopThread(); ClearReadQueue(); m_write_reports.Clear(); -#if defined(__linux__) && HAVE_BLUEZ - close(wakeup_pipe_w); - close(wakeup_pipe_r); -#endif + TeardownInternal(); } // to be called from CPU thread @@ -514,8 +494,6 @@ void Wiimote::StopThread() if (m_wiimote_thread.joinable()) m_wiimote_thread.join(); #if defined(__APPLE__) - CFRelease(m_wiimote_thread_run_loop); - m_wiimote_thread_run_loop = NULL; #endif } @@ -543,9 +521,6 @@ void Wiimote::WaitReady() void Wiimote::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Device Thread"); -#if defined(__APPLE__) - m_wiimote_thread_run_loop = (CFRunLoopRef) CFRetain(CFRunLoopGetCurrent()); -#endif bool ok = ConnectInternal(); @@ -565,7 +540,7 @@ void Wiimote::ThreadFunc() if (!PrepareOnThread()) { ERROR_LOG(WIIMOTE, "Wiimote::PrepareOnThread failed. Disconnecting Wiimote %d.", index + 1); - DisconnectInternal(); + break; } } Write(); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index fa94303a66..e4e965400c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -56,6 +56,9 @@ public: bool ConnectInternal(); void DisconnectInternal(); + void InitInternal(); + void TeardownInternal(); + bool Connect(); // TODO: change to something like IsRelevant From 8b4f0ef034f913f68155e37bbdef1b876c4d8504 Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 7 Sep 2013 16:17:00 -0400 Subject: [PATCH 088/267] IODummy needs it too. --- Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index e1ca6d603c..ada6237756 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -43,6 +43,12 @@ bool WiimoteScanner::IsReady() const return false; } +void Wiimote::InitInternal() +{} + +void Wiimote::TeardownInternal() +{} + bool Wiimote::ConnectInternal() { return 0; From 913853d4415ac5c660112edce64891d4920b7b5b Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 7 Sep 2013 15:57:32 -0500 Subject: [PATCH 089/267] Move the creation of the GLInterface (and hence the video backend window) from VideoPrepare to Initialize in the software plugin (as in the GL plugin). This fixes issue 6564. It also makes the emulator show up positioned correctly in the dolphin application window when using render to main. --- Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index c63ad2e446..7fd384afa3 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -39,7 +39,6 @@ namespace SW static volatile bool fifoStateRun = false; static volatile bool emuRunningState = false; static std::mutex m_csSWVidOccupied; -static void* m_windowhandle; std::string VideoSoftware::GetName() { @@ -64,7 +63,11 @@ bool VideoSoftware::Initialize(void *&window_handle) g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); InitInterface(); - m_windowhandle = window_handle; + if (!GLInterface->Create(window_handle)) + { + INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); + return false; + } InitBPMemory(); InitXFMemory(); @@ -160,12 +163,6 @@ void VideoSoftware::Video_Cleanup() // This is called after Video_Initialize() from the Core void VideoSoftware::Video_Prepare() { - if (!GLInterface->Create(m_windowhandle)) - { - INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); - return; - } - GLInterface->MakeCurrent(); // Init extension support. #ifndef USE_GLES From cc054b9da3dd4627ec6a8e1869c2e07846d1f321 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 7 Sep 2013 18:51:15 -0400 Subject: [PATCH 090/267] [Android] Make the MotionAlertDialog private. This isn't needed to be protected anymore. The only reason it was protected was for when the input settings were coupled as all hell to the GameListActivity (lol). Also documented the interface method within it. --- .../dolphinemu/settings/InputConfigFragment.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java index 1436f4bdd7..26e89f412d 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java @@ -208,7 +208,7 @@ public final class InputConfigFragment extends PreferenceFragment * to be set anonymously, so the creation of an explicit class for * providing functionality is not necessary. */ - protected static final class MotionAlertDialog extends AlertDialog + private static final class MotionAlertDialog extends AlertDialog { private OnMotionEventListener motionListener; @@ -229,6 +229,13 @@ public final class InputConfigFragment extends PreferenceFragment */ public interface OnMotionEventListener { + /** + * Denotes the behavior that should happen when a motion event occurs. + * + * @param event Reference to the {@link MotionEvent} that occurred. + * + * @return true if the {@link MotionEvent} is consumed in this call; false otherwise. + */ boolean onMotion(MotionEvent event); } @@ -245,7 +252,7 @@ public final class InputConfigFragment extends PreferenceFragment @Override public boolean dispatchKeyEvent(KeyEvent event) { - if (this.onKeyDown(event.getKeyCode(), event)) + if (onKeyDown(event.getKeyCode(), event)) return true; return super.dispatchKeyEvent(event); From f753b9ae97544fb865169c5c79d7a52bc10d1bb0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 7 Sep 2013 19:19:28 -0400 Subject: [PATCH 091/267] [Android] Show the full text for save and load states if there's room on the screen. If not, let it overflow into a context menu. --- Source/Android/res/menu/emuwindow_overlay.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/res/menu/emuwindow_overlay.xml b/Source/Android/res/menu/emuwindow_overlay.xml index 837f8b23af..048e14b8fe 100644 --- a/Source/Android/res/menu/emuwindow_overlay.xml +++ b/Source/Android/res/menu/emuwindow_overlay.xml @@ -1,7 +1,7 @@ Date: Sun, 8 Sep 2013 01:32:58 +0200 Subject: [PATCH 092/267] Update Gameini ratings from the Wiki --- Data/User/GameConfig/GDIE7D.ini | 2 +- Data/User/GameConfig/GDIP7D.ini | 2 +- Data/User/GameConfig/GH5D52.ini | 2 +- Data/User/GameConfig/GH5E52.ini | 2 +- Data/User/GameConfig/GH5F52.ini | 2 +- Data/User/GameConfig/GH5P52.ini | 2 +- Data/User/GameConfig/GJUD78.ini | 2 +- Data/User/GameConfig/GJUE78.ini | 2 +- Data/User/GameConfig/GJUF78.ini | 2 +- Data/User/GameConfig/GMFS69.ini | 2 +- Data/User/GameConfig/GQSDAF.ini | 2 +- Data/User/GameConfig/GQSEAF.ini | 2 +- Data/User/GameConfig/GQSFAF.ini | 2 +- Data/User/GameConfig/GQSPAF.ini | 2 +- Data/User/GameConfig/GT3D52.ini | 2 +- Data/User/GameConfig/GT3E52.ini | 2 +- Data/User/GameConfig/GT3F52.ini | 2 +- Data/User/GameConfig/GT3P52.ini | 2 +- Data/User/GameConfig/NAAE01.ini | 2 +- Data/User/GameConfig/NAAP01.ini | 2 +- Data/User/GameConfig/R2KP54.ini | 2 +- Data/User/GameConfig/R6YEXS.ini | 2 +- Data/User/GameConfig/RCKPGN.ini | 2 +- Data/User/GameConfig/RF7J08.ini | 2 +- Data/User/GameConfig/RG5PWR.ini | 2 +- Data/User/GameConfig/RH2P41.ini | 2 +- Data/User/GameConfig/RLXEMJ.ini | 2 +- Data/User/GameConfig/RP7P52.ini | 2 +- Data/User/GameConfig/RS8J8N.ini | 2 +- Data/User/GameConfig/RYBE69.ini | 2 +- Data/User/GameConfig/SDNE41.ini | 2 +- Data/User/GameConfig/SDNP41.ini | 2 +- Data/User/GameConfig/SE2P69.ini | 2 +- Data/User/GameConfig/SEAE69.ini | 2 +- Data/User/GameConfig/SEAP69.ini | 2 +- Data/User/GameConfig/SJDE41.ini | 2 +- Data/User/GameConfig/SJDP41.ini | 2 +- Data/User/GameConfig/SJDY41.ini | 2 +- Data/User/GameConfig/SJDZ41.ini | 2 +- Data/User/GameConfig/SKJE78.ini | 2 +- Data/User/GameConfig/SS3EWR.ini | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Data/User/GameConfig/GDIE7D.ini b/Data/User/GameConfig/GDIE7D.ini index f3b13a5944..ec7059a0bd 100644 --- a/Data/User/GameConfig/GDIE7D.ini +++ b/Data/User/GameConfig/GDIE7D.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 3 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/GDIP7D.ini b/Data/User/GameConfig/GDIP7D.ini index fa48b8952f..8bf3c76095 100644 --- a/Data/User/GameConfig/GDIP7D.ini +++ b/Data/User/GameConfig/GDIP7D.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 3 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/GH5D52.ini b/Data/User/GameConfig/GH5D52.ini index f573b0530d..040418b60f 100644 --- a/Data/User/GameConfig/GH5D52.ini +++ b/Data/User/GameConfig/GH5D52.ini @@ -4,7 +4,7 @@ TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 3 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GH5E52.ini b/Data/User/GameConfig/GH5E52.ini index 1426bc6953..8cecf42e83 100644 --- a/Data/User/GameConfig/GH5E52.ini +++ b/Data/User/GameConfig/GH5E52.ini @@ -4,7 +4,7 @@ TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 3 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GH5F52.ini b/Data/User/GameConfig/GH5F52.ini index f4ad49a646..e7ccf2c149 100644 --- a/Data/User/GameConfig/GH5F52.ini +++ b/Data/User/GameConfig/GH5F52.ini @@ -4,7 +4,7 @@ TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 3 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GH5P52.ini b/Data/User/GameConfig/GH5P52.ini index 64efb53d59..0bf2929baa 100644 --- a/Data/User/GameConfig/GH5P52.ini +++ b/Data/User/GameConfig/GH5P52.ini @@ -4,7 +4,7 @@ TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 3 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GJUD78.ini b/Data/User/GameConfig/GJUD78.ini index d93c274449..71c381085a 100644 --- a/Data/User/GameConfig/GJUD78.ini +++ b/Data/User/GameConfig/GJUD78.ini @@ -7,7 +7,7 @@ TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = -EmulationStateId = 4 +EmulationStateId = 5 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GJUE78.ini b/Data/User/GameConfig/GJUE78.ini index 2e9b394820..6137cedc34 100644 --- a/Data/User/GameConfig/GJUE78.ini +++ b/Data/User/GameConfig/GJUE78.ini @@ -7,7 +7,7 @@ TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = -EmulationStateId = 4 +EmulationStateId = 5 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GJUF78.ini b/Data/User/GameConfig/GJUF78.ini index bc0b5dcede..449145b2ae 100644 --- a/Data/User/GameConfig/GJUF78.ini +++ b/Data/User/GameConfig/GJUF78.ini @@ -7,7 +7,7 @@ TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = -EmulationStateId = 4 +EmulationStateId = 5 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GMFS69.ini b/Data/User/GameConfig/GMFS69.ini index a0eda03ad6..df3367edb7 100644 --- a/Data/User/GameConfig/GMFS69.ini +++ b/Data/User/GameConfig/GMFS69.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/GQSDAF.ini b/Data/User/GameConfig/GQSDAF.ini index 933b8eeae1..d5a88fd3c5 100644 --- a/Data/User/GameConfig/GQSDAF.ini +++ b/Data/User/GameConfig/GQSDAF.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/User/GameConfig/GQSEAF.ini index 157c0cac65..2f9393b87d 100644 --- a/Data/User/GameConfig/GQSEAF.ini +++ b/Data/User/GameConfig/GQSEAF.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 # Action Replay Notes # * * * * * NOTES ON EQUIPMENT MODIFIERS BEFORE USING THOSE CODES * * * * diff --git a/Data/User/GameConfig/GQSFAF.ini b/Data/User/GameConfig/GQSFAF.ini index a613603ef3..211493d604 100644 --- a/Data/User/GameConfig/GQSFAF.ini +++ b/Data/User/GameConfig/GQSFAF.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/GQSPAF.ini b/Data/User/GameConfig/GQSPAF.ini index 7ae944b7ed..a7e8da41e6 100644 --- a/Data/User/GameConfig/GQSPAF.ini +++ b/Data/User/GameConfig/GQSPAF.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/GT3D52.ini b/Data/User/GameConfig/GT3D52.ini index a62f31171d..906554193b 100644 --- a/Data/User/GameConfig/GT3D52.ini +++ b/Data/User/GameConfig/GT3D52.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 +EmulationStateId = 4 EmulationIssues = Needs real xfb for videos to display. [OnLoad] diff --git a/Data/User/GameConfig/GT3E52.ini b/Data/User/GameConfig/GT3E52.ini index cdc563be6d..c002087035 100644 --- a/Data/User/GameConfig/GT3E52.ini +++ b/Data/User/GameConfig/GT3E52.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 +EmulationStateId = 4 EmulationIssues = Needs real xfb for videos to display. [OnLoad] diff --git a/Data/User/GameConfig/GT3F52.ini b/Data/User/GameConfig/GT3F52.ini index 80865ad41f..7ea73148e6 100644 --- a/Data/User/GameConfig/GT3F52.ini +++ b/Data/User/GameConfig/GT3F52.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 +EmulationStateId = 4 EmulationIssues = Needs real xfb for videos to display. [OnLoad] diff --git a/Data/User/GameConfig/GT3P52.ini b/Data/User/GameConfig/GT3P52.ini index d75ac6dc54..c2d4525c27 100644 --- a/Data/User/GameConfig/GT3P52.ini +++ b/Data/User/GameConfig/GT3P52.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 +EmulationStateId = 4 EmulationIssues = Needs real xfb for videos to display. [OnLoad] diff --git a/Data/User/GameConfig/NAAE01.ini b/Data/User/GameConfig/NAAE01.ini index c43331853c..9e8f4f0e9e 100644 --- a/Data/User/GameConfig/NAAE01.ini +++ b/Data/User/GameConfig/NAAE01.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = -EmulationStateId = 4 +EmulationStateId = 5 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/NAAP01.ini b/Data/User/GameConfig/NAAP01.ini index a5d903ce22..f06df82356 100644 --- a/Data/User/GameConfig/NAAP01.ini +++ b/Data/User/GameConfig/NAAP01.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = Slow and no sound [OnLoad] diff --git a/Data/User/GameConfig/R2KP54.ini b/Data/User/GameConfig/R2KP54.ini index e7db763b7f..25fc319487 100644 --- a/Data/User/GameConfig/R2KP54.ini +++ b/Data/User/GameConfig/R2KP54.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/R6YEXS.ini b/Data/User/GameConfig/R6YEXS.ini index 4f5c7fa17b..6001933724 100644 --- a/Data/User/GameConfig/R6YEXS.ini +++ b/Data/User/GameConfig/R6YEXS.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = -EmulationStateId = 0 +EmulationStateId = 4 [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/RCKPGN.ini b/Data/User/GameConfig/RCKPGN.ini index ac664e308a..03354b7c8f 100644 --- a/Data/User/GameConfig/RCKPGN.ini +++ b/Data/User/GameConfig/RCKPGN.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/RF7J08.ini b/Data/User/GameConfig/RF7J08.ini index 64297e6f54..0e23a0ed09 100644 --- a/Data/User/GameConfig/RF7J08.ini +++ b/Data/User/GameConfig/RF7J08.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/RG5PWR.ini b/Data/User/GameConfig/RG5PWR.ini index 8d725f8c7f..be25d1340a 100644 --- a/Data/User/GameConfig/RG5PWR.ini +++ b/Data/User/GameConfig/RG5PWR.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 Issues="Need Projection before 945 - be activated" [OnLoad] diff --git a/Data/User/GameConfig/RH2P41.ini b/Data/User/GameConfig/RH2P41.ini index 4dd22011be..ad1ff1c09d 100644 --- a/Data/User/GameConfig/RH2P41.ini +++ b/Data/User/GameConfig/RH2P41.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/RLXEMJ.ini b/Data/User/GameConfig/RLXEMJ.ini index f2220596ca..fbfeda997a 100644 --- a/Data/User/GameConfig/RLXEMJ.ini +++ b/Data/User/GameConfig/RLXEMJ.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/RP7P52.ini b/Data/User/GameConfig/RP7P52.ini index f134514dc2..0cf53a3d30 100644 --- a/Data/User/GameConfig/RP7P52.ini +++ b/Data/User/GameConfig/RP7P52.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/RS8J8N.ini b/Data/User/GameConfig/RS8J8N.ini index 526b238dfb..0f0712d348 100644 --- a/Data/User/GameConfig/RS8J8N.ini +++ b/Data/User/GameConfig/RS8J8N.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/RYBE69.ini b/Data/User/GameConfig/RYBE69.ini index 0bfb0965a9..62fced03d9 100644 --- a/Data/User/GameConfig/RYBE69.ini +++ b/Data/User/GameConfig/RYBE69.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 3 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/SDNE41.ini b/Data/User/GameConfig/SDNE41.ini index 39bfdf590e..500f76a985 100644 --- a/Data/User/GameConfig/SDNE41.ini +++ b/Data/User/GameConfig/SDNE41.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/SDNP41.ini b/Data/User/GameConfig/SDNP41.ini index b4bedcf9b8..8d143dc9c8 100644 --- a/Data/User/GameConfig/SDNP41.ini +++ b/Data/User/GameConfig/SDNP41.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/SE2P69.ini b/Data/User/GameConfig/SE2P69.ini index 48f4bd8973..50ac7050a1 100644 --- a/Data/User/GameConfig/SE2P69.ini +++ b/Data/User/GameConfig/SE2P69.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +EmulationStateId = 3 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/SEAE69.ini b/Data/User/GameConfig/SEAE69.ini index 84889555f0..e8ec4c4a39 100644 --- a/Data/User/GameConfig/SEAE69.ini +++ b/Data/User/GameConfig/SEAE69.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +EmulationStateId = 3 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/SEAP69.ini b/Data/User/GameConfig/SEAP69.ini index ef8416cc24..918b2cd492 100644 --- a/Data/User/GameConfig/SEAP69.ini +++ b/Data/User/GameConfig/SEAP69.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +EmulationStateId = 3 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/SJDE41.ini b/Data/User/GameConfig/SJDE41.ini index 0649746328..569690830e 100644 --- a/Data/User/GameConfig/SJDE41.ini +++ b/Data/User/GameConfig/SJDE41.ini @@ -3,7 +3,7 @@ # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/SJDP41.ini b/Data/User/GameConfig/SJDP41.ini index 56e57306c2..cfe8d58c98 100644 --- a/Data/User/GameConfig/SJDP41.ini +++ b/Data/User/GameConfig/SJDP41.ini @@ -3,7 +3,7 @@ # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/SJDY41.ini b/Data/User/GameConfig/SJDY41.ini index 7fd447165a..df5b7b8fc4 100644 --- a/Data/User/GameConfig/SJDY41.ini +++ b/Data/User/GameConfig/SJDY41.ini @@ -3,7 +3,7 @@ # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/SJDZ41.ini b/Data/User/GameConfig/SJDZ41.ini index 78b32d4e92..2c36d68645 100644 --- a/Data/User/GameConfig/SJDZ41.ini +++ b/Data/User/GameConfig/SJDZ41.ini @@ -3,7 +3,7 @@ # Values set here will override the main dolphin settings. [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/User/GameConfig/SKJE78.ini b/Data/User/GameConfig/SKJE78.ini index a1207608c2..af151003cb 100644 --- a/Data/User/GameConfig/SKJE78.ini +++ b/Data/User/GameConfig/SKJE78.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 EmulationIssues = [OnLoad] diff --git a/Data/User/GameConfig/SS3EWR.ini b/Data/User/GameConfig/SS3EWR.ini index 4a382202b3..cf68da8a67 100644 --- a/Data/User/GameConfig/SS3EWR.ini +++ b/Data/User/GameConfig/SS3EWR.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 +EmulationStateId = 4 EmulationIssues = [OnLoad] From e6af4970d8bfadd2ad72e69bd80e6fec6463e7a7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 8 Sep 2013 07:07:06 +0000 Subject: [PATCH 093/267] [ARM] Use NEON for loading the values from psq_l, gives a minimal performance increase. This change also begins a new NEONXEmitter for having cleaner support for NEON. --- Source/Core/Common/Src/ArmEmitter.cpp | 144 ++++++++++++------ Source/Core/Common/Src/ArmEmitter.h | 73 +++++++-- Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp | 3 +- .../Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp | 10 +- 4 files changed, 162 insertions(+), 68 deletions(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index fd62b0b2c9..e0f02244a8 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -892,54 +892,6 @@ ARMReg ARMXEmitter::SubBase(ARMReg Reg) return Reg; } -// NEON Specific -void ARMXEmitter::VABD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) -{ - _dbg_assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VABD(float)"); - _dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VABD(float) when CPU doesn't support it"); - bool register_quad = Vd >= Q0; - - // Gets encoded as a double register - Vd = SubBase(Vd); - Vn = SubBase(Vn); - Vm = SubBase(Vm); - - Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ - | ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \ - | ((Vm & 0x10) << 2) | (Vm & 0xF)); -} -void ARMXEmitter::VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) -{ - _dbg_assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VADD(integer)"); - _dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VADD(integer) when CPU doesn't support it"); - - bool register_quad = Vd >= Q0; - - // Gets encoded as a double register - Vd = SubBase(Vd); - Vn = SubBase(Vn); - Vm = SubBase(Vm); - - Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ - | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \ - | ((Vm & 0x10) << 1) | (Vm & 0xF)); - -} -void ARMXEmitter::VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) -{ - _dbg_assert_msg_(DYNA_REC, Vd >= Q0, "Pass invalid register to VSUB(integer)"); - _dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VSUB(integer) when CPU doesn't support it"); - - // Gets encoded as a double register - Vd = SubBase(Vd); - Vn = SubBase(Vn); - Vm = SubBase(Vm); - - Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ - | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (1 << 6) \ - | ((Vm & 0x10) << 2) | (Vm & 0xF)); -} - // Double/single, Neon extern const VFPEnc VFPOps[16][2] = { {{0xE0, 0xA0}, {0x20, 0xD1}}, // 0: VMLA @@ -1269,4 +1221,100 @@ void ARMXEmitter::VCVT(ARMReg Dest, ARMReg Source, int flags) } } +void NEONXEmitter::VABD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _dbg_assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VABD(float)"); + _dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VABD(float) when CPU doesn't support it"); + bool register_quad = Vd >= Q0; + + // Gets encoded as a double register + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \ + | ((Vm & 0x10) << 2) | (Vm & 0xF)); } +void NEONXEmitter::VADD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _dbg_assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VADD(integer)"); + _dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VADD(integer) when CPU doesn't support it"); + + bool register_quad = Vd >= Q0; + + // Gets encoded as a double register + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \ + | ((Vm & 0x10) << 1) | (Vm & 0xF)); + +} +void NEONXEmitter::VSUB(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _dbg_assert_msg_(DYNA_REC, Vd >= Q0, "Pass invalid register to VSUB(integer)"); + _dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VSUB(integer) when CPU doesn't support it"); + + // Gets encoded as a double register + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (1 << 6) \ + | ((Vm & 0x10) << 2) | (Vm & 0xF)); +} + +void NEONXEmitter::VLD1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align, ARMReg Rm) +{ + u32 spacing = 0x7; // Only support loading to 1 reg + // Gets encoded as a double register + Vd = SubBase(Vd); + + Write32((0xF4 << 24) | ((Vd & 0x10) << 18) | (1 << 21) | (Rn << 16) + | ((Vd & 0xF) << 12) | (spacing << 8) | (encodedSize(Size) << 6) + | (align << 4) | Rm); +} + +void NEONXEmitter::VLD2(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align, ARMReg Rm) +{ + u32 spacing = 0x8; // Single spaced registers + // Gets encoded as a double register + Vd = SubBase(Vd); + + Write32((0xF4 << 24) | ((Vd & 0x10) << 18) | (1 << 21) | (Rn << 16) + | ((Vd & 0xF) << 12) | (spacing << 8) | (encodedSize(Size) << 6) + | (align << 4) | Rm); +} + +void NEONXEmitter::VREVX(u32 size, NEONElementType Size, ARMReg Vd, ARMReg Vm) +{ + bool register_quad = Vd >= Q0; + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + Write32((0xF3 << 24) | (1 << 23) | ((Vd & 0x10) << 18) | (0x3 << 20) + | (encodedSize(Size) << 18) | ((Vd & 0xF) << 12) | (size << 7) + | (register_quad << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); +} + +void NEONXEmitter::VREV64(NEONElementType Size, ARMReg Vd, ARMReg Vm) +{ + VREVX(2, Size, Vd, Vm); +} + +void NEONXEmitter::VREV32(NEONElementType Size, ARMReg Vd, ARMReg Vm) +{ + VREVX(1, Size, Vd, Vm); +} + +void NEONXEmitter::VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm) +{ + VREVX(0, Size, Vd, Vm); +} + +} + diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h index 1592da7d4f..79121e832a 100644 --- a/Source/Core/Common/Src/ArmEmitter.h +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -104,13 +104,6 @@ enum ShiftType ST_ROR = 3, ST_RRX = 4 }; -enum IntegerSize -{ - I_I8 = 0, - I_I16, - I_I32, - I_I64 -}; enum { @@ -349,6 +342,7 @@ typedef const u8* JumpTarget; class ARMXEmitter { friend struct OpArg; // for Write8 etc + friend class NEONXEmitter; private: u8 *code, *startcode; u8 *lastCacheFlushEnd; @@ -533,11 +527,7 @@ public: // Subtracts the base from the register to give us the real one ARMReg SubBase(ARMReg Reg); - // NEON Only - void VABD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); - void VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); - void VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); - + // VFP Only void VLDR(ARMReg Dest, ARMReg Base, s16 offset); void VSTR(ARMReg Src, ARMReg Base, s16 offset); @@ -584,6 +574,65 @@ public: }; // class ARMXEmitter +enum NEONElementType +{ + I_8 = (1 << 0), + I_16 = (1 << 1), + I_32 = (1 << 2), + I_64 = (1 << 3), + I_SIGNED = (1 << 4), + I_UNSIGNED = (1 << 5), + F_32 = (1 << 6) +}; + +enum NEONAlignment +{ + ALIGN_NONE = 0, + ALIGN_64 = 1, + ALIGN_128 = 2, + ALIGN_256 = 3 +}; + + +class NEONXEmitter +{ +private: + ARMXEmitter *_emit; + ARMReg SubBase(ARMReg Reg) { return _emit->SubBase(Reg); } + inline void Write32(u32 value) { _emit->Write32(value); } + + inline u32 encodedSize(u32 value) + { + if (value & I_8) + return 0; + else if (value & I_16) + return 1; + else if (value & I_32) + return 2; + else if (value & I_64) + return 3; + else + _dbg_assert_msg_(DYNA_REC, false, "Passed invalid size to integer NEON instruction"); + return 0; + } + + void VREVX(u32 size, NEONElementType Size, ARMReg Vd, ARMReg Vm); + +public: + NEONXEmitter(ARMXEmitter *emit) + : _emit(emit) + {} + + void VABD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VADD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VSUB(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VREV64(NEONElementType Size, ARMReg Vd, ARMReg Vm); + void VREV32(NEONElementType Size, ARMReg Vd, ARMReg Vm); + void VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm); + + void VLD1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); + void VLD2(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); +}; // Everything that needs to generate X86 code should inherit from this. // You get memory management for free, plus, you can use all the MOV etc functions without diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp index 83609af768..8b11840682 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp @@ -467,7 +467,8 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo MOVI2R(RB, (u32)&One); VLDR(VA, RA, 0); VLDR(VB, RB, 0); - VADD(I_I64, VA, VA, VB); + NEONXEmitter nemit(this); + nemit.VADD(I_64, VA, VA, VB); VSTR(VA, RA, 0); gpr.Unlock(RA, RB); fpr.Unlock(VA); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp index 6cf761c949..ca9073887f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp @@ -157,13 +157,9 @@ void JitArmAsmRoutineManager::GenerateCommon() MOVI2R(R14, (u32)Memory::base); ADD(R10, R10, R14); - LDR(R12, R10); - REV(R12, R12); - VMOV(S0, R12); - - LDR(R12, R10, 4); - REV(R12, R12); - VMOV(S1, R12); + NEONXEmitter nemit(this); + nemit.VLD1(I_32, D0, R10); + nemit.VREV32(I_8, D0, D0); POP(2, R12, _PC); const u8* loadPairedFloatOne = GetCodePtr(); From 53fb0622f0c9ca4d40a5fe3442b5e4e635ede1ef Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 8 Sep 2013 07:21:33 +0000 Subject: [PATCH 094/267] Fix the glew check. GLES3 can be used on non-Android platforms. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48504d66af..73db7846fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -644,7 +644,7 @@ if(WIN32) find_library(GLEW glew32s PATHS Externals/GLew) include_directories(Externals/GLew/include) else() - if(NOT ANDROID) + if(NOT USE_GLES3) if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(FindGLEW) endif() From 2126f405e09aaeef537492b95d618fada85442d0 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 8 Sep 2013 07:25:59 +0000 Subject: [PATCH 095/267] [ARM] 1 instruction optimization for psq_l --- Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp index ca9073887f..973b7659de 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp @@ -152,8 +152,8 @@ void JitArmAsmRoutineManager::GenerateCommon() PUSH(2, R12, _LR); // R12, R14 is scratch // R10 is the address - MOVI2R(R14, Memory::MEMVIEW32_MASK); - AND(R10, R10, R14); + Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) + BIC(R10, R10, mask); MOVI2R(R14, (u32)Memory::base); ADD(R10, R10, R14); From e5b5713d7059f52326f45a42fcafbe15c2ae7edc Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 8 Sep 2013 07:37:03 +0000 Subject: [PATCH 096/267] [ARM] Optimize that fastmem load/stores minimally. --- .../Src/PowerPC/JitArm32/JitArm_BackPatch.cpp | 5 ++- .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 31 ++++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp index a8ea4d929a..d051dae726 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp @@ -96,7 +96,7 @@ const u8 *JitArm::BackPatch(u8 *codePtr, u32, void *ctx_void) if (Store) { - const u32 ARMREGOFFSET = 4 * 7; + const u32 ARMREGOFFSET = 4 * 5; ARMXEmitter emitter(codePtr - ARMREGOFFSET); switch (accessSize) { @@ -117,7 +117,6 @@ const u8 *JitArm::BackPatch(u8 *codePtr, u32, void *ctx_void) emitter.MOV(R1, R10); // Addr- 5 emitter.BL(R14); // 6 emitter.POP(4, R0, R1, R2, R3); // 7 - emitter.NOP(1); // 8 u32 newPC = ctx->reg_pc - (ARMREGOFFSET + 4 * 4); ctx->reg_pc = newPC; emitter.FlushIcache(); @@ -125,7 +124,7 @@ const u8 *JitArm::BackPatch(u8 *codePtr, u32, void *ctx_void) } else { - const u32 ARMREGOFFSET = 4 * 6; + const u32 ARMREGOFFSET = 4 * 4; ARMXEmitter emitter(codePtr - ARMREGOFFSET); switch (accessSize) { diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 391f7b0537..8a12976680 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -33,16 +33,15 @@ void JitArm::UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) { - // All this gets replaced on backpatch - MOVI2R(R14, Memory::MEMVIEW32_MASK, false); // 1-2 - AND(dest, dest, R14); // 3 - MOVI2R(R14, (u32)Memory::base, false); // 4-5 - ADD(dest, dest, R14); // 6 + Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) + BIC(dest, dest, mask); // 1 + MOVI2R(R14, (u32)Memory::base, false); // 2-3 + ADD(dest, dest, R14); // 4 switch (accessSize) { case 32: - REV(value, value); // 7 + REV(value, value); // 5 break; case 16: REV16(value, value); @@ -54,7 +53,7 @@ void JitArm::UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 o switch (accessSize) { case 32: - STR(value, dest); // 8 + STR(value, dest); // 6 break; case 16: STRH(value, dest); @@ -63,6 +62,7 @@ void JitArm::UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 o STRB(value, dest); break; } + NOP(1); // 7 } void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset, int accessSize, s32 offset) @@ -224,14 +224,14 @@ void JitArm::UnsafeLoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offse ADD(addr, addr, rA); // - 1 // All this gets replaced on backpatch - MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 2 - AND(addr, addr, rA); // 3 - MOVI2R(rA, (u32)Memory::base, false); // 5 - ADD(addr, addr, rA); // 6 + Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) + BIC(addr, addr, mask); // 1 + MOVI2R(rA, (u32)Memory::base, false); // 2-3 + ADD(addr, addr, rA); // 4 switch (accessSize) { case 32: - LDR(dest, addr); // 7 + LDR(dest, addr); // 5 break; case 16: LDRH(dest, addr); @@ -243,7 +243,7 @@ void JitArm::UnsafeLoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offse switch (accessSize) { case 32: - REV(dest, dest); // 9 + REV(dest, dest); // 6 break; case 16: REV16(dest, dest); @@ -253,6 +253,7 @@ void JitArm::UnsafeLoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offse break; } + NOP(2); // 7-8 gpr.Unlock(rA); } @@ -460,8 +461,8 @@ void JitArm::lmw(UGeckoInstruction inst) MOVI2R(rA, inst.SIMM_16); if (a) ADD(rA, rA, gpr.R(a)); - MOVI2R(rB, Memory::MEMVIEW32_MASK, false); // 1-2 - AND(rA, rA, rB); // 3 + Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) + BIC(rA, rA, mask); // 3 MOVI2R(rB, (u32)Memory::base, false); // 4-5 ADD(rA, rA, rB); // 6 From ba0c52b104c34755b5d7c27655b75816b98052aa Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 8 Sep 2013 08:18:34 +0000 Subject: [PATCH 097/267] [ARM] Optimization to psq_l, no need to push/pop regs anymore. Implement support for single float loading, gives a decent speedup to Ikaruga in menus and game. --- .../JitArm32/JitArm_LoadStorePaired.cpp | 16 +++------- .../Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp | 30 +++++++++++++------ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp index 5e2cc1f876..1df10e074e 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp @@ -28,26 +28,18 @@ void JitArm::psq_l(UGeckoInstruction inst) if (js.memcheck) { Default(inst); return; } - if (inst.W) { - // Enable when supporting single loads - Default(inst); - return; - } - LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I])); - //UBFX(R12, R11, 2, 6); // Scale - UBFX(R11, R11, 13, 3); // Type + UBFX(R12, R11, 13, 3); // Type + UBFX(R11, R11, 2, 6); // Scale MOVI2R(R10, (u32)offset); if (inst.RA) ADD(R10, R10, gpr.R(inst.RA)); if (update) MOV(gpr.R(inst.RA), R10); - if (inst.W) - ADD(R11, R11, 8); MOVI2R(R14, (u32)asm_routines.pairedLoadQuantized); - ADD(R14, R14, R11); - LDR(R14, R14); + ADD(R14, R14, R12); + LDR(R14, R14, inst.W ? 8 * 4 : 0); // Values returned in S0, S1 BL(R14); // Jump to the quantizer Load diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp index 973b7659de..a4df254c97 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp @@ -145,25 +145,37 @@ void JitArmAsmRoutineManager::Generate() void JitArmAsmRoutineManager::GenerateCommon() { + // R14 is LR + // R12 is scratch + // R11 is scale + // R10 is the address + Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) + NEONXEmitter nemit(this); + const u8* loadPairedIllegal = GetCodePtr(); BKPT(0x10); const u8* loadPairedFloatTwo = GetCodePtr(); - PUSH(2, R12, _LR); - // R12, R14 is scratch - // R10 is the address - Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) BIC(R10, R10, mask); - MOVI2R(R14, (u32)Memory::base); - ADD(R10, R10, R14); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); - NEONXEmitter nemit(this); nemit.VLD1(I_32, D0, R10); nemit.VREV32(I_8, D0, D0); + + MOV(_PC, _LR); - POP(2, R12, _PC); const u8* loadPairedFloatOne = GetCodePtr(); - BKPT(0x12); + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + nemit.VLD1(I_32, D0, R10); + nemit.VREV32(I_8, D0, D0); + + MOVI2F(S1, 1.0f, INVALID_REG); // Temp reg isn't used for 1.0f + MOV(_PC, _LR); + const u8* loadPairedU8Two = GetCodePtr(); BKPT(0x13); const u8* loadPairedU8One = GetCodePtr(); From 92c846de458150d516ce623147e1c8ff0bbb6551 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 8 Sep 2013 13:54:05 -0400 Subject: [PATCH 098/267] NetPlay: Use the correct pad mappings for rumble Rename the functions around so we don't get confused again, too. --- Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp | 2 +- Source/Core/Core/Src/HW/SI_DeviceDanceMat.h | 2 +- .../Core/Src/HW/SI_DeviceGCController.cpp | 2 +- .../Core/Core/Src/HW/SI_DeviceGCController.h | 2 +- .../Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 4 +- .../Core/Src/HW/SI_DeviceGCSteeringWheel.h | 2 +- Source/Core/Core/Src/NetPlayClient.cpp | 37 ++++++++++++++----- Source/Core/Core/Src/NetPlayClient.h | 3 +- 8 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp index 30237286e6..d21371fe36 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp @@ -231,7 +231,7 @@ void CSIDevice_DanceMat::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h index b30c107847..7c413026ec 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h +++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h @@ -90,7 +90,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_GetPadNum(u8 numPAD); + static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index f6e0846b51..0c4bf48dcb 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -249,7 +249,7 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.h b/Source/Core/Core/Src/HW/SI_DeviceGCController.h index a43e5027ce..9673041c6f 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.h @@ -90,7 +90,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_GetPadNum(u8 numPAD); + static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp index 562a450422..4102d29193 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -254,7 +254,7 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uType = command.Parameter2; // 06 = motor on, 04 = motor off // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Motor(numPAD, uType, uStrength); @@ -273,7 +273,7 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h index 2c539e56d4..2398b8f321 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h @@ -91,7 +91,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_GetPadNum(u8 numPAD); + static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 7a3febe030..be259ae8af 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -515,7 +515,7 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat // We should add this split between "in-game" pads and "local" // pads higher up. - int in_game_num = GetPadNum(pad_nb); + int in_game_num = InGamePadToLocalPad(pad_nb); // If this in-game pad is one of ours, then update from the // information given. @@ -623,8 +623,25 @@ void NetPlayClient::Stop() } } -// called from ---CPU--- thread -u8 NetPlayClient::GetPadNum(u8 numPAD) +u8 NetPlayClient::InGamePadToLocalPad(u8 ingame_pad) +{ + // not our pad + if (m_pad_map[ingame_pad] != m_local_player->pid) + return 4; + + int local_pad = 0; + int pad = 0; + + for (; pad < ingame_pad; pad++) + { + if (m_pad_map[pad] == m_local_player->pid) + local_pad++; + } + + return local_pad; +} + +u8 NetPlayClient::LocalPadToInGamePad(u8 local_pad) { // Figure out which in-game pad maps to which local pad. // The logic we have here is that the local slots always @@ -636,7 +653,7 @@ u8 NetPlayClient::GetPadNum(u8 numPAD) if (m_pad_map[ingame_pad] == m_local_player->pid) local_pad_count++; - if (local_pad_count == numPAD) + if (local_pad_count == local_pad) break; } @@ -681,24 +698,24 @@ u32 CEXIIPL::NetPlay_GetGCTime() // called from ---CPU--- thread // return the local pad num that should rumble given a ingame pad num -u8 CSIDevice_GCController::NetPlay_GetPadNum(u8 numPAD) +u8 CSIDevice_GCController::NetPlay_InGamePadToLocalPad(u8 numPAD) { std::lock_guard lk(crit_netplay_client); if (netplay_client) - return netplay_client->GetPadNum(numPAD); + return netplay_client->InGamePadToLocalPad(numPAD); else return numPAD; } -u8 CSIDevice_GCSteeringWheel::NetPlay_GetPadNum(u8 numPAD) +u8 CSIDevice_GCSteeringWheel::NetPlay_InGamePadToLocalPad(u8 numPAD) { - return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); + return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD); } -u8 CSIDevice_DanceMat::NetPlay_GetPadNum(u8 numPAD) +u8 CSIDevice_DanceMat::NetPlay_InGamePadToLocalPad(u8 numPAD) { - return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); + return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD); } // called from ---CPU--- thread diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index d6b121a18d..fa53154b7e 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -82,7 +82,8 @@ public: void WiimoteUpdate(int _number); bool GetNetPads(const u8 pad_nb, const SPADStatus* const, NetPad* const netvalues); - u8 GetPadNum(u8 numPAD); + u8 LocalPadToInGamePad(u8 localPad); + u8 InGamePadToLocalPad(u8 localPad); protected: void ClearBuffers(); From 3db2108dbb93c42b3b68faa3b45add5dabf90db3 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 8 Sep 2013 21:03:24 +0200 Subject: [PATCH 099/267] Add two buttons to the ISOProperties dialog so that we still meet string freeze deadline. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 81e0e1a732..945257ab88 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -286,6 +286,14 @@ void CISOProperties::CreateGUIControls(bool IsWad) new wxButton(this, ID_EDITCONFIG, _("Edit Config"), wxDefaultPosition, wxDefaultSize); EditConfig->SetToolTip(_("This will let you Manually Edit the INI config file")); + wxButton * const EditConfigDefault = + new wxButton(this, ID_EDITCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize); + EditConfigDefault->SetToolTip(_("Opens the default (read-only) configuration for this game in an external text editor.")); + + wxButton * const EditConfigLocal = + new wxButton(this, ID_EDITCONFIG, _("Edit Local Overrides"), wxDefaultPosition, wxDefaultSize); + EditConfigLocal->SetToolTip(_("Opens the user specified overrides in an external text editor.")); + // Notebook wxNotebook * const m_Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize); @@ -558,6 +566,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) } wxSizer* sButtons = CreateButtonSizer(wxNO_DEFAULT); + sButtons->Prepend(EditConfigDefault); + sButtons->Prepend(EditConfigLocal); sButtons->Prepend(EditConfig); sButtons->Add(new wxButton(this, wxID_OK, _("Close"))); From c306dafe441af73711eaeb35221d370f823d5fdc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 8 Sep 2013 16:45:37 -0400 Subject: [PATCH 100/267] [Android] Simplify some checks within the the folder browser in regards to checking if a file is hidden or not. Also potentially fixed the case where items in the game list would not remain saved to the config. --- .../dolphinemu/folderbrowser/FolderBrowser.java | 2 +- .../dolphinemu/dolphinemu/gamelist/GameListFragment.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java index 1d5336df31..c8f99d8c3f 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java @@ -64,7 +64,7 @@ public final class FolderBrowser extends Fragment boolean hasExtension = (entryName.lastIndexOf(".") != -1); // Skip hidden folders/files. - if (entryName.charAt(0) != '.') + if (!entry.isHidden()) { if(entry.isDirectory()) { diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java index cdb5c2a745..a31c6c896b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java @@ -83,13 +83,10 @@ public final class GameListFragment extends Fragment { String entryName = entry.getName(); - if (entryName.charAt(0) != '.') + if (!entry.isHidden() && !entry.isDirectory()) { - if (!entry.isDirectory()) - { - if (exts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.')))) - fls.add(new GameListItem(mMe.getApplicationContext(), entryName, getString(R.string.file_size)+entry.length(),entry.getAbsolutePath())); - } + if (exts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.')))) + fls.add(new GameListItem(mMe, entryName, getString(R.string.file_size)+entry.length(),entry.getAbsolutePath())); } } } From f382a5350062cc04f1b31f950fa9f53ea8b71bcb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 8 Sep 2013 17:52:26 -0400 Subject: [PATCH 101/267] [Android] Organize the list of allowed file extensions for the folder browser and game list alphabetically. Keeps things nice and sorted. --- .../org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java | 2 +- .../org/dolphinemu/dolphinemu/gamelist/GameListFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java index c8f99d8c3f..648cf23d70 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java @@ -53,7 +53,7 @@ public final class FolderBrowser extends Fragment Listfls = new ArrayList(); // Supported extensions to filter by - Set validExts = new HashSet(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf", ".dff", ".wad")); + Set validExts = new HashSet(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs")); // Search for any directories or files within the current dir. for(File entry : dirs) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java index a31c6c896b..508955d953 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java @@ -70,7 +70,7 @@ public final class GameListFragment extends Fragment int intDirectories = Integer.parseInt(Directories); // Extensions to filter by. - Set exts = new HashSet(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf", ".dff", ".wad")); + Set exts = new HashSet(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs")); for (int a = 0; a < intDirectories; ++a) { From c1aa80cefa0df06e858a5efe1e0084534ba683d7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 8 Sep 2013 21:49:56 +0000 Subject: [PATCH 102/267] [ARM] Add support for double registers in VMOV(immediate). Add VEOR and VSTR1. Fix some minor encoding bugs. --- Source/Core/Common/Src/ArmEmitter.cpp | 32 +++++++++++++++++++++++---- Source/Core/Common/Src/ArmEmitter.h | 4 ++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index e0f02244a8..70a165d114 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -1077,7 +1077,8 @@ void ARMXEmitter::VMSR(ARMReg Rt) { void ARMXEmitter::VMOV(ARMReg Dest, Operand2 op2) { _dbg_assert_msg_(DYNA_REC, cpu_info.bVFPv3, "VMOV #imm requires VFPv3"); - Write32(condition | (0xEB << 20) | EncodeVd(Dest) | (0xA << 8) | op2.Imm8VFP()); + bool double_reg = Dest >= D0; + Write32(condition | (0xEB << 20) | EncodeVd(Dest) | (0x5 << 9) | (double_reg << 8) | op2.Imm8VFP()); } void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src, bool high) { @@ -1234,7 +1235,7 @@ void NEONXEmitter::VABD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \ | ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \ - | ((Vm & 0x10) << 2) | (Vm & 0xF)); + | ((Vm & 0x10) << 1) | (Vm & 0xF)); } void NEONXEmitter::VADD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) { @@ -1265,7 +1266,7 @@ void NEONXEmitter::VSUB(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \ | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (1 << 6) \ - | ((Vm & 0x10) << 2) | (Vm & 0xF)); + | ((Vm & 0x10) << 1) | (Vm & 0xF)); } void NEONXEmitter::VLD1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align, ARMReg Rm) @@ -1290,6 +1291,18 @@ void NEONXEmitter::VLD2(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignmen | (align << 4) | Rm); } +void NEONXEmitter::VST1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align, ARMReg Rm) +{ + u32 spacing = 0x7; // Single spaced registers + // Gets encoded as a double register + Vd = SubBase(Vd); + + Write32((0xF4 << 24) | ((Vd & 0x10) << 18) | (Rn << 16) + | ((Vd & 0xF) << 12) | (spacing << 8) | (encodedSize(Size) << 6) + | (align << 4) | Rm); +} + + void NEONXEmitter::VREVX(u32 size, NEONElementType Size, ARMReg Vd, ARMReg Vm) { bool register_quad = Vd >= Q0; @@ -1298,7 +1311,7 @@ void NEONXEmitter::VREVX(u32 size, NEONElementType Size, ARMReg Vd, ARMReg Vm) Write32((0xF3 << 24) | (1 << 23) | ((Vd & 0x10) << 18) | (0x3 << 20) | (encodedSize(Size) << 18) | ((Vd & 0xF) << 12) | (size << 7) - | (register_quad << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + | (register_quad << 6) | ((Vm & 0x10) << 1) | (Vm & 0xF)); } void NEONXEmitter::VREV64(NEONElementType Size, ARMReg Vd, ARMReg Vm) @@ -1316,5 +1329,16 @@ void NEONXEmitter::VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm) VREVX(0, Size, Vd, Vm); } +void NEONXEmitter::VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + bool register_quad = Vd >= Q0; + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) + | ((Vd & 0xF) << 12) | (1 << 8) | ((Vn & 0x10) << 3) + | (register_quad << 6) | ((Vm & 0x10) << 1) | (1 << 4) | (Vm & 0xF)); +} + } diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h index 79121e832a..138780e836 100644 --- a/Source/Core/Common/Src/ArmEmitter.h +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -630,8 +630,12 @@ public: void VREV32(NEONElementType Size, ARMReg Vd, ARMReg Vm); void VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm); + void VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VLD1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); void VLD2(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); + + void VST1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); }; // Everything that needs to generate X86 code should inherit from this. From 4146e1f3d6e6b099a92af6cf0a17dbc22a0d0bd8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 8 Sep 2013 21:55:15 +0000 Subject: [PATCH 103/267] [ARM] Implement psq_st. Optimizations in psq_l and fix all the remaining bugs...except clamping within the max value range of the value. Causes some minor visual effects mostly. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 2 + .../JitArm32/JitArm_LoadStorePaired.cpp | 62 ++- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 6 +- .../Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp | 459 +++++++++++++++++- 4 files changed, 495 insertions(+), 34 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 5d5d2dd19b..58c6cbda16 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -221,6 +221,8 @@ public: // LoadStore paired void psq_l(UGeckoInstruction _inst); + void psq_st(UGeckoInstruction _inst); + }; #endif // _JIT64_H diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp index 1df10e074e..7ed402593c 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp @@ -18,22 +18,24 @@ void JitArm::psq_l(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITLoadStorePairedOff) - + bool update = inst.OPCD == 57; s32 offset = inst.SIMM_12; // R12 contains scale // R11 contains type // R10 is the ADDR - + if (js.memcheck) { Default(inst); return; } LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I])); - UBFX(R12, R11, 13, 3); // Type - UBFX(R11, R11, 2, 6); // Scale + UBFX(R12, R11, 16, 3); // Type + LSL(R12, R12, 2); + UBFX(R11, R11, 24, 6); // Scale + LSL(R11, R11, 2); MOVI2R(R10, (u32)offset); - if (inst.RA) + if (inst.RA || update) // Always uses the register on update ADD(R10, R10, gpr.R(inst.RA)); if (update) MOV(gpr.R(inst.RA), R10); @@ -47,5 +49,53 @@ void JitArm::psq_l(UGeckoInstruction inst) ARMReg vD0 = fpr.R0(inst.RS, false); ARMReg vD1 = fpr.R1(inst.RS, false); VCVT(vD0, S0, 0); - VCVT(vD1, S1, 0); + if (!inst.W) + VCVT(vD1, S1, 0); + else + MOVI2F(vD1, 1.0f, INVALID_REG); // No need for temp reg with 1.0f +} + +void JitArm::psq_st(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStorePairedOff) + + bool update = inst.OPCD == 61; + s32 offset = inst.SIMM_12; + + // R12 contains scale + // R11 contains type + // R10 is the ADDR + if (js.memcheck) { Default(inst); return; } + + LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I])); + UBFX(R12, R11, 0, 3); // Type + LSL(R12, R12, 2); + UBFX(R11, R11, 8, 6); // Scale + LSL(R11, R11, 2); + + if (inst.RA || update) // Always uses the register on update + { + MOVI2R(R14, offset); + ADD(R10, gpr.R(inst.RA), R14); + } + else + MOVI2R(R10, (u32)offset); + + if (update) + MOV(gpr.R(inst.RA), R10); + MOVI2R(R14, (u32)asm_routines.pairedStoreQuantized); + ADD(R14, R14, R12); + LDR(R14, R14, inst.W ? 8 * 4 : 0); + + ARMReg vD0 = fpr.R0(inst.RS); + VCVT(S0, vD0, 0); + + if (!inst.W) + { + ARMReg vD1 = fpr.R1(inst.RS); + VCVT(S1, vD1, 0); + } + // floats passed through D0 + BL(R14); // Jump to the quantizer Store } diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 23c5ab56a5..78e8e9d06b 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -108,9 +108,9 @@ static GekkoOPTemplate primarytable[] = {55, &JitArm::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, {56, &JitArm::psq_l}, //"psq_l", OPTYPE_PS, FL_IN_A}}, - {57, &JitArm::Default}, //"psq_lu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, - {60, &JitArm::Default}, //"psq_st", OPTYPE_PS, FL_IN_A}}, - {61, &JitArm::Default}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, + {57, &JitArm::psq_l}, //"psq_lu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, + {60, &JitArm::psq_st}, //"psq_st", OPTYPE_PS, FL_IN_A}}, + {61, &JitArm::psq_st}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, //missing: 0, 5, 6, 9, 22, 30, 62, 58 {0, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp index a4df254c97..d20ff66397 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp @@ -41,6 +41,64 @@ using namespace ArmGen; JitArmAsmRoutineManager asm_routines; +static const float GC_ALIGNED16(m_quantizeTableS[]) = +{ + (1 << 0), (1 << 1), (1 << 2), (1 << 3), + (1 << 4), (1 << 5), (1 << 6), (1 << 7), + (1 << 8), (1 << 9), (1 << 10), (1 << 11), + (1 << 12), (1 << 13), (1 << 14), (1 << 15), + (1 << 16), (1 << 17), (1 << 18), (1 << 19), + (1 << 20), (1 << 21), (1 << 22), (1 << 23), + (1 << 24), (1 << 25), (1 << 26), (1 << 27), + (1 << 28), (1 << 29), (1 << 30), (1 << 31), + 1.0 / (1ULL << 32), 1.0 / (1 << 31), 1.0 / (1 << 30), 1.0 / (1 << 29), + 1.0 / (1 << 28), 1.0 / (1 << 27), 1.0 / (1 << 26), 1.0 / (1 << 25), + 1.0 / (1 << 24), 1.0 / (1 << 23), 1.0 / (1 << 22), 1.0 / (1 << 21), + 1.0 / (1 << 20), 1.0 / (1 << 19), 1.0 / (1 << 18), 1.0 / (1 << 17), + 1.0 / (1 << 16), 1.0 / (1 << 15), 1.0 / (1 << 14), 1.0 / (1 << 13), + 1.0 / (1 << 12), 1.0 / (1 << 11), 1.0 / (1 << 10), 1.0 / (1 << 9), + 1.0 / (1 << 8), 1.0 / (1 << 7), 1.0 / (1 << 6), 1.0 / (1 << 5), + 1.0 / (1 << 4), 1.0 / (1 << 3), 1.0 / (1 << 2), 1.0 / (1 << 1), +}; + +static const float GC_ALIGNED16(m_dequantizeTableS[]) = +{ + 1.0 / (1 << 0), 1.0 / (1 << 1), 1.0 / (1 << 2), 1.0 / (1 << 3), + 1.0 / (1 << 4), 1.0 / (1 << 5), 1.0 / (1 << 6), 1.0 / (1 << 7), + 1.0 / (1 << 8), 1.0 / (1 << 9), 1.0 / (1 << 10), 1.0 / (1 << 11), + 1.0 / (1 << 12), 1.0 / (1 << 13), 1.0 / (1 << 14), 1.0 / (1 << 15), + 1.0 / (1 << 16), 1.0 / (1 << 17), 1.0 / (1 << 18), 1.0 / (1 << 19), + 1.0 / (1 << 20), 1.0 / (1 << 21), 1.0 / (1 << 22), 1.0 / (1 << 23), + 1.0 / (1 << 24), 1.0 / (1 << 25), 1.0 / (1 << 26), 1.0 / (1 << 27), + 1.0 / (1 << 28), 1.0 / (1 << 29), 1.0 / (1 << 30), 1.0 / (1 << 31), + (1ULL << 32), (1 << 31), (1 << 30), (1 << 29), + (1 << 28), (1 << 27), (1 << 26), (1 << 25), + (1 << 24), (1 << 23), (1 << 22), (1 << 21), + (1 << 20), (1 << 19), (1 << 18), (1 << 17), + (1 << 16), (1 << 15), (1 << 14), (1 << 13), + (1 << 12), (1 << 11), (1 << 10), (1 << 9), + (1 << 8), (1 << 7), (1 << 6), (1 << 5), + (1 << 4), (1 << 3), (1 << 2), (1 << 1), +}; + +static void WriteDual32(u32 value1, u32 value2, u32 address) +{ + Memory::Write_U32(value1, address); + Memory::Write_U32(value2, address + 4); +} + +static void WriteDual16(u32 value1, u32 value2, u32 address) +{ + Memory::Write_U16(value1, address); + Memory::Write_U16(value2, address + 2); +} + +static void WriteDual8(u32 value1, u32 value2, u32 address) +{ + Memory::Write_U8(value1, address); + Memory::Write_U8(value2, address + 1); +} + void JitArmAsmRoutineManager::Generate() { enterCode = GetCodePtr(); @@ -150,48 +208,221 @@ void JitArmAsmRoutineManager::GenerateCommon() // R11 is scale // R10 is the address Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) + Operand2 arghmask(3, 3); // 0x0C000000 NEONXEmitter nemit(this); const u8* loadPairedIllegal = GetCodePtr(); BKPT(0x10); const u8* loadPairedFloatTwo = GetCodePtr(); - BIC(R10, R10, mask); - MOVI2R(R12, (u32)Memory::base); - ADD(R10, R10, R12); - - nemit.VLD1(I_32, D0, R10); - nemit.VREV32(I_8, D0, D0); - - MOV(_PC, _LR); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + nemit.VLD1(I_32, D0, R10); + nemit.VREV32(I_8, D0, D0); + + MOV(_PC, _LR); + } const u8* loadPairedFloatOne = GetCodePtr(); - BIC(R10, R10, mask); - MOVI2R(R12, (u32)Memory::base); - ADD(R10, R10, R12); - - nemit.VLD1(I_32, D0, R10); - nemit.VREV32(I_8, D0, D0); - - MOVI2F(S1, 1.0f, INVALID_REG); // Temp reg isn't used for 1.0f - MOV(_PC, _LR); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + nemit.VLD1(I_32, D0, R10); + nemit.VREV32(I_8, D0, D0); + + MOV(_PC, _LR); + } const u8* loadPairedU8Two = GetCodePtr(); - BKPT(0x13); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRH(R12, R10); + SXTB(R12, R12); + VMOV(S0, R12); + + LDRH(R12, R10, 2); + SXTB(R12, R12); + VMOV(S1, R12); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + VCVT(S0, S0, TO_FLOAT); + VCVT(S1, S1, TO_FLOAT); + + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + MOV(_PC, _LR); + } const u8* loadPairedU8One = GetCodePtr(); - BKPT(0x14); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRB(R12, R10); + SXTB(R12, R12); + VMOV(S0, R12); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + VCVT(S0, S0, TO_FLOAT); + + VMUL(S0, S0, S2); + + MOV(_PC, _LR); + } const u8* loadPairedS8Two = GetCodePtr(); - BKPT(0x15); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRH(R12, R10); + SXTB(R12, R12); + VMOV(S0, R12); + + LDRH(R12, R10, 2); + SXTB(R12, R12); + VMOV(S1, R12); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + VCVT(S0, S0, TO_FLOAT | IS_SIGNED); + VCVT(S1, S1, TO_FLOAT | IS_SIGNED); + + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + MOV(_PC, _LR); + } const u8* loadPairedS8One = GetCodePtr(); - BKPT(0x16); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRB(R12, R10); + SXTB(R12, R12); + VMOV(S0, R12); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + VCVT(S0, S0, TO_FLOAT | IS_SIGNED); + + VMUL(S0, S0, S2); + + MOV(_PC, _LR); + } const u8* loadPairedU16Two = GetCodePtr(); - BKPT(0x17); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRH(R12, R10); + REV16(R12, R12); + SXTH(R12, R12); + VMOV(S0, R12); + + LDRH(R12, R10, 2); + REV16(R12, R12); + SXTH(R12, R12); + VMOV(S1, R12); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + VCVT(S0, S0, TO_FLOAT); + VCVT(S1, S1, TO_FLOAT); + + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + MOV(_PC, _LR); + } const u8* loadPairedU16One = GetCodePtr(); - BKPT(0x18); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRH(R12, R10); + REV16(R12, R12); + VMOV(S0, R12); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + VCVT(S0, S0, TO_FLOAT); + + VMUL(S0, S0, S2); + MOV(_PC, _LR); + } const u8* loadPairedS16Two = GetCodePtr(); - BKPT(0x19); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRH(R12, R10); + REV16(R12, R12); + SXTH(R12, R12); + VMOV(S0, R12); + + LDRH(R12, R10, 2); + REV16(R12, R12); + SXTH(R12, R12); + VMOV(S1, R12); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + VCVT(S0, S0, TO_FLOAT | IS_SIGNED); + VCVT(S1, S1, TO_FLOAT | IS_SIGNED); + + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + MOV(_PC, _LR); + } const u8* loadPairedS16One = GetCodePtr(); - BKPT(0x20); + { + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + LDRH(R12, R10); + + MOVI2R(R10, (u32)&m_dequantizeTableS); + ADD(R10, R10, R11); + VLDR(S2, R10, 0); + + REV16(R12, R12); + SXTH(R12, R12); + VMOV(S0, R12); + VCVT(S0, S0, TO_FLOAT | IS_SIGNED); + + VMUL(S0, S0, S2); + MOV(_PC, _LR); + } pairedLoadQuantized = reinterpret_cast(const_cast(AlignCode16())); ReserveCodeSpace(16 * sizeof(u8*)); @@ -214,4 +445,182 @@ void JitArmAsmRoutineManager::GenerateCommon() pairedLoadQuantized[14] = loadPairedS8One; pairedLoadQuantized[15] = loadPairedS16One; + // Stores + const u8* storePairedIllegal = GetCodePtr(); + BKPT(0x21); + const u8* storePairedFloat = GetCodePtr(); + { + TST(R10, arghmask); + FixupBranch argh = B_CC(CC_NEQ); + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + nemit.VREV32(I_8, D0, D0); + nemit.VST1(I_32, D0, R10); + MOV(_PC, _LR); + + SetJumpTarget(argh); + + PUSH(5, R0, R1, R2, R3, _LR); + VMOV(R0, S0); + VMOV(R1, S1); + MOV(R2, R10); + MOVI2R(R12, (u32)&WriteDual32); + BL(R12); + POP(5, R0, R1, R2, R3, _PC); + } + const u8* storePairedU8 = GetCodePtr(); + const u8* storePairedS8 = GetCodePtr(); + { + // R10 is the addr + // R11 is the scale + // R12 is scratch + // S0, S1 is the values + PUSH(5, R0, R1, R2, R3, _LR); + + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); + VCVT(S1, S1, TO_INT | ROUND_TO_ZERO); + + VMOV(R0, S0); + VMOV(R1, S1); + MOV(R2, R10); + MOVI2R(R12, (u32)&WriteDual8); + BL(R12); + + POP(5, R0, R1, R2, R3, _PC); + } + const u8* storePairedU16 = GetCodePtr(); + const u8* storePairedS16 = GetCodePtr(); + { + PUSH(5, R0, R1, R2, R3, _LR); + + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + VMUL(S1, S1, S2); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); + VCVT(S1, S1, TO_INT | ROUND_TO_ZERO); + + VMOV(R0, S0); + VMOV(R1, S1); + MOV(R2, R10); + MOVI2R(R12, (u32)&WriteDual16); + BL(R12); + + POP(5, R0, R1, R2, R3, _PC); + } + const u8* storeSingleIllegal = GetCodePtr(); + BKPT(0x27); + const u8* storeSingleFloat = GetCodePtr(); + { + TST(R10, arghmask); + FixupBranch argh = B_CC(CC_NEQ); + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + VMOV(R12, S0); + REV(R12, R12); + STR(R12, R10); + MOV(_PC, _LR); + + SetJumpTarget(argh); + + PUSH(5, R0, R1, R2, R3, _LR); + VMOV(R0, S0); + MOV(R1, R10); + MOVI2R(R10, (u32)&Memory::Write_U32); + BL(R10); + + POP(5, R0, R1, R2, R3, _PC); + } + const u8* storeSingleU8 = GetCodePtr(); // Used by MKWii + const u8* storeSingleS8 = GetCodePtr(); + { + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + + TST(R10, arghmask); + FixupBranch argh = B_CC(CC_NEQ); + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); + VMOV(R12, S0); + STRB(R12, R10); + MOV(_PC, _LR); + + SetJumpTarget(argh); + + PUSH(5, R0, R1, R2, R3, _LR); + VMOV(R0, S0); + MOV(R1, R10); + MOVI2R(R10, (u32)&Memory::Write_U8); + BL(R10); + POP(5, R0, R1, R2, R3, _PC); + } + const u8* storeSingleU16 = GetCodePtr(); // Used by MKWii + const u8* storeSingleS16 = GetCodePtr(); + { + MOVI2R(R12, (u32)&m_quantizeTableS); + ADD(R12, R12, R11); + VLDR(S2, R12, 0); + VMUL(S0, S0, S2); + + TST(R10, arghmask); + FixupBranch argh = B_CC(CC_NEQ); + BIC(R10, R10, mask); + MOVI2R(R12, (u32)Memory::base); + ADD(R10, R10, R12); + + VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); + VMOV(R12, S0); + REV16(R12, R12); + STRH(R12, R10); + MOV(_PC, _LR); + + SetJumpTarget(argh); + + PUSH(5, R0, R1, R2, R3, _LR); + VMOV(R0, S0); + MOV(R1, R10); + MOVI2R(R10, (u32)&Memory::Write_U16); + BL(R10); + + POP(5, R0, R1, R2, R3, _PC); + } + + pairedStoreQuantized = reinterpret_cast(const_cast(AlignCode16())); + ReserveCodeSpace(16 * sizeof(u8*)); + + pairedStoreQuantized[0] = storePairedFloat; + pairedStoreQuantized[1] = storePairedIllegal; + pairedStoreQuantized[2] = storePairedIllegal; + pairedStoreQuantized[3] = storePairedIllegal; + pairedStoreQuantized[4] = storePairedU8; + pairedStoreQuantized[5] = storePairedU16; + pairedStoreQuantized[6] = storePairedS8; + pairedStoreQuantized[7] = storePairedS16; + + pairedStoreQuantized[8] = storeSingleFloat; + pairedStoreQuantized[9] = storeSingleIllegal; + pairedStoreQuantized[10] = storeSingleIllegal; + pairedStoreQuantized[11] = storeSingleIllegal; + pairedStoreQuantized[12] = storeSingleU8; + pairedStoreQuantized[13] = storeSingleU16; + pairedStoreQuantized[14] = storeSingleS8; + pairedStoreQuantized[15] = storeSingleS16; + } From 22d9331b9601acb6943378977896d12678b8aaef Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 8 Sep 2013 18:15:49 -0400 Subject: [PATCH 104/267] Improve IOdarwin - Add requestAuthentication, which might help someone who can't sync, and better error reporting. --- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 61 +++++++++++++------ 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index e7e9033338..886dbb9c9c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -193,6 +193,7 @@ void Wiimote::InitInternal() inputlen = 0; m_connected = false; m_wiimote_thread_run_loop = NULL; + btd = nil; } void Wiimote::TeardownInternal() @@ -202,6 +203,8 @@ void Wiimote::TeardownInternal() CFRelease(m_wiimote_thread_run_loop); m_wiimote_thread_run_loop = NULL; } + [btd release]; + btd = nil; } // Connect to a wiimote with a known address. @@ -214,30 +217,49 @@ bool Wiimote::ConnectInternal() cchan = ichan = nil; - [btd openL2CAPChannelSync: &cchan - withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; - [btd openL2CAPChannelSync: &ichan - withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt]; + IOReturn ret = [btd openConnection]; + if (ret) + { + ERROR_LOG(WIIMOTE, "Unable to open Bluetooth connection to wiimote %i: %x", + index + 1, ret); + return false; + } + + ret = [btd requestAuthentication]; + if (ret) + { + WARN_LOG(WIIMOTE, "Unable to request authentication for wiimote %i: %x", + index + 1, ret); + goto bad; + } + + ret = [btd openL2CAPChannelSync: &cchan + withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; + if (ret) + { + ERROR_LOG(WIIMOTE, "Unable to open control channel for wiimote %i: %x", + index + 1, ret); + goto bad; + } // Apple docs claim: // "The L2CAP channel object is already retained when this function returns // success; the channel must be released when the caller is done with it." // But without this, the channels get over-autoreleased, even though the // refcounting behavior here is clearly correct. - [ichan retain]; [cchan retain]; - if (ichan == nil || cchan == nil) + + ret = [btd openL2CAPChannelSync: &ichan + withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt]; + if (ret) { - ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels " - "for wiimote %i", index + 1); - DisconnectInternal(); - [cbt release]; - [ichan release]; - [cchan release]; - return false; + WARN_LOG(WIIMOTE, "Unable to open interrupt channel for wiimote %i: %x", + index + 1, ret); + goto bad; } + [ichan retain]; NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s", - index + 1, [[btd addressString] UTF8String]); + index + 1, [[btd addressString] UTF8String]); m_connected = true; @@ -246,6 +268,11 @@ bool Wiimote::ConnectInternal() m_wiimote_thread_run_loop = (CFRunLoopRef) CFRetain(CFRunLoopGetCurrent()); return true; + +bad: + DisconnectInternal(); + [cbt release]; + return false; } // Disconnect a wiimote. @@ -253,15 +280,13 @@ void Wiimote::DisconnectInternal() { [ichan closeChannel]; [ichan release]; - ichan = NULL; + ichan = nil; [cchan closeChannel]; [cchan release]; - cchan = NULL; + cchan = nil; [btd closeConnection]; - [btd release]; - btd = NULL; if (!IsConnected()) return; From fe0a450ee406dfe1a09c3c385eb4a39096695fef Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 8 Sep 2013 19:32:14 -0400 Subject: [PATCH 105/267] Don't request authentication (aka I should actually test before committing). --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 886dbb9c9c..4f015866bc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -225,14 +225,6 @@ bool Wiimote::ConnectInternal() return false; } - ret = [btd requestAuthentication]; - if (ret) - { - WARN_LOG(WIIMOTE, "Unable to request authentication for wiimote %i: %x", - index + 1, ret); - goto bad; - } - ret = [btd openL2CAPChannelSync: &cchan withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; if (ret) From 3ec9f9b64a07e1c5e4ca3482fc6fc96db533021c Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 9 Sep 2013 02:29:30 +0200 Subject: [PATCH 106/267] videoCommon: also reset logicOp on mode switch --- Source/Core/VideoCommon/Src/BPStructs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 00cecf0082..9f885e7953 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -200,19 +200,19 @@ void BPWritten(const BPCmd& bp) bpmem.blendmode.dstfactor, bpmem.blendmode.srcfactor, bpmem.blendmode.subtract, bpmem.blendmode.logicmode); // Set LogicOp Blending Mode - if (bp.changes & 2) + if (bp.changes & 0xF002) // logicopenable | logicmode SetLogicOpMode(); // Set Dithering Mode - if (bp.changes & 4) + if (bp.changes & 4) // dither SetDitherMode(); // Set Blending Mode - if (bp.changes & 0xFF1) + if (bp.changes & 0xFF1) // blendenable | alphaupdate | dstfactor | srcfactor | subtract SetBlendMode(); // Set Color Mask - if (bp.changes & 0x18) + if (bp.changes & 0x18) // colorupdate | alphaupdate SetColorMask(); } break; From 06140e8083921a61d00ba111f6a636da531f2c00 Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 9 Sep 2013 02:39:28 -0400 Subject: [PATCH 107/267] Revert "NetPlay: Use the correct pad mappings for rumble" This reverts commit 92c846de458150d516ce623147e1c8ff0bbb6551. It breaks NetPlay entirely for me. --- Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp | 2 +- Source/Core/Core/Src/HW/SI_DeviceDanceMat.h | 2 +- .../Core/Src/HW/SI_DeviceGCController.cpp | 2 +- .../Core/Core/Src/HW/SI_DeviceGCController.h | 2 +- .../Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 4 +- .../Core/Src/HW/SI_DeviceGCSteeringWheel.h | 2 +- Source/Core/Core/Src/NetPlayClient.cpp | 37 +++++-------------- Source/Core/Core/Src/NetPlayClient.h | 3 +- 8 files changed, 18 insertions(+), 36 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp index d21371fe36..30237286e6 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp @@ -231,7 +231,7 @@ void CSIDevice_DanceMat::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h index 7c413026ec..b30c107847 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h +++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h @@ -90,7 +90,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); + static u8 NetPlay_GetPadNum(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index 0c4bf48dcb..f6e0846b51 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -249,7 +249,7 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.h b/Source/Core/Core/Src/HW/SI_DeviceGCController.h index 9673041c6f..a43e5027ce 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.h @@ -90,7 +90,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); + static u8 NetPlay_GetPadNum(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp index 4102d29193..562a450422 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -254,7 +254,7 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uType = command.Parameter2; // 06 = motor on, 04 = motor off // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Motor(numPAD, uType, uStrength); @@ -273,7 +273,7 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h index 2398b8f321..2c539e56d4 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h @@ -91,7 +91,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); + static u8 NetPlay_GetPadNum(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index be259ae8af..7a3febe030 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -515,7 +515,7 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat // We should add this split between "in-game" pads and "local" // pads higher up. - int in_game_num = InGamePadToLocalPad(pad_nb); + int in_game_num = GetPadNum(pad_nb); // If this in-game pad is one of ours, then update from the // information given. @@ -623,25 +623,8 @@ void NetPlayClient::Stop() } } -u8 NetPlayClient::InGamePadToLocalPad(u8 ingame_pad) -{ - // not our pad - if (m_pad_map[ingame_pad] != m_local_player->pid) - return 4; - - int local_pad = 0; - int pad = 0; - - for (; pad < ingame_pad; pad++) - { - if (m_pad_map[pad] == m_local_player->pid) - local_pad++; - } - - return local_pad; -} - -u8 NetPlayClient::LocalPadToInGamePad(u8 local_pad) +// called from ---CPU--- thread +u8 NetPlayClient::GetPadNum(u8 numPAD) { // Figure out which in-game pad maps to which local pad. // The logic we have here is that the local slots always @@ -653,7 +636,7 @@ u8 NetPlayClient::LocalPadToInGamePad(u8 local_pad) if (m_pad_map[ingame_pad] == m_local_player->pid) local_pad_count++; - if (local_pad_count == local_pad) + if (local_pad_count == numPAD) break; } @@ -698,24 +681,24 @@ u32 CEXIIPL::NetPlay_GetGCTime() // called from ---CPU--- thread // return the local pad num that should rumble given a ingame pad num -u8 CSIDevice_GCController::NetPlay_InGamePadToLocalPad(u8 numPAD) +u8 CSIDevice_GCController::NetPlay_GetPadNum(u8 numPAD) { std::lock_guard lk(crit_netplay_client); if (netplay_client) - return netplay_client->InGamePadToLocalPad(numPAD); + return netplay_client->GetPadNum(numPAD); else return numPAD; } -u8 CSIDevice_GCSteeringWheel::NetPlay_InGamePadToLocalPad(u8 numPAD) +u8 CSIDevice_GCSteeringWheel::NetPlay_GetPadNum(u8 numPAD) { - return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD); + return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); } -u8 CSIDevice_DanceMat::NetPlay_InGamePadToLocalPad(u8 numPAD) +u8 CSIDevice_DanceMat::NetPlay_GetPadNum(u8 numPAD) { - return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD); + return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); } // called from ---CPU--- thread diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index fa53154b7e..d6b121a18d 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -82,8 +82,7 @@ public: void WiimoteUpdate(int _number); bool GetNetPads(const u8 pad_nb, const SPADStatus* const, NetPad* const netvalues); - u8 LocalPadToInGamePad(u8 localPad); - u8 InGamePadToLocalPad(u8 localPad); + u8 GetPadNum(u8 numPAD); protected: void ClearBuffers(); From 772046647a7e9d65414137e4faecdebf41f667c8 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 9 Sep 2013 03:09:45 -0400 Subject: [PATCH 108/267] Revert "Revert "NetPlay: Use the correct pad mappings for rumble"" This reverts commit 06140e8083921a61d00ba111f6a636da531f2c00. --- Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp | 2 +- Source/Core/Core/Src/HW/SI_DeviceDanceMat.h | 2 +- .../Core/Src/HW/SI_DeviceGCController.cpp | 2 +- .../Core/Core/Src/HW/SI_DeviceGCController.h | 2 +- .../Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 4 +- .../Core/Src/HW/SI_DeviceGCSteeringWheel.h | 2 +- Source/Core/Core/Src/NetPlayClient.cpp | 37 ++++++++++++++----- Source/Core/Core/Src/NetPlayClient.h | 3 +- 8 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp index 30237286e6..d21371fe36 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp @@ -231,7 +231,7 @@ void CSIDevice_DanceMat::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h index b30c107847..7c413026ec 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h +++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h @@ -90,7 +90,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_GetPadNum(u8 numPAD); + static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index f6e0846b51..0c4bf48dcb 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -249,7 +249,7 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.h b/Source/Core/Core/Src/HW/SI_DeviceGCController.h index a43e5027ce..9673041c6f 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.h @@ -90,7 +90,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_GetPadNum(u8 numPAD); + static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp index 562a450422..4102d29193 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -254,7 +254,7 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uType = command.Parameter2; // 06 = motor on, 04 = motor off // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Motor(numPAD, uType, uStrength); @@ -273,7 +273,7 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uStrength = command.Parameter2; // get the correct pad number that should rumble locally when using netplay - const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); if (numPAD < 4) Pad::Rumble(numPAD, uType, uStrength); diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h index 2c539e56d4..2398b8f321 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h @@ -91,7 +91,7 @@ public: // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); - static u8 NetPlay_GetPadNum(u8 numPAD); + static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data virtual bool GetData(u32& _Hi, u32& _Low); diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 7a3febe030..be259ae8af 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -515,7 +515,7 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat // We should add this split between "in-game" pads and "local" // pads higher up. - int in_game_num = GetPadNum(pad_nb); + int in_game_num = InGamePadToLocalPad(pad_nb); // If this in-game pad is one of ours, then update from the // information given. @@ -623,8 +623,25 @@ void NetPlayClient::Stop() } } -// called from ---CPU--- thread -u8 NetPlayClient::GetPadNum(u8 numPAD) +u8 NetPlayClient::InGamePadToLocalPad(u8 ingame_pad) +{ + // not our pad + if (m_pad_map[ingame_pad] != m_local_player->pid) + return 4; + + int local_pad = 0; + int pad = 0; + + for (; pad < ingame_pad; pad++) + { + if (m_pad_map[pad] == m_local_player->pid) + local_pad++; + } + + return local_pad; +} + +u8 NetPlayClient::LocalPadToInGamePad(u8 local_pad) { // Figure out which in-game pad maps to which local pad. // The logic we have here is that the local slots always @@ -636,7 +653,7 @@ u8 NetPlayClient::GetPadNum(u8 numPAD) if (m_pad_map[ingame_pad] == m_local_player->pid) local_pad_count++; - if (local_pad_count == numPAD) + if (local_pad_count == local_pad) break; } @@ -681,24 +698,24 @@ u32 CEXIIPL::NetPlay_GetGCTime() // called from ---CPU--- thread // return the local pad num that should rumble given a ingame pad num -u8 CSIDevice_GCController::NetPlay_GetPadNum(u8 numPAD) +u8 CSIDevice_GCController::NetPlay_InGamePadToLocalPad(u8 numPAD) { std::lock_guard lk(crit_netplay_client); if (netplay_client) - return netplay_client->GetPadNum(numPAD); + return netplay_client->InGamePadToLocalPad(numPAD); else return numPAD; } -u8 CSIDevice_GCSteeringWheel::NetPlay_GetPadNum(u8 numPAD) +u8 CSIDevice_GCSteeringWheel::NetPlay_InGamePadToLocalPad(u8 numPAD) { - return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); + return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD); } -u8 CSIDevice_DanceMat::NetPlay_GetPadNum(u8 numPAD) +u8 CSIDevice_DanceMat::NetPlay_InGamePadToLocalPad(u8 numPAD) { - return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); + return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD); } // called from ---CPU--- thread diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h index d6b121a18d..fa53154b7e 100644 --- a/Source/Core/Core/Src/NetPlayClient.h +++ b/Source/Core/Core/Src/NetPlayClient.h @@ -82,7 +82,8 @@ public: void WiimoteUpdate(int _number); bool GetNetPads(const u8 pad_nb, const SPADStatus* const, NetPad* const netvalues); - u8 GetPadNum(u8 numPAD); + u8 LocalPadToInGamePad(u8 localPad); + u8 InGamePadToLocalPad(u8 localPad); protected: void ClearBuffers(); From 0d341e9f284820e28e290ba2d2e6ff2d10f75ecf Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 9 Sep 2013 03:12:42 -0400 Subject: [PATCH 109/267] [NetPlay] Fix copy and paste error. --- Source/Core/Core/Src/NetPlayClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index be259ae8af..bc6ca9d393 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -515,7 +515,7 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat // We should add this split between "in-game" pads and "local" // pads higher up. - int in_game_num = InGamePadToLocalPad(pad_nb); + int in_game_num = LocalPadToInGamePad(pad_nb); // If this in-game pad is one of ours, then update from the // information given. From 908963d60141925fdb63f3a78c18d2057878d33b Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 9 Sep 2013 06:28:14 -0500 Subject: [PATCH 110/267] Update the pot file and translation catalogues. This signifies the string freeze has officially begun. --- Languages/po/ar.po | 1166 ++++++++++++++++++--------------- Languages/po/ca.po | 1178 +++++++++++++++++---------------- Languages/po/cs.po | 1179 +++++++++++++++++---------------- Languages/po/de.po | 1157 ++++++++++++++++++--------------- Languages/po/dolphin-emu.pot | 1130 +++++++++++++++++--------------- Languages/po/el.po | 1183 ++++++++++++++++++---------------- Languages/po/en.po | 1130 +++++++++++++++++--------------- Languages/po/es.po | 1181 +++++++++++++++++---------------- Languages/po/fa.po | 1179 +++++++++++++++++---------------- Languages/po/fr.po | 1183 ++++++++++++++++++---------------- Languages/po/he.po | 1130 +++++++++++++++++--------------- Languages/po/hu.po | 1178 +++++++++++++++++---------------- Languages/po/it.po | 1183 ++++++++++++++++++---------------- Languages/po/ja.po | 1180 +++++++++++++++++---------------- Languages/po/ko.po | 1178 ++++++++++++++++++--------------- Languages/po/nb.po | 1181 +++++++++++++++++---------------- Languages/po/nl.po | 1181 +++++++++++++++++---------------- Languages/po/pl.po | 1179 +++++++++++++++++---------------- Languages/po/pt.po | 1169 ++++++++++++++++++--------------- Languages/po/pt_BR.po | 1181 +++++++++++++++++---------------- Languages/po/ru.po | 1157 ++++++++++++++++++--------------- Languages/po/sr.po | 1135 +++++++++++++++++--------------- Languages/po/sv.po | 1182 +++++++++++++++++---------------- Languages/po/tr.po | 1166 ++++++++++++++++++--------------- Languages/po/zh_CN.po | 1177 ++++++++++++++++++--------------- Languages/po/zh_TW.po | 1166 ++++++++++++++++++--------------- 26 files changed, 16439 insertions(+), 13950 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 91df1051ad..be516164de 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: glennricster \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr "(كثير جدا العرض)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " لعبة : " @@ -43,7 +43,7 @@ msgstr "" "\"%s\" لا وجود لها.\n" " إنشاء جديد بطاقة الذاكرة ?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -68,8 +68,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s موجود بالفعل، الكتابة فوقة؟" @@ -102,12 +102,17 @@ msgstr "" "%s فشل تحميل في بطاقة الذاكرة \n" "الملف ليس كبيرا بما يكفي لتكون بطاقة الذاكرة ملف صحيح (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s فشل في فتح" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s فشل في فتح" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s ملف 0 بايت" @@ -117,7 +122,7 @@ msgstr "%s ملف 0 بايت" msgid "%s is already compressed! Cannot compress it further." msgstr "%s مضغوط بالفعل! لا يستطيع أن يضغط أكثر من ذلك." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s اسم الملف طويل جدا الحد الاقصى هو 45 " @@ -146,7 +151,7 @@ msgstr "" msgid "&& AND" msgstr "&& و" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&حول البرنامج " @@ -154,7 +159,7 @@ msgstr "&حول البرنامج " msgid "&Boot from DVD Drive..." msgstr "&التشغيل من محرك الاقراص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&نقاط التوقف" @@ -162,7 +167,7 @@ msgstr "&نقاط التوقف" msgid "&Browse for ISOs..." msgstr "&استعراض الايزو " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&مدير الاسرار" @@ -186,11 +191,11 @@ msgstr "&محاكاة" msgid "&File" msgstr "&ملف" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&الاطار المسبق" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&ملء الشاشة" @@ -198,7 +203,7 @@ msgstr "&ملء الشاشة" msgid "&Graphics Settings" msgstr "&إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&مساعدة" @@ -206,7 +211,7 @@ msgstr "&مساعدة" msgid "&Hotkey Settings" msgstr "&إعدادات الاختصارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -218,11 +223,11 @@ msgstr "&تحميل الحالة" msgid "&Memcard Manager (GC)" msgstr "&بطاقه الذكره جيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&فتح" @@ -230,11 +235,11 @@ msgstr "&فتح" msgid "&Options" msgstr "&خيارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&وقفة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&ابداء اللعبه" @@ -242,39 +247,39 @@ msgstr "&ابداء اللعبه" msgid "&Properties" msgstr "&خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&وضع للقراءة فقط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&تحديث القائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&تسجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&إعادة اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&الصوت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&أدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&فديو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&القائمة" @@ -363,7 +368,7 @@ msgstr "<أدخل اسم هنا>" msgid "" msgstr "<لم يتم العثور على القرارات>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "<لا شيء>" @@ -371,7 +376,7 @@ msgstr "<لا شيء>" msgid "" msgstr "<اضغط على مفتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<النظام>" @@ -379,8 +384,8 @@ msgstr "<النظام>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "نافذة اللعب عبر النت مفتوح بالفعل!" @@ -405,8 +410,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -428,13 +431,13 @@ msgstr "" "\n" "يجب عليك إعادة توجيه البرنامج منفذ الهوست!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "اسرار" @@ -550,11 +553,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضف" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "إضافة رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "أضف باتش" @@ -562,9 +565,9 @@ msgstr "أضف باتش" msgid "Add new pane" msgstr "إضافة جزء جديد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "أضف" @@ -602,36 +605,36 @@ msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "إعدادات متقدمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملفات الجيم كيوب (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "حفظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "جميع ملفات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "جميع الملفات (*.*)|*.*" @@ -659,7 +662,7 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل ملف من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -677,7 +680,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاف." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "العربية" @@ -686,21 +689,21 @@ msgstr "العربية" msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذف \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -709,12 +712,12 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال مفتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "صوت الخلفية :" @@ -722,7 +725,7 @@ msgstr "صوت الخلفية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "تلقائي" @@ -761,7 +764,7 @@ msgstr "BP تسجل" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "إعدادات الخلفية" @@ -779,7 +782,7 @@ msgstr "خلفية الإدخال" msgid "Backward" msgstr "الى الوراء" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "سيء بداية الملف " @@ -792,11 +795,11 @@ msgstr "" msgid "Banner" msgstr "بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "تفاصيل بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "بنر:" @@ -808,7 +811,7 @@ msgstr "شريط" msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -837,7 +840,7 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "أسفل" @@ -846,11 +849,11 @@ msgstr "أسفل" msgid "Bound Controls: %lu" msgstr "يلزم التحكم: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "معطلة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "أستعرض" @@ -858,15 +861,15 @@ msgstr "أستعرض" msgid "Browse for a directory to add" msgstr "لتصفح دليل لإضافة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "العازلة :" @@ -876,7 +879,7 @@ msgstr "العازلة :" msgid "Buttons" msgstr "أزرار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -898,7 +901,7 @@ msgstr "العصا الأيمن " msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" @@ -920,7 +923,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -935,9 +938,9 @@ msgstr "" msgid "Cancel" msgstr "إلغاء" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "لا يمكن فتح %s" @@ -946,7 +949,7 @@ msgstr "لا يمكن فتح %s" msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -957,7 +960,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب ملف بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -969,7 +972,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "الكاتالونية" @@ -977,11 +980,11 @@ msgstr "الكاتالونية" msgid "Center" msgstr "مركز" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "تغيير" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "تغيير &القرص" @@ -989,11 +992,11 @@ msgstr "تغيير &القرص" msgid "Change Disc" msgstr "تغيير القرص" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "تغيير اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1009,11 +1012,11 @@ msgstr "Changes sign to zFar Parameter (بعد التصحيح)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (بعد التصحيح)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "تغيير هذه ليس لها أي أثر في حين أن المحاكي قيد التشغيل!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "شات" @@ -1029,39 +1032,39 @@ msgstr "بحث عن اسرار" msgid "Cheats Manager" msgstr "قائمة الاسرار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "تحقق سلامة التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "التحقق من سلامة ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "الصينية المبسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "الصينية التقليدية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Choose a NAND root directory:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "اختيار ايزو الافتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "اختيار دليل لإضافة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "اختيار ملف لفتح" @@ -1069,15 +1072,15 @@ msgstr "اختيار ملف لفتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "اختيار ملف لاستخدام رافعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله فقط)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1096,7 +1099,7 @@ msgstr "الكلاسيكية" msgid "Clear" msgstr "أزال" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1106,7 +1109,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "إغلاق" @@ -1131,7 +1134,7 @@ msgstr "الأمر" msgid "Comment" msgstr "التعليق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "التعليق:" @@ -1143,12 +1146,12 @@ msgstr "ضغط ايزو" msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "إعدادات" @@ -1162,22 +1165,22 @@ msgstr "إعدادات" msgid "Configure Control" msgstr "إعدادات التحكم" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "تكوين منصات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة فوق ملف" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "تأكيد على التوقف" @@ -1186,17 +1189,17 @@ msgstr "تأكيد على التوقف" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "ربط كيبورد يو اس بي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr " توصيل ويموت%i" @@ -1217,7 +1220,7 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "توصيل" @@ -1237,7 +1240,7 @@ msgstr "عصا تحكم" msgid "Convert to GCI" msgstr "GCIتحويل إلى " -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "فشل نسخ" @@ -1246,7 +1249,7 @@ msgstr "فشل نسخ" msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "الأساسية" @@ -1260,7 +1263,7 @@ msgstr "لا يمكن إنشاء %s" msgid "Could not initialize backend %s." msgstr "لا يمكن تهيئة الخلفية %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1271,24 +1274,16 @@ msgstr "" "backup. يرجى ملاحظة أن جيم كيوب الأصلي وأقراص الوي لا يمكن قراءتها من قبل " "معظم أجهزة الكمبيوتر محركات الأقراص دي في دي." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "لا يمكن التعرف ملف ايزو %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "لا يمكن حفظ %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" -"(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1302,11 +1297,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور فتح الأوامر للتمديد 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1319,7 +1314,7 @@ msgstr "" msgid "Count:" msgstr "الاحصاء :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "البلد:" @@ -1359,12 +1354,12 @@ msgstr "" msgid "Crossfade" msgstr "الإبهات المتداخل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "هاك مخصص العرض" @@ -1372,11 +1367,11 @@ msgstr "هاك مخصص العرض" msgid "Custom Projection Hack Settings" msgstr "إعدادات هاك مخصص العرض" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "التشيكية" @@ -1388,36 +1383,36 @@ msgstr "D" msgid "D-Pad" msgstr "الاسهم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD Root:" @@ -1429,7 +1424,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1437,7 +1432,7 @@ msgstr "" msgid "Data Size" msgstr "حجم البيانات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "التاريخ :" @@ -1474,8 +1469,8 @@ msgstr "ضغط ايزو" msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "فك ايزو" @@ -1488,7 +1483,7 @@ msgstr "تحديث القائمة" msgid "Default" msgstr "الافتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "ايزو الافتراضية :" @@ -1530,8 +1525,8 @@ msgstr "" msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1543,7 +1538,7 @@ msgstr "الاتصال الهاتفي" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1610,7 +1605,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "القرص" @@ -1637,24 +1632,60 @@ msgstr "" msgid "Divide" msgstr "انقسام" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "دولفين" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "موقع دولفين" @@ -1670,12 +1701,12 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولفين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1683,7 +1714,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "دولفين على مدونة قوقل" @@ -1701,12 +1732,12 @@ msgid "" msgstr "" "تم تعيين دولفين حاليا إخفاء جميع الألعاب. دبل كليك هنا لإظهار جميع الألعاب..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1733,11 +1764,11 @@ msgstr "%lu وأضاف %lu تم تحميل الاسرار " msgid "Drums" msgstr "الطبول" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Dump Audio" @@ -1783,9 +1814,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "الهولندية" @@ -1814,7 +1845,7 @@ msgstr "أوروبا" msgid "Early Memory Updates" msgstr "بداية تحديث الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "تحرير" @@ -1826,16 +1857,20 @@ msgstr "تعديل رمز ActionReplay" msgid "Edit Config" msgstr "تعديل الاعدادات" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "تعديل الباتش" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "تحرير" @@ -1847,7 +1882,7 @@ msgstr "تأثير" msgid "Embedded Frame Buffer" msgstr "عازل الإطار المضمن " -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "المحاكي قيد التشغيل بالفعل" @@ -1880,7 +1915,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "محاكاة ويموت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "حالة المحاكاه: " @@ -1909,11 +1944,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "تمكين منع الدمج" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" @@ -1921,27 +1956,27 @@ msgstr "تمكين تنظيم حساب الإطار" msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "تمكين الاسرار " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "MMU تمكين" @@ -1949,7 +1984,7 @@ msgstr "MMU تمكين" msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقف" @@ -1957,7 +1992,7 @@ msgstr "تمكين شاشة التوقف" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" @@ -1979,7 +2014,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد X1." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2015,33 +2050,27 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشفق الاميرة. لتعطيل أي لعبة أخرى." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2054,7 +2083,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذه غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2074,9 +2103,9 @@ msgstr "" msgid "End" msgstr "نهاية" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "الإنجليزية" @@ -2105,11 +2134,11 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "خطأ" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية." @@ -2138,7 +2167,6 @@ msgid "Euphoria" msgstr "" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2147,16 +2175,21 @@ msgstr "" msgid "Execute" msgstr "تنفيذ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "تصدير جميع الحفظ" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "فشل تصدير" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "فشل تصدير" @@ -2164,7 +2197,7 @@ msgstr "فشل تصدير" msgid "Export Recording" msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "تصدير تسجيل" @@ -2180,9 +2213,10 @@ msgstr "تصدير حفظ الوي" msgid "Export all saves" msgstr "تصدير جميع الحفظ" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "فشل تصدير، حاول مرة أخرى؟" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "فشل تصدير" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2204,44 +2238,44 @@ msgstr "معلمة إضافية" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "استخراج كافة الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "استخراج Apploader" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "استخراج الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "استخراج كافة الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "استخراج" @@ -2257,11 +2291,11 @@ msgstr "لاعبين" msgid "FRANCE" msgstr "فرنسا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "الحجم :" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "خطأ الاتصال" @@ -2269,7 +2303,7 @@ msgstr "خطأ الاتصال" msgid "Failed to download codes." msgstr "اللعبه لاتوجد في قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "فشل في الاستخراج إلى %s!" @@ -2301,16 +2335,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "فشل في قراءة banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2337,12 +2371,12 @@ msgid "" "(0x6000-0x7FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "فشل في قراءة البيانات من ملف %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2359,7 +2393,7 @@ msgid "" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2369,29 +2403,34 @@ msgid "" "(0x0000-0x1FFF)" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "فشل لكتابة عنوان لملف %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "فشل في قراءة معرف فريد من صورة القرص" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "فشل لكتابة bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "فشل في قراءة البيانات من ملف %d" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "فشل لكتابة عنوان لملف %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "الفارسية" @@ -2403,17 +2442,17 @@ msgstr "سريع" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل في كل لعبة MMU إصدار سريع من." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "لاعبين" @@ -2454,16 +2493,16 @@ msgstr "لم يتم التعرف على الملف كملف بطاقة ذاكر msgid "File not compressed" msgstr "ملف غير مضغوط " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع الملف غير معروف! لن تفتح!" @@ -2491,7 +2530,7 @@ msgstr "العرض 16:9" msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "فرض وحدة التحكم على النظام الياباني" @@ -2523,7 +2562,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2543,7 +2582,7 @@ msgstr "" msgid "Forward" msgstr "إلى الأمام" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2552,6 +2591,11 @@ msgstr "" msgid "Found %d results for '" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "لا يمكن حفظ %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2581,7 +2625,7 @@ msgstr "مجموعة الإطار " msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "حد الإطار:" @@ -2593,9 +2637,9 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "الفرنسية" @@ -2608,7 +2652,7 @@ msgstr "الحنق" msgid "From" msgstr "من" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "شاشه كامله" @@ -2620,7 +2664,7 @@ msgstr "دقة العرض :" msgid "GCI File(*.gci)" msgstr "GCI File(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "تحكم الجيم كيوب" @@ -2628,27 +2672,27 @@ msgstr "تحكم الجيم كيوب" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "معرف اللعبة:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "لعبة تستخدم بالفعل!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "اللعبة ليست على التوالي!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "إعدادات معينه للعبه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "إعدادات اللعبة" @@ -2656,7 +2700,7 @@ msgstr "إعدادات اللعبة" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "ملفات حفظ لعبة جيم كيوب(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "جيم كيوب" @@ -2665,16 +2709,16 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "تحميل اسرار" @@ -2690,7 +2734,7 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "عام" @@ -2699,9 +2743,9 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "الألمانية" @@ -2710,11 +2754,11 @@ msgstr "الألمانية" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "إعدادات الرسومات" @@ -2738,7 +2782,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "اليونانية" @@ -2766,7 +2810,7 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري فشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "العبرية" @@ -2778,7 +2822,7 @@ msgstr "ارتفاع" msgid "Help" msgstr "مساعدة" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2790,7 +2834,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2830,7 +2874,7 @@ msgid "Home" msgstr "الصفحة الرئيسية" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "هوست" @@ -2839,11 +2883,11 @@ msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "الهنغارية" @@ -2851,12 +2895,12 @@ msgstr "الهنغارية" msgid "Hybrid Wiimote" msgstr "ويموت هجين" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2865,11 +2909,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL إعدادات" @@ -2885,11 +2929,11 @@ msgstr "IR المؤشر" msgid "IR Sensitivity:" msgstr "IR حساسية:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "تفاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "مجلد الايزو" @@ -2901,7 +2945,7 @@ msgstr "إيطاليا" msgid "Icon" msgstr " أيقونة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2945,9 +2989,15 @@ msgstr "" msgid "Import Save" msgstr "حفظ استيراد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "فشل الاستيراد، حاول مرة أخرى؟" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "حفظ استيراد" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "فشل تصدير" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -2965,21 +3015,17 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "تتعطل في اللعبة" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "في اللعبة" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "حد الإطار:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "معلومات" @@ -2999,7 +3045,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشفرة أو فك شفرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -3007,7 +3053,7 @@ msgstr "SD Card ادرج " msgid "Insert name here.." msgstr "أدخل اسم هنا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "wad تثبيت" @@ -3015,39 +3061,40 @@ msgstr "wad تثبيت" msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "تحقق من سلامة الخطأ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "التحقق من سلامة الانتهاء" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "انتهاء التدقيق من سلامة لم يتم العثور على أخطاء" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "واجهة الإعدادات" @@ -3072,15 +3119,15 @@ msgstr "" msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "تتعطل في المقدمة" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" @@ -3110,7 +3157,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "تسجيل الملف غير صالح" @@ -3126,13 +3173,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "غير صالح حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "الإيطالية" @@ -3140,16 +3187,16 @@ msgstr "الإيطالية" msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "اليابانية" @@ -3175,8 +3222,8 @@ msgstr "إبقاء النافذة على أعلى" msgid "Key" msgstr "المفتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "الكورية" @@ -3194,16 +3241,16 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3241,7 +3288,7 @@ msgstr "" msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات في الثانية " @@ -3340,15 +3387,15 @@ msgstr "8 تحميل حالة" msgid "Load State Slot 9" msgstr "1 تحميل حالة " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3367,10 +3414,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "قيمة تحميل إعداد مسبق من هاك نماذج المتوفرة." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "المحلية" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "سجل" @@ -3404,11 +3447,11 @@ msgid "Logger Outputs" msgstr "مختلفان النواتج" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "تسجيل" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "إنقطع الإتصال الملقم!" @@ -3416,14 +3459,14 @@ msgstr "إنقطع الإتصال الملقم!" msgid "M Button" msgstr "M Button" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" @@ -3437,11 +3480,11 @@ msgstr "" msgid "Main Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "معرف المنتج :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "المنتج :" @@ -3472,7 +3515,7 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3482,7 +3525,7 @@ msgid "" "could mangle stuff!" msgstr "إدارة بطاقة الذاكرة تنبية قم بعمل نسخة احتياطية قبل الاستخدام" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3507,7 +3550,7 @@ msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل msgid "Menu" msgstr "القائمة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "الميكروفون" @@ -3520,7 +3563,7 @@ msgstr "منخفض" msgid "Misc" msgstr "متفرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3668,7 +3711,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "فوق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3715,7 +3758,7 @@ msgstr "لم يتم العثور على الايزو " msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "لم يتم العثور على ملف البنر %s" @@ -3741,7 +3784,7 @@ msgstr "" msgid "No recorded file" msgstr "لا ملف مسجل" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "لا حفظ المجلد نتيجة البحث عن العنوان %s" @@ -3750,11 +3793,11 @@ msgstr "لا حفظ المجلد نتيجة البحث عن العنوان %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "النرويجية" @@ -3762,17 +3805,17 @@ msgstr "النرويجية" msgid "Not Equal" msgstr "لا يساوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "غير مجموعة" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "غير متصل" @@ -3818,7 +3861,7 @@ msgstr "الهدف" msgid "Object Range" msgstr "نطاق الهدف" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "إيقاف" @@ -3826,16 +3869,20 @@ msgstr "إيقاف" msgid "Offset:" msgstr "تعويض :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "عرض الرسائل التي تظهر على الشاشة" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "فقط %d كتل متاحة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "فتح" @@ -3848,7 +3895,7 @@ msgstr "فتح المجلد المتضمن" msgid "Open Wii &save folder" msgstr "افتح مجلد حفظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "فتح الملف" @@ -3874,6 +3921,16 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3899,7 +3956,7 @@ msgstr "" msgid "Other" msgstr "أخرى" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3911,7 +3968,7 @@ msgstr "" msgid "Output" msgstr "الإخراج" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "تشغيل التسجيل" @@ -3919,7 +3976,7 @@ msgstr "تشغيل التسجيل" msgid "Pad" msgstr "تحكم" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "تحكم" @@ -3948,21 +4005,21 @@ msgstr "معلمات" msgid "Partition %i" msgstr "قسم %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "مسارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "وقفة" @@ -3975,7 +4032,7 @@ msgstr "توقف في نهاية الفيلم" msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "مثالية" @@ -3985,9 +4042,9 @@ msgid "Perspective %d" msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "بدأ اللعبه" @@ -3999,7 +4056,7 @@ msgstr "تشغيل التسجيل" msgid "Play/Pause" msgstr "بدأ/ايقاف" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "قابلة للتشغيل" @@ -4007,11 +4064,11 @@ msgstr "قابلة للتشغيل" msgid "Playback Options" msgstr "خيارات التشغيل" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4023,36 +4080,36 @@ msgstr "الرجاء إنشاء منظور قبل الحفظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "البولندية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "تحكم 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "المنفذ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "البرتغالية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "البرتغالية البرازيلية" @@ -4060,17 +4117,17 @@ msgstr "البرتغالية البرازيلية" msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4103,7 +4160,7 @@ msgstr "الملف الشخصي" msgid "Properties" msgstr "خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "إزالة التخزين المؤقت" @@ -4111,8 +4168,8 @@ msgstr "إزالة التخزين المؤقت" msgid "Question" msgstr "السؤال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "خروج" @@ -4173,6 +4230,11 @@ msgstr "ويموت حقيقي " msgid "Record" msgstr "تسجيل" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "تسجيل الخيارات" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "تسجيل معلومات" @@ -4208,7 +4270,7 @@ msgstr "" "إذا لم تكن متأكدا حدد لا شيء." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "تحديث" @@ -4217,14 +4279,14 @@ msgstr "تحديث" msgid "Refresh List" msgstr "تحديث قائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "تحديث القائمة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "إزالة" @@ -4255,7 +4317,7 @@ msgstr "النتائج" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4273,13 +4335,12 @@ msgstr "العصا الايمن" msgid "Rumble" msgstr "هزاز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "الروسية" @@ -4292,7 +4353,7 @@ msgid "Safe" msgstr "آمنة" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "حفظ" @@ -4353,28 +4414,28 @@ msgstr "8 حفظ حالة" msgid "Save State Slot 9" msgstr "1 حفظ حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "حفظ حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "حفظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "حفظ مضغوط GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "حفظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "حفظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4396,7 +4457,7 @@ msgstr "بحث ايزو" msgid "Scanning..." msgstr "فحص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "التقاط صوره" @@ -4412,7 +4473,7 @@ msgstr "بحث" msgid "Search Filter" msgstr "بحث فلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "البحث في المجلدات الفرعية" @@ -4435,12 +4496,12 @@ msgstr "" msgid "Select" msgstr "حدد" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "اختر ملف تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملف" @@ -4462,19 +4523,19 @@ msgstr "اختر حفظ ملف للاستيراد" msgid "Select floating windows" msgstr "اختر النوافذ العائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "حدد الملف لتحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "حدد حفظ الملف" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "حدد حالة التحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "حدد حالة الحفظ" @@ -4540,7 +4601,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "إرسال" @@ -4552,11 +4613,11 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الفاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "الصربية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "المنفذ التسلسلي 1 -- وهذا هو المنفذ الذي الأجهزة مثل استخدام محول شبكة" @@ -4575,25 +4636,26 @@ msgstr "تعيين كافتراضي بطاقة الذاكرة %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "إعدادات" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملف" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "هزة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "الاسم المختصر :" @@ -4601,23 +4663,28 @@ msgstr "الاسم المختصر :" msgid "Shoulder Buttons" msgstr "أزرار الكتف" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "اظهار &لوحة المراقبة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "اظهار السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "عرض شريط الحالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "أظهر شريط الأدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "الافتراضي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "اظهر محرك الاقراص" @@ -4629,11 +4696,11 @@ msgstr "إظهار نسخة الصادرات للمناطق" msgid "Show FPS" msgstr "أظهر عدد الاطارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "فرنسا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "جيم كيوب" @@ -4641,35 +4708,35 @@ msgstr "جيم كيوب" msgid "Show Input Display" msgstr "إظهار مدخلات العرض" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "إيطاليا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "أظهر اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "عرض سجل الاعدادات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "اوروبا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "عرض الاجهزه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "إظهار المناطق" @@ -4677,27 +4744,27 @@ msgstr "إظهار المناطق" msgid "Show Statistics" msgstr "إظهار الإحصاءات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "امريكا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Wad اظهار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "ظهور رسالة قبل وقف اللعبة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4715,7 +4782,7 @@ msgstr "إظهار اول كتلة" msgid "Show lag counter" msgstr "إظهار عداد التأخر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4749,7 +4816,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "غير معروف" @@ -4767,7 +4834,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "الصينية المبسطة" @@ -4775,11 +4842,11 @@ msgstr "الصينية المبسطة" msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4803,17 +4870,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "فتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "B خانة " @@ -4821,7 +4888,7 @@ msgstr "B خانة " msgid "Snapshot" msgstr "لقطة" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Software Renderer" @@ -4836,7 +4903,7 @@ msgstr "" "انها مفيدة فقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "إعدادات الصوت" @@ -4854,9 +4921,9 @@ msgstr "فشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "الأسبانية" @@ -4884,37 +4951,29 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد 528*640 ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "تسريع معدل نقل القرص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "مربع العصا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "بدء &اللعب عبر الشبكة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "بدء التسجيل" @@ -4930,7 +4989,7 @@ msgstr "الحالة" msgid "State Saves" msgstr "حفظ الحالة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "عجلة القيادة" @@ -4939,7 +4998,7 @@ msgid "Stick" msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "اغلق اللعبه" @@ -4970,16 +5029,16 @@ msgstr "داعب الأ وتار" msgid "Subtract" msgstr "طرح" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "بنجاح تصدير الملف إلى %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "استيرادها بنجاح حفظ الملفات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4987,18 +5046,18 @@ msgstr "" msgid "Swing" msgstr "هز" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "نظام اللغة :" @@ -5027,13 +5086,13 @@ msgstr "الجدول الأيسر" msgid "Table Right" msgstr "الجدول الأيمن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5053,7 +5112,7 @@ msgstr "Texture Cache" msgid "Texture Format Overlay" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr " بنجاح wad وقد تم تركيب" @@ -5065,13 +5124,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالفعل في قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5126,30 +5185,30 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "حفظ تحاول نسخة له حجم ملف غير صالح" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" "لا يتم اعتماد اللغة المحددة من قبل النظام. يتراجع إلى النظام الافتراضية." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "الملقم والعميل إصدارات لعب نت تتعارض" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "الملقم ممتلئ" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "أجاب الخادم : اللعبة قيد التشغيل حاليا" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "بعث الملقم رسالة خطأ غير معروف" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "" @@ -5158,17 +5217,17 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "ثيم:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5180,7 +5239,7 @@ msgid "" "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل نفسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء في القائمة لوى وبعض الألعاب." @@ -5196,7 +5255,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5207,7 +5266,7 @@ msgstr "" "لجعلها فعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الافتراضية " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5257,7 +5316,7 @@ msgstr "EFB Copies" msgid "Toggle Fog" msgstr "تبديل جميع أنواع السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" @@ -5267,11 +5326,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "الصينية التقليدية" @@ -5293,7 +5352,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "التركية" @@ -5346,7 +5405,7 @@ msgstr "" "decrypted code. Make sure you typed it correctly.\n" "هل ترغب في تجاهل هذا الخط ، ومواصلة تحليل?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "غير محدود %i" @@ -5383,12 +5442,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "تلقى رسالة مجهولة مع معرف : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5407,7 +5466,7 @@ msgstr "التحديث" msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " @@ -5419,7 +5478,7 @@ msgstr "استخدام شاشة كاملة" msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "" @@ -5444,6 +5503,15 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5466,7 +5534,7 @@ msgstr "فائدة" msgid "V-Sync" msgstr "تحديد أقصى معدل الاطار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU سرعة هاك" @@ -5491,7 +5559,7 @@ msgstr "" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "فديو" @@ -5499,17 +5567,17 @@ msgstr "فديو" msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "الصوت" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "خطأ في إنشاء wad: فشل التثبيت %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "خطأ في إنشاء wad: فشل التثبيت %s" @@ -5543,7 +5611,7 @@ msgstr "" msgid "Warning - starting ISO in wrong console mode!" msgstr "تحذير -- ايزو ابتداء من الخطأ وضع وحدة التحكم!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5567,7 +5635,7 @@ msgstr "" "ولها نفس اسم الملف على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5575,7 +5643,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5583,7 +5651,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5619,23 +5687,19 @@ msgstr "شاشة واسعة هاك" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "استيراد حفظ الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "ملفات حفظ الوي (*.bin)|*.bin" @@ -5644,7 +5708,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: لا يمكن القراءة من الملف" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "تحكم الوي" @@ -5653,7 +5717,7 @@ msgstr "تحكم الوي" msgid "Wiimote %i" msgstr "ويموت %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5661,7 +5725,7 @@ msgstr "ويموت متصل" msgid "Wiimote Motor" msgstr "محرك ويموت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "إعدادات ويموت" @@ -5685,14 +5749,14 @@ msgstr "نوافذ اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "العمل" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5752,7 +5816,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "لا يمكنك إغلاق أجزاء الصفحات التي فيها." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "عليك اختيار لعبة!" @@ -5768,7 +5832,7 @@ msgstr "يجب إدخال صالح العشري، أو الست عشرية قي msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم الملف صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولفين من أجل التغيير نافذ المفعول." @@ -5779,7 +5843,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5796,7 +5860,7 @@ msgstr "" "يجب أن يكون 0x%04x (but is 0x%04llx)\n" "هل تريد إنشاء واحدة جديدة?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP هاك" @@ -5862,7 +5926,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5875,7 +5939,17 @@ msgstr "iCacheJIT: قراءة شفرة تشغيل من %x. الرجاء التق msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "تلقى رسالة مجهولة مع معرف : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5894,9 +5968,19 @@ msgstr "أو" #~ msgid "Accurate VBeam emulation" #~ msgstr "Accurate VBeam emulation" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" +#~ "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" + #~ msgid "Enable Hotkeys" #~ msgstr "تمكين الاختصارات" +#~ msgid "Export failed, try again?" +#~ msgstr "فشل تصدير، حاول مرة أخرى؟" + #~ msgid "Failed to Listen!!" #~ msgstr "لم اسمع!" @@ -5906,14 +5990,26 @@ msgstr "أو" #~ msgid "GCMic Configuration" #~ msgstr "GCMic اعدادات" +#~ msgid "Import failed, try again?" +#~ msgstr "فشل الاستيراد، حاول مرة أخرى؟" + +#~ msgid "In-Game" +#~ msgstr "في اللعبة" + #~ msgid "Last Overwritten State" #~ msgstr "الكتابة فوق آخر حالة" #~ msgid "Last Saved State" #~ msgstr "آخر حالة محفوظة" +#~ msgid "Local" +#~ msgstr "المحلية" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "إعادة تحميل حالة ويموت" #~ msgid "Set" #~ msgstr "ضبط" + +#~ msgid "Wii Save Import" +#~ msgstr "استيراد حفظ الوي" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index b094d1d84c..8237fad821 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: Puniasterus \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/dolphin-emu/" @@ -26,9 +26,9 @@ msgstr "" msgid " (too many to display)" msgstr "(massa per ensenyar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Joc:" @@ -45,7 +45,7 @@ msgstr "" "\"%s \" no existeix.\n" " Crear una nova targeta de memòria de 16MB?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." @@ -70,8 +70,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s ja existeix, vols sobreescriure?" @@ -109,12 +109,17 @@ msgstr "" "El fitxer no és suficientment gran per ser una targeta de memòria vàlida (0x" "%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s no s'ha pogut obrir" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s no s'ha pogut obrir" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s és un arxiu de 0 bytes" @@ -124,7 +129,7 @@ msgstr "%s és un arxiu de 0 bytes" msgid "%s is already compressed! Cannot compress it further." msgstr "%s ja està comprimit! No es pot comprimir encara més." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "" @@ -155,7 +160,7 @@ msgstr "%u Blocs lliures; %u entrades de dir. lliures" msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Sobre..." @@ -163,7 +168,7 @@ msgstr "&Sobre..." msgid "&Boot from DVD Drive..." msgstr "&Arrencar des de la unitat de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Punts d'interrupció" @@ -171,7 +176,7 @@ msgstr "&Punts d'interrupció" msgid "&Browse for ISOs..." msgstr "&Cerca ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Gestor de &Trucs" @@ -195,11 +200,11 @@ msgstr "&Emulació" msgid "&File" msgstr "&Arxiu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Avança imatge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Pantalla completa" @@ -207,7 +212,7 @@ msgstr "&Pantalla completa" msgid "&Graphics Settings" msgstr "Configuració de &gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Ajuda" @@ -215,7 +220,7 @@ msgstr "&Ajuda" msgid "&Hotkey Settings" msgstr "Configuració de &tecles d'accés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -227,11 +232,11 @@ msgstr "&Càrrega estat" msgid "&Memcard Manager (GC)" msgstr "&Administrador de targeta de memòria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Obrir..." @@ -239,11 +244,11 @@ msgstr "&Obrir..." msgid "&Options" msgstr "&Opcions" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Executar" @@ -251,39 +256,39 @@ msgstr "&Executar" msgid "&Properties" msgstr "&Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "Modalitat de només &lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&So" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Aturar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Visualitzar" @@ -372,7 +377,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -380,7 +385,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -388,8 +393,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Una finestra de NetPlay ja està oberta!!" @@ -416,8 +421,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -443,13 +446,13 @@ msgstr "" "\n" "Has de redireccionar el port TCP per fer d'amfitrió!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-placa base" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Codis AR " @@ -582,11 +585,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Afegeix Pedaç" @@ -594,9 +597,9 @@ msgstr "Afegeix Pedaç" msgid "Add new pane" msgstr "Afegeix una nova finestra" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Afegir..." @@ -648,36 +651,36 @@ msgstr "Ajustar la pressió de control analògic per activar els botons." msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Configuració avançada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tots els arxius GC/Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Totes les imatges GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tots els Estats Guardats (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tots els fitxers ISO comprimits de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" @@ -705,7 +708,7 @@ msgstr "Apploader té una mida dolenta... realment és un apploader?" msgid "Apploader unable to load from file" msgstr "Apploader no s'ha pogut carregar des de l'arxiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -723,7 +726,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Àrab" @@ -732,7 +735,7 @@ msgstr "Àrab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Estàs segur que vols suprimir \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -740,15 +743,15 @@ msgstr "" "Estàs segur que vols eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà definitiva!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (experimental)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -757,12 +760,12 @@ msgstr "Relació d'aspecte:" msgid "At least one pane must remain open." msgstr "Almenys un panell ha de romandre obert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Suport d'àudio:" @@ -770,7 +773,7 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -809,7 +812,7 @@ msgstr "Registre BP" msgid "Back" msgstr "Enrere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Configuració del motor" @@ -827,7 +830,7 @@ msgstr "Suport d'entrada" msgid "Backward" msgstr "Suport" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Mala capçalera a l'arxiu" @@ -840,11 +843,11 @@ msgstr "" msgid "Banner" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Detalls del Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Imatge:" @@ -856,7 +859,7 @@ msgstr "Barra" msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -885,7 +888,7 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Fons" @@ -894,11 +897,11 @@ msgstr "Fons" msgid "Bound Controls: %lu" msgstr "Controls enllaçats: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Trencat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Examinar" @@ -906,15 +909,15 @@ msgstr "Examinar" msgid "Browse for a directory to add" msgstr "Examineu un directori per afegir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Examina un directori ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Examina el directori de sortida" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -924,7 +927,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botons" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -948,7 +951,7 @@ msgstr "Palanca-C" msgid "CP reg" msgstr "Registre CP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" @@ -971,7 +974,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -986,9 +989,9 @@ msgstr "" msgid "Cancel" msgstr "Cancel·lar" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "No es pot obrir% s" @@ -997,7 +1000,7 @@ msgstr "No es pot obrir% s" msgid "Cannot unregister events with events pending" msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1008,7 +1011,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1020,7 +1023,7 @@ msgstr "" msgid "Caps Lock" msgstr "Bloc Maj." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Català" @@ -1028,11 +1031,11 @@ msgstr "Català" msgid "Center" msgstr "Centre" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Canviar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Canviar &Disc..." @@ -1040,11 +1043,11 @@ msgstr "Canviar &Disc..." msgid "Change Disc" msgstr "Canviar Disc" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Canvi de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1060,11 +1063,11 @@ msgstr "Canvia el signe del paràmetre zLluny (després de correcció)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Canvia el signe del paràmetre zAprop (després de correcció)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1080,39 +1083,39 @@ msgstr "Cerca trucs" msgid "Cheats Manager" msgstr "Administrador de trucs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Comprovar la integritat de la partició" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Comprovant integritat..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1120,7 +1123,7 @@ msgstr "Trieu un arxiu per obrir" msgid "Choose a memory card:" msgstr "Triar una targeta de memòria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1128,8 +1131,8 @@ msgstr "" "Trieu l'arxiu a utilitzar com «apploader»: (s'aplica als discos construïts a " "partir de només els directoris)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Selecciona la carpeta on extreure" @@ -1148,7 +1151,7 @@ msgstr "Clàssic" msgid "Clear" msgstr "Esborrar" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1158,7 +1161,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Tancar" @@ -1183,7 +1186,7 @@ msgstr "Comanda" msgid "Comment" msgstr "Comentari" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Comentari:" @@ -1195,12 +1198,12 @@ msgstr "Comprimir ISO..." msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Comprimeix ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Configuració" @@ -1214,22 +1217,22 @@ msgstr "Configuració" msgid "Configure Control" msgstr "Configurar Control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Configurar Control" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" @@ -1238,17 +1241,17 @@ msgstr "Confirmar a l'aturar" msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Connectar el teclat USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Connectar Wiimote %i" @@ -1269,7 +1272,7 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Connectant..." @@ -1289,7 +1292,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Convertir a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Copia fallada" @@ -1298,7 +1301,7 @@ msgstr "Copia fallada" msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Nucli" @@ -1312,7 +1315,7 @@ msgstr "No s'ha pogut crear %s" msgid "Could not initialize backend %s." msgstr "No s'ha pogut inicialitzar el suport %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1323,25 +1326,16 @@ msgstr "" "Wii. Els discs originals de Gamecube i Wii no es poden llegir per la majoria " "de lectors DVD." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "No es pot reconèixer el fitxer ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "No s'ha pogut desar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"No s'ha pogut establir les controls. El jugador esquerra o el joc s'està " -"executant actualment! \n" -"(Configurar els controls mentre el joc s'executa no està actualment suportat)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1355,11 +1349,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1372,7 +1366,7 @@ msgstr "" msgid "Count:" msgstr "Compta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "País:" @@ -1412,12 +1406,12 @@ msgstr "" msgid "Crossfade" msgstr "Atenuar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Projecció personalitzada" @@ -1425,11 +1419,11 @@ msgstr "Projecció personalitzada" msgid "Custom Projection Hack Settings" msgstr "Configuració de la projecció personalitzada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Txec" @@ -1441,36 +1435,36 @@ msgstr "D" msgid "D-Pad" msgstr "Direcció digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Arrel del DVD:" @@ -1482,7 +1476,7 @@ msgstr "DVDLowRead - Error fatal: error al llegir el volumen" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Error fatal: error al llegir el volumen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1490,7 +1484,7 @@ msgstr "" msgid "Data Size" msgstr "Mida de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Data:" @@ -1527,8 +1521,8 @@ msgstr "Descomprimir ISO..." msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Descomprimint ISO" @@ -1541,7 +1535,7 @@ msgstr "Actualitza la llista de jocs" msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "ISO per defecte:" @@ -1584,8 +1578,8 @@ msgstr "" msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1597,7 +1591,7 @@ msgstr "Dial" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1666,7 +1660,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disc" @@ -1693,24 +1687,60 @@ msgstr "" msgid "Divide" msgstr "Divideix" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Decodificador Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuració de gràfics de Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Lloc &Web Dolphin" @@ -1726,12 +1756,12 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1739,7 +1769,7 @@ msgstr "Dolphin Pel·lícules TAS (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuració Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin a &Google Code" @@ -1759,12 +1789,12 @@ msgstr "" "Dolphin està actualment configurat per ocultar tots els jocs. Fea doble clic " "aquí per mostrar-los tots..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin no ha pogut completar l'acció sol·licitada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1791,11 +1821,11 @@ msgstr "Descarregat %lu codis. (Afegits %lu)" msgid "Drums" msgstr "Tambors" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Bolcat d'àudio" @@ -1842,9 +1872,9 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holandès" @@ -1877,7 +1907,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Actualitzacions recents de memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Edita" @@ -1889,16 +1919,20 @@ msgstr "Modificar codi ActionReplay" msgid "Edit Config" msgstr "Modificar configuració" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Modificar el pedaç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Modificar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Modificació..." @@ -1910,7 +1944,7 @@ msgstr "Efecte" msgid "Embedded Frame Buffer" msgstr "Activar la memòria cau d'imatge («Frame Buffer»)" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "El fil de l'emulador ja s'està executant" @@ -1948,7 +1982,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Estat d'emulació:" @@ -1977,11 +2011,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Permetre el càlcul del quadre delimitador" @@ -1989,27 +2023,27 @@ msgstr "Permetre el càlcul del quadre delimitador" msgid "Enable Cache" msgstr "Habilitar memòria cau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Activar Trucs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Habilitar MMU" @@ -2017,7 +2051,7 @@ msgstr "Habilitar MMU" msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" @@ -2025,7 +2059,7 @@ msgstr "Habilitar el protector de pantalla" msgid "Enable Speaker Data" msgstr "Activar altaveu de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" @@ -2048,7 +2082,7 @@ msgstr "" "\n" "Si no n'estàs segur, selecciona 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2084,7 +2118,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2092,11 +2126,11 @@ msgstr "" "Activa aquesta opció per accelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar per a qualsevol altre joc." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2104,19 +2138,11 @@ msgstr "" "Activa la emulació de Dolby Pro Logic II fent servir 5.1 surround. No " "disponible a OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "Activa la emulació de Dolby Pro Logic II. Només pel motor OpenAL." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Activa la emulació de Dolby Pro Logic II. Només pel motor OpenAL. Pot ser " -"que tinguis que renombrar soft_oal.dll a OpenAL.dll perquè funcioni." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2129,7 +2155,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2151,9 +2177,9 @@ msgstr "" msgid "End" msgstr "Fi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Anglès" @@ -2182,11 +2208,11 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " @@ -2219,7 +2245,6 @@ msgid "Euphoria" msgstr "Eufòria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2229,16 +2254,21 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exportar totes les partides desades" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Fallada d'exportació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exportar fitxer" @@ -2246,7 +2276,7 @@ msgstr "Exportar fitxer" msgid "Export Recording" msgstr "Exportar gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exportar gravació..." @@ -2262,9 +2292,10 @@ msgstr "Exportar partida desada Wii (Experimental)" msgid "Export all saves" msgstr "Exportar totes les partides desades" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Exportació fallada, intenteu de nou?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Fallada d'exportació" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2286,44 +2317,44 @@ msgstr "Paràmetre addicional" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paràmetre addicional útil només a ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Extreure tots els arxius..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Extreure Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Extreure DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Extreure directori..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Extreure arxiu..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Extreure partició..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Extraient..." @@ -2339,11 +2370,11 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Mida FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Error al connectar!" @@ -2351,7 +2382,7 @@ msgstr "Error al connectar!" msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2391,16 +2422,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Error al llegir %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "No s'ha pogut llegir Imatge.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2431,12 +2462,12 @@ msgstr "" "No s'ha pogut llegir la taula d'assignació de blocs correctament\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "No s'han pogut llegir les dades des del fitxer %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2457,7 +2488,7 @@ msgstr "" "No es pot llegir el directori correctament \n" "(0x2000-0x3fff)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2469,29 +2500,34 @@ msgstr "" "No s'ha pogut llegir la capçalera correctament\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "No s'ha pogut llegir Identificador únic de la imatge de disc" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "No s'ha pogut escriure BT.DINF a SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "No s'ha pogut escriure bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "No s'han pogut llegir les dades des del fitxer %d" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "No s'ha pogut escriure la capçalera per %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Persa" @@ -2503,11 +2539,11 @@ msgstr "Ràpid" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versió ràpida de la MMU. No funciona per a tots els jocs." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2515,7 +2551,7 @@ msgstr "" "Desincronització fatal. Cancel·lant reproducció. (Error a PlayWiimote: %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Jugador fifo" @@ -2556,16 +2592,16 @@ msgstr "L'arxiu no es pot reconèixer com una targeta de memòria" msgid "File not compressed" msgstr "Arxiu no comprimit" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipus de fitxer 'ini' és desconegut! No s'obrirà!" @@ -2593,7 +2629,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" @@ -2626,7 +2662,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2648,7 +2684,7 @@ msgstr "" msgid "Forward" msgstr "Endavant" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2657,6 +2693,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Trobats %d resultats per '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "No s'ha pogut desar %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2686,7 +2727,7 @@ msgstr "Rang d'imatges" msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Limit d'imatges/s:" @@ -2698,9 +2739,9 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francès" @@ -2713,7 +2754,7 @@ msgstr "Trasts" msgid "From" msgstr "de" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Pantalla completa" @@ -2725,7 +2766,7 @@ msgstr "Resolució de pantalla a pantalla completa:" msgid "GCI File(*.gci)" msgstr "Arxiu de GCI (*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "Control GC" @@ -2733,27 +2774,27 @@ msgstr "Control GC" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID del Joc:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "El joc encara està en marxa!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "El joc no està funcionant!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Joc no trobat!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Configuració de jocs específics" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Configuració de joc" @@ -2761,7 +2802,7 @@ msgstr "Configuració de joc" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Fitxers de guardat de GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2770,16 +2811,16 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Configuració control Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Codis Gecko" @@ -2797,7 +2838,7 @@ msgstr "" "codehandler.bin al directori Sys i reiniciant Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "General" @@ -2806,9 +2847,9 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Alemany" @@ -2819,11 +2860,11 @@ msgstr "" "Aconseguir codi AR: l'índex és major que la grandària de la llista de codis " "%lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Configuració de gràfics" @@ -2849,7 +2890,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Grec" @@ -2877,7 +2918,7 @@ msgstr "Modificacions" msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebreu" @@ -2889,7 +2930,7 @@ msgstr "Alçada" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2901,7 +2942,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2941,7 +2982,7 @@ msgid "Home" msgstr "Inici" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Amfitrió" @@ -2950,11 +2991,11 @@ msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Hongarès" @@ -2962,14 +3003,14 @@ msgstr "Hongarès" msgid "Hybrid Wiimote" msgstr "Wiimote Híbrid" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Ha Tractat d'obtenir dades d'un bitllet desconegut:%08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2978,11 +3019,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Configuració de IPL" @@ -2998,11 +3039,11 @@ msgstr "Punter IR" msgid "IR Sensitivity:" msgstr "Sensibilitat d'IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Directoris ISO:" @@ -3014,7 +3055,7 @@ msgstr "ITÀLIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3058,9 +3099,15 @@ msgstr "" msgid "Import Save" msgstr "Desar importació" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Fallada a l'importació, tornar a provar?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Desar importació" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Fallada d'exportació" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3082,21 +3129,17 @@ msgstr "" "L'Arxiu importat té extensio sav \n" "però la capçalera és incorrecte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "En Joc" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "En-joc" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Limit d'imatges/s:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3116,7 +3159,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserta el codi xifrat o desxifrat aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3124,7 +3167,7 @@ msgstr "Inserir la targeta SD" msgid "Insert name here.." msgstr "Introduïu un nom aquí .." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Instal·lar WAD" @@ -3132,30 +3175,31 @@ msgstr "Instal·lar WAD" msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Instal·lant WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Error de comprovació d'integritat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Comprovació d'integritat finalitzat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Comprovació d'integritat finalitzat. No s'han trobat errors." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3164,11 +3208,11 @@ msgstr "" "Comprovació d'integritat per la partició %d ha fallat. El teu bolcat " "probablement s'ha corromput o s'ha apedaçat incorrectament." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Configuració d'interfície" @@ -3193,15 +3237,15 @@ msgstr "Error intern LZO - lzo_init () ha fallat" msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Introducció" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Mida no vàlida (%x) o paraula màgica (%x)" @@ -3234,7 +3278,7 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" @@ -3250,13 +3294,13 @@ msgstr "Cerca de cadena invàlida (no s'ha pogut convertir a número)" msgid "Invalid search string (only even string lengths supported)" msgstr "Cerca de cadena invàlida (només es soporten algunes longituds)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Estat invàlid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italià" @@ -3264,16 +3308,16 @@ msgstr "Italià" msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japonès" @@ -3299,8 +3343,8 @@ msgstr "Mantenir la finestra sempre visible" msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Corea" @@ -3318,16 +3362,16 @@ msgstr "Botó L" msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Latència:" @@ -3370,7 +3414,7 @@ msgstr "" msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Limitar per FPS " @@ -3469,15 +3513,15 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State Slot 9" msgstr "Carregar ranura d'estat 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Carregar Estat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3496,10 +3540,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carrega els valors preestablerts dels patrons disponibles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Local" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Registre Log" @@ -3533,11 +3573,11 @@ msgid "Logger Outputs" msgstr "Sortides del registrador Log" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Inici de sessió" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Perdut la connexió amb el servidor!" @@ -3545,7 +3585,7 @@ msgstr "Perdut la connexió amb el servidor!" msgid "M Button" msgstr "Botó M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3554,7 +3594,7 @@ msgstr "" "desajust MD5 \n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" @@ -3568,11 +3608,11 @@ msgstr "Arxius MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Palanca principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID Fabricant:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Fabricant:" @@ -3603,7 +3643,7 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Targeta de memòria" @@ -3615,7 +3655,7 @@ msgstr "" "Targeta de memòria Administrador ADVERTÈNCIA-Fes còpies de seguretat abans " "d'utilitzar, hauria d'estar arreglat, però pots perdre dades!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3641,7 +3681,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Micròfon" @@ -3654,7 +3694,7 @@ msgstr "Mínim" msgid "Misc" msgstr "Varis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Varies Configuracions" @@ -3804,7 +3844,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3851,7 +3891,7 @@ msgstr "No s'han trobat ISOs o WADs" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "No s'ha trobat la imatge pel joc %s" @@ -3877,7 +3917,7 @@ msgstr "No hi ha entrades lliures a l'índex de directoris" msgid "No recorded file" msgstr "Arxiu no enregistrat" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" @@ -3886,11 +3926,11 @@ msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" @@ -3898,17 +3938,17 @@ msgstr "Noruega Bokmaal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Sense establir" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "No està connectat" @@ -3954,7 +3994,7 @@ msgstr "Objecte" msgid "Object Range" msgstr "Rang d'objecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Apagar" @@ -3962,16 +4002,20 @@ msgstr "Apagar" msgid "Offset:" msgstr "Desplaçament:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Missatges en pantalla" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Només queden %d blocs disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Obrir" @@ -3984,7 +4028,7 @@ msgstr "Obrir directori &contingut" msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Obrir fitxer..." @@ -4010,6 +4054,16 @@ msgstr "Descodificador de textura OpenCL" msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4035,7 +4089,7 @@ msgstr "" msgid "Other" msgstr "Altres" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4047,7 +4101,7 @@ msgstr "" msgid "Output" msgstr "Sortida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "&Reproduir gravació..." @@ -4055,7 +4109,7 @@ msgstr "&Reproduir gravació..." msgid "Pad" msgstr "Control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Control" @@ -4084,21 +4138,21 @@ msgstr "Paràmetres" msgid "Partition %i" msgstr "Partició %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Pedaços" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Camins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pausa" @@ -4111,7 +4165,7 @@ msgstr "Pausar al acabar la pel·lícula" msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfecte" @@ -4121,9 +4175,9 @@ msgid "Perspective %d" msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Executar" @@ -4135,7 +4189,7 @@ msgstr "Reproduir enregistrament" msgid "Play/Pause" msgstr "Reproduir/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Jugable" @@ -4143,11 +4197,11 @@ msgstr "Jugable" msgid "Playback Options" msgstr "Opcions de reproducció" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Jugadors" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Confirma..." @@ -4159,36 +4213,36 @@ msgstr "Creeu una perspectiva abans de desar" msgid "Plus-Minus" msgstr "Més-Menys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" @@ -4196,17 +4250,17 @@ msgstr "Portuguès (Brasil)" msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Final prematur de la pel·lícula a PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Final prematur de la pel·lícula a PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Final prematur de la pel·lícula a PlayWiimote. %u > %u" @@ -4239,7 +4293,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Netejar memòria cau" @@ -4247,8 +4301,8 @@ msgstr "Netejar memòria cau" msgid "Question" msgstr "Pregunta" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Sortir" @@ -4309,6 +4363,11 @@ msgstr "Wiimotes reals" msgid "Record" msgstr "Enregistrar" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Enregistrant Opcions" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Informació d'enregistrament" @@ -4345,7 +4404,7 @@ msgstr "" "Si no n'estàs segur, selecciona Cap." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Actualitzar" @@ -4354,14 +4413,14 @@ msgstr "Actualitzar" msgid "Refresh List" msgstr "Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Treure" @@ -4392,7 +4451,7 @@ msgstr "Resultats" msgid "Return" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4410,13 +4469,12 @@ msgstr "Palanca dreta" msgid "Rumble" msgstr "Vibració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Rus" @@ -4429,7 +4487,7 @@ msgid "Safe" msgstr "Segur" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Desar" @@ -4490,28 +4548,28 @@ msgstr "Desar ranura estat 8" msgid "Save State Slot 9" msgstr "Desar ranura estat 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Desar Estat..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Desar com..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4534,7 +4592,7 @@ msgstr "Cercant ISOs" msgid "Scanning..." msgstr "Cercant..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Capturar" @@ -4550,7 +4608,7 @@ msgstr "Buscar" msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" @@ -4573,12 +4631,12 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Selecciona el fitxer de gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Selecciona un fitxer WAD de Wii per instal·lar" @@ -4599,19 +4657,19 @@ msgstr "Selecciona un arxiu per guardar la importació" msgid "Select floating windows" msgstr "Selecciona finestres flotants" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Selecciona el fitxer a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Selecciona el fitxer de partida guardada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecciona l'estat a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Selecciona l'estat a guardar" @@ -4677,7 +4735,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Enviar" @@ -4689,11 +4747,11 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4716,7 +4774,7 @@ msgstr "" "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis " "AR %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4724,19 +4782,20 @@ msgstr "" "Ajusta la latència (en ms). Valors més alts poden reduir el soroll. Només " "pel motor Open AL." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Configuració..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: No es troba el fitxer de configuració" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Sacsejar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Nom curt:" @@ -4744,23 +4803,28 @@ msgstr "Nom curt:" msgid "Shoulder Buttons" msgstr "Botons LR" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Mostrar &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Mostrar Barra d'e&stat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Mostrar Barra d'&eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Per defecte" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Mostrar unitats" @@ -4772,11 +4836,11 @@ msgstr "Mostrar regions de copia EFB" msgid "Show FPS" msgstr "Mostra FPS (imatges/s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Mostrar GameCube" @@ -4784,35 +4848,35 @@ msgstr "Mostrar GameCube" msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Mostrar Itàlia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Mostrar Japó" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Mostrar la &Configuració del registre de log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Mostrar Plataformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Mostrar Regions" @@ -4820,27 +4884,27 @@ msgstr "Mostrar Regions" msgid "Show Statistics" msgstr "Mostrar estadístiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar un missatge de confirmació abans d'aturar el joc." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4858,7 +4922,7 @@ msgstr "Mostra primer bloc" msgid "Show lag counter" msgstr "Mostrar contador de lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4896,7 +4960,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Mostrar desconeguda" @@ -4914,7 +4978,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Xinès simplificat" @@ -4922,11 +4986,11 @@ msgstr "Xinès simplificat" msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Saltar la neteja DCBZ" @@ -4951,17 +5015,17 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Ranura B" @@ -4969,7 +5033,7 @@ msgstr "Ranura B" msgid "Snapshot" msgstr "Captura" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Renderitzat per programari" @@ -4985,7 +5049,7 @@ msgstr "" "Realment vols activar el renderitzat per software? Si no n'estàs segur, " "selecciona 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Configuració de so" @@ -5003,9 +5067,9 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Espanyol" @@ -5033,37 +5097,29 @@ msgstr "" "\n" "Si no n'estàs segur, selecciona 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Accelerar la tassa de transferència de Disc" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Palanca quadrada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Control estàndard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Començar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Iniciar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Iniciar grava&ció" @@ -5079,7 +5135,7 @@ msgstr "Estat" msgid "State Saves" msgstr "Estats desats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Volant" @@ -5088,7 +5144,7 @@ msgid "Stick" msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Aturar" @@ -5119,16 +5175,16 @@ msgstr "Cop" msgid "Subtract" msgstr "Extreure" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Arxiu exportat amb èxit a %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Arxius de partides desades importats correctament" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5136,18 +5192,18 @@ msgstr "" msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5176,13 +5232,13 @@ msgstr "Taula esquerra" msgid "Table Right" msgstr "Taula dreta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Capturar pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5202,7 +5258,7 @@ msgstr "Memòria cau de textura" msgid "Texture Format Overlay" msgstr "Superposició del format de textura" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "El WAD s'ha instal·lat amb èxit" @@ -5214,13 +5270,13 @@ msgstr "L'adreça és invàlida" msgid "The checksum was successfully fixed" msgstr "La suma de comprovació s'ha fixat amb èxit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5277,7 +5333,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "El fitxer de partida guardada que està intentant copiar té la mida invàlida" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5285,23 +5341,23 @@ msgstr "" "L'idioma seleccionat no és compatible amb el seu sistema. Es tornarà a " "l'idioma per defecte del sistema." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "El servidor i les versions de client NetPlay són incompatibles!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "El servidor està ple!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "El servidor ha espòs: el joc està en marxa!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "El servidor ha enviat un missatge d'error desconegut!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "L'arxiu especificat \"%s\" no existeix" @@ -5310,11 +5366,11 @@ msgstr "L'arxiu especificat \"%s\" no existeix" msgid "The value is invalid" msgstr "El valor és invàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Tema visual:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5322,7 +5378,7 @@ msgstr "" "Hi ha d'haver una entrada per 00000001/00000002. El seu bolcat de la NAND " "probablement és incompleta." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5338,7 +5394,7 @@ msgstr "" "Aquest simulador d'ActionReplay no és compatible amb els codis que " "modifiquen ActionReplay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." @@ -5362,7 +5418,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desactivat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5374,7 +5430,7 @@ msgstr "" "velocitat del joc màxima (NTSC: 60, PAL: 50), també cal deshabilitar la " "regulació de so DSP per a fer-ho efectiu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5428,7 +5484,7 @@ msgstr "Còpies EFB" msgid "Toggle Fog" msgstr "Activar tots els tipus de registre de Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" @@ -5438,11 +5494,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Xinès tradicional" @@ -5466,7 +5522,7 @@ msgstr "" "Intentant de llegir des d'un SYSCONF invàlid \n" "identificadors de Wiimote bt no estan disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turc" @@ -5519,7 +5575,7 @@ msgstr "" "desenciptat vàlid. Assegura't d'haver-lo escrit correctament.\n" "Vols ignorar aquesta línia i continuar analitzant?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "%i Indefinit" @@ -5556,12 +5612,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Tipus desconegut d'entrada %i a SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Missatge desconegut rebut amb id: %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5581,7 +5637,7 @@ msgstr "Actualitzar" msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" @@ -5593,7 +5649,7 @@ msgstr "Utilitzar pantalla completa" msgid "Use Hex" msgstr "Utilitzar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" @@ -5618,6 +5674,15 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5641,7 +5706,7 @@ msgstr "Utilitat" msgid "V-Sync" msgstr "Sincronització Vertical" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "Modificació de velocitat MMU" @@ -5666,7 +5731,7 @@ msgstr "Verbositat" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Vídeo" @@ -5674,17 +5739,17 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "instal·lació del WAD ha fallat: Error en crear %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Instal·lació del WAD ha fallat: Error en crear tiquet" @@ -5718,7 +5783,7 @@ msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertència - Inicialitzant ISO en mode de consola incorrecte!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5744,7 +5809,7 @@ msgstr "" "i que tenen el mateix nom que un arxiu a la targeta de memòria\n" "Voleu continuar?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5756,7 +5821,7 @@ msgstr "" "altre guardat abans de continuar, o carregar aquest amb el mode de només " "lectura desactivat." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5768,7 +5833,7 @@ msgstr "" "aquest amb el mode de només lectura desactivat. Si no probablement tindràs " "una desincronització." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5818,23 +5883,19 @@ msgstr "Modificació de pantalla panoràmica" msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importar partida guardada Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5843,7 +5904,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No s'ha pogut llegir des de l'arxiu" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5852,7 +5913,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5860,7 +5921,7 @@ msgstr "Wiimote connectat" msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Configuració de Wiimote" @@ -5884,14 +5945,14 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Treballant..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5951,7 +6012,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "No pots tancar panells que tenen pàgines." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Heu de triar un joc!" @@ -5967,7 +6028,7 @@ msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid." msgid "You must enter a valid profile name." msgstr "Heu d'introduir un nom de perfil vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -5978,7 +6039,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5997,7 +6058,7 @@ msgstr "" "Hauria de ser 0x%04x (però és 0x%04llx) \n" "Vol generar un de nou?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "Modificador ZTP" @@ -6065,7 +6126,7 @@ msgstr "" "\n" "Si no n'estàs segur, deixa-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6078,7 +6139,17 @@ msgstr "iCacheJIT: Llegint Opcode des de%x Si us plau, informeu." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Missatge desconegut rebut amb id: %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -6109,9 +6180,28 @@ msgstr "| O" #~ "\n" #~ "Si no n'estàs segur, deixa-ho desactivat." +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "No s'ha pogut establir les controls. El jugador esquerra o el joc s'està " +#~ "executant actualment! \n" +#~ "(Configurar els controls mentre el joc s'executa no està actualment " +#~ "suportat)" + #~ msgid "Enable Hotkeys" #~ msgstr "Activar tecles d'accés ràpid" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Activa la emulació de Dolby Pro Logic II. Només pel motor OpenAL. Pot ser " +#~ "que tinguis que renombrar soft_oal.dll a OpenAL.dll perquè funcioni." + +#~ msgid "Export failed, try again?" +#~ msgstr "Exportació fallada, intenteu de nou?" + #~ msgid "Failed to Listen!!" #~ msgstr "Error a l'escoltar!" @@ -6133,12 +6223,21 @@ msgstr "| O" #~ "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = " #~ "compatible, Desactivat = ràpid)" +#~ msgid "Import failed, try again?" +#~ msgstr "Fallada a l'importació, tornar a provar?" + +#~ msgid "In-Game" +#~ msgstr "En-joc" + #~ msgid "Last Overwritten State" #~ msgstr "Últim estat sobreescrit" #~ msgid "Last Saved State" #~ msgstr "Últim estat desat" +#~ msgid "Local" +#~ msgstr "Local" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Tornar a connectar el Wiimote al carregar l'estat" @@ -6147,3 +6246,6 @@ msgstr "| O" #~ msgid "Skip Dest. Alpha Pass" #~ msgstr "Salta pas Dest. Alpha" + +#~ msgid "Wii Save Import" +#~ msgstr "Importar partida guardada Wii" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index b679eadfcd..8e01049f17 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-11 08:08+0000\n" "Last-Translator: Zbyněk Schwarz \n" "Language-Team: Czech (http://www.transifex.com/projects/p/dolphin-emu/" @@ -23,9 +23,9 @@ msgstr "" msgid " (too many to display)" msgstr "(příliš mnoho pro zobrazení)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " Hra : " @@ -42,7 +42,7 @@ msgstr "" "\"%s\" neexistuje.\n" " Vytvořit novou 16MB Paměťovou kartu?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." @@ -67,8 +67,8 @@ msgstr "%d vzorků" msgid "%d samples (quality level %d)" msgstr "%d vzorků (úroveň kvality %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s už existuje, přepsat?" @@ -106,12 +106,17 @@ msgstr "" "soubor není dostatečně velký, aby byl platným souborem paměťové karty (0x%x " "bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s nelze otevřít" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s nelze otevřít" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s má velikost 0 bajtů" @@ -121,7 +126,7 @@ msgstr "%s má velikost 0 bajtů" msgid "%s is already compressed! Cannot compress it further." msgstr "%s je už komprimován! Nelze dále komprimovat." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s je jako jméno příliš dlouhé, max znaků je 45" @@ -150,7 +155,7 @@ msgstr "%u Volných Bloků; %u Volných Záznamů Adr" msgid "&& AND" msgstr "&& A" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "O progr&amu..." @@ -158,7 +163,7 @@ msgstr "O progr&amu..." msgid "&Boot from DVD Drive..." msgstr "&Zavést z DVD Mechaniky..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Body přerušení" @@ -166,7 +171,7 @@ msgstr "&Body přerušení" msgid "&Browse for ISOs..." msgstr "&Procházet pro ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Správce &Cheatů" @@ -190,11 +195,11 @@ msgstr "&Emulace" msgid "&File" msgstr "&Soubor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Postup snímkem" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Celá obrazovka" @@ -202,7 +207,7 @@ msgstr "&Celá obrazovka" msgid "&Graphics Settings" msgstr "&Grafická nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Nápověda" @@ -210,7 +215,7 @@ msgstr "&Nápověda" msgid "&Hotkey Settings" msgstr "Nastavení &klávesových zkratek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -222,11 +227,11 @@ msgstr "&Nahrát Stav" msgid "&Memcard Manager (GC)" msgstr "Správce Pa&měťových karet (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "Pa&měť" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Otevřít..." @@ -234,11 +239,11 @@ msgstr "&Otevřít..." msgid "&Options" msgstr "V&olby" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Přehrát" @@ -246,39 +251,39 @@ msgstr "&Přehrát" msgid "&Properties" msgstr "&Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Režim pouze pro čtení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Resetovat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "Za&stavit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "Nás&troje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Zobrazit" @@ -367,7 +372,7 @@ msgstr "" msgid "" msgstr "<Žádné rozlišení nenalezeno>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -375,7 +380,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -383,8 +388,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay je už otevřené!!" @@ -411,8 +416,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -436,13 +439,13 @@ msgstr "" "\n" "Musíte přesměrovat Váš TCP port na hostitele!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM Základní Deska" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Kódy AR" @@ -573,11 +576,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "Přidat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Přidat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Přidat Záplatu" @@ -585,9 +588,9 @@ msgstr "Přidat Záplatu" msgid "Add new pane" msgstr "Přidat nový panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Přidat..." @@ -639,36 +642,36 @@ msgstr "Upravte tlak analogového ovládání potřebný k aktivaci tlačítek." msgid "Advanced" msgstr "Pokročilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Pokročilá Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Všechny soubory GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Všechny obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Všechny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Všechny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Všechny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Všechny komprimované soubory GC/WII ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Všechny soubory (*.*)|*.*" @@ -696,7 +699,7 @@ msgstr "Zavaděč aplikace má špatnou velikost... je to vážně zavaděč?" msgid "Apploader unable to load from file" msgstr "Zavaděč aplikace nemohl načíst soubor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Zavaděč aplikace:" @@ -714,7 +717,7 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabština" @@ -723,7 +726,7 @@ msgstr "Arabština" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jste si jisti, že chcete smazat \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -731,15 +734,15 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (experimentální)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Poměr Stran:" @@ -748,12 +751,12 @@ msgstr "Poměr Stran:" msgid "At least one pane must remain open." msgstr "Alespoň jeden panel musí být otevřen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Podpůrná vrstva zvuku:" @@ -761,7 +764,7 @@ msgstr "Podpůrná vrstva zvuku:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -800,7 +803,7 @@ msgstr "Registr BP" msgid "Back" msgstr "Zpět" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Nastavení podpůrné vrstvy" @@ -818,7 +821,7 @@ msgstr "Zadní Vstup" msgid "Backward" msgstr "Dozadu" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Špatná hlavička souboru" @@ -831,11 +834,11 @@ msgstr "" msgid "Banner" msgstr "Plakát" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Detaily Plakátu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Plakát:" @@ -847,7 +850,7 @@ msgstr "Vibráto" msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Základní nastavení" @@ -876,7 +879,7 @@ msgid "Blue Right" msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Dole" @@ -885,11 +888,11 @@ msgstr "Dole" msgid "Bound Controls: %lu" msgstr "Spojené ovladače: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Rozbité" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Procházet" @@ -897,15 +900,15 @@ msgstr "Procházet" msgid "Browse for a directory to add" msgstr "Procházet pro přidání adresáře" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Procházet pro adresář ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Vyrovnávací paměť:" @@ -915,7 +918,7 @@ msgstr "Vyrovnávací paměť:" msgid "Buttons" msgstr "Tlačítka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -939,7 +942,7 @@ msgstr "Kr-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" @@ -962,7 +965,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" @@ -977,9 +980,9 @@ msgstr "Nelze číst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba msgid "Cancel" msgstr "Zrušit" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Nelze otevřít %s" @@ -988,7 +991,7 @@ msgstr "Nelze otevřít %s" msgid "Cannot unregister events with events pending" msgstr "Nelze odhlásit události, když jsou očekávány" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -999,7 +1002,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1011,7 +1014,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalánština" @@ -1019,11 +1022,11 @@ msgstr "Katalánština" msgid "Center" msgstr "Střed" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Změnit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Vyměnit &Disk..." @@ -1031,11 +1034,11 @@ msgstr "Vyměnit &Disk..." msgid "Change Disc" msgstr "Vyměnit Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Změnit hru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1051,11 +1054,11 @@ msgstr "Změní znaménko na Parametr zFar (po korekci)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Změní znaménko na Parametr zNear (po korekci)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Změna tohoto se neprojeví, pokud emulátor běží!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1071,39 +1074,39 @@ msgstr "Hledání Cheatů" msgid "Cheats Manager" msgstr "Správce Cheatů" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Zkontrolovat celistvost oddílu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Kontrolování celistvosti..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Čínština (Zjednodušená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Čínština (Tradiční)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Zvolte kořenový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Zvolte kořenový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Zvolte adresář k přidání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Zvolte soubor k otevření" @@ -1111,7 +1114,7 @@ msgstr "Zvolte soubor k otevření" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1119,8 +1122,8 @@ msgstr "" "Zvolte soubor, který má být použit jako zavaděč aplikace: (platí pouze pro " "disky sestavené z adresářů)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Zvolte adresář pro umístění extrakce" @@ -1139,7 +1142,7 @@ msgstr "Klasické" msgid "Clear" msgstr "Vyčistit" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1148,7 +1151,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Zavřít" @@ -1173,7 +1176,7 @@ msgstr "Příkaz" msgid "Comment" msgstr "Komentář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Komentář:" @@ -1185,12 +1188,12 @@ msgstr "Komprimovat ISO..." msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Komprimuji ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Nastavení" @@ -1204,22 +1207,22 @@ msgstr "Nastavit" msgid "Configure Control" msgstr "Nastavit Ovládání" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Nastavit Pady" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Potvrdit Přepsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Při zastavení Potvrdit" @@ -1228,17 +1231,17 @@ msgstr "Při zastavení Potvrdit" msgid "Connect" msgstr "Připojit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Připojit USB Klávesnici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Připojit USB Klávesnici" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Připojit Wiimote %i" @@ -1259,7 +1262,7 @@ msgstr "Připojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "Připojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Připojuji..." @@ -1279,7 +1282,7 @@ msgstr "Ctrl" msgid "Convert to GCI" msgstr "Převést na GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopírování selhalo" @@ -1288,7 +1291,7 @@ msgstr "Kopírování selhalo" msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Jádro" @@ -1302,7 +1305,7 @@ msgstr "Nelze vytvořit %s" msgid "Could not initialize backend %s." msgstr "Nelze spustit podpůrnou vrstvu %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1313,24 +1316,16 @@ msgstr "" "Wii. Nezapomeňte, že původní disky GameCube a Wii nepřečte většina PC DVD " "mechanik." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Nelze rozpoznat ISO soubor %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Nelze uložit %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Nelze nastavit pady. Hráč odešel, nebo hra v současnosti běží!.\n" -"(nastavení padů za běhu hry není ještě podporováno)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1351,11 +1346,11 @@ msgstr "" "Objevila se tato chyba po přesunu adresáře s emulátorem?\n" "Pokud ano, pak je třeba znovu zadat umístění vaší paměťové karty v nastavení." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevření přípony 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1368,7 +1363,7 @@ msgstr "" msgid "Count:" msgstr "Počet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Země:" @@ -1408,12 +1403,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Současný adresář se změnil z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Vlastní Hack Projekce" @@ -1421,11 +1416,11 @@ msgstr "Vlastní Hack Projekce" msgid "Custom Projection Hack Settings" msgstr "Nastavení Vlastního Hacku Projekce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Přizpůsobte některé Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Čeština" @@ -1437,36 +1432,37 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE převaděč (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP na samostatném vlákně" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP na samostatném vlákně" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Kořen DVD:" @@ -1478,7 +1474,7 @@ msgstr "DVDLowRead - Fatální chyba: nelze číst ze svazku" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatální chyba: nelze přečíst svazek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1486,7 +1482,7 @@ msgstr "" msgid "Data Size" msgstr "Velikost data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Datum:" @@ -1523,8 +1519,8 @@ msgstr "Dekomprimovat ISO..." msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" @@ -1537,7 +1533,7 @@ msgstr "Obnovit seznam her" msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Výchozí ISO:" @@ -1581,8 +1577,8 @@ msgstr "" msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1594,7 +1590,7 @@ msgstr "Kruhová stupnice" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1662,7 +1658,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disk" @@ -1689,24 +1685,60 @@ msgstr "" msgid "Divide" msgstr "Rozdělit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Chcete současnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dekodér Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "&Webová stránka Dolphin" @@ -1722,12 +1754,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1735,7 +1767,7 @@ msgstr "Doplhin Filmy TAS (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" @@ -1755,12 +1787,12 @@ msgstr "" "Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát " "pro zobrazení všech her..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolhpin nemohl dokončit požadovanou činnost." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1787,11 +1819,11 @@ msgstr "Stáhnuto %lu kódů. (přídáno %lu)" msgid "Drums" msgstr "Bubny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Vypsat Zvuk" @@ -1837,9 +1869,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Nizozemština" @@ -1871,7 +1903,7 @@ msgstr "EVROPA" msgid "Early Memory Updates" msgstr "Předčasné Aktualizace Paměti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Upravit" @@ -1883,16 +1915,20 @@ msgstr "Upravit kód ActionReplay" msgid "Edit Config" msgstr "Upravit nastavení" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Upravit záplatu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Upravit současnou perspektivu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Upravit" @@ -1904,7 +1940,7 @@ msgstr "Efekt" msgid "Embedded Frame Buffer" msgstr "Vnořená Vyr. Pamět Snímků" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" @@ -1942,7 +1978,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulovaný Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Stav Emulace:" @@ -1970,11 +2006,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Zapnout Slučování Bloků" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Povolit výpočet ohraničujícího rámečku" @@ -1982,27 +2018,27 @@ msgstr "Povolit výpočet ohraničujícího rámečku" msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Povolit Cheaty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Povolit Přeskakování Nečinných Příkazů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit Přeskakování Nečinných Příkazů (zrychlení)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Zapnout MMU" @@ -2010,7 +2046,7 @@ msgstr "Zapnout MMU" msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Povolit Spořič Obrazovky" @@ -2018,7 +2054,7 @@ msgstr "Povolit Spořič Obrazovky" msgid "Enable Speaker Data" msgstr "Povolit data reproduktorů" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Povolit Širokoúhlou obrazovku" @@ -2040,7 +2076,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2077,7 +2113,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2085,11 +2121,11 @@ msgstr "" "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " "pro VŠECHNY ostatní hry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2097,22 +2133,13 @@ msgstr "" "Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Není " "dostupné v OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Pouze pro " "podpůrnou vrstvu OpenAL." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Pouze pro " -"podpůrnou vrstvu OpenAL. Možná bude třeba přejmenovat soft_oal.dll na " -"OpenAL32.dll aby toto fungovalo." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2125,7 +2152,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2147,9 +2174,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Angličtina" @@ -2178,11 +2205,11 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Chyba" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." @@ -2214,7 +2241,6 @@ msgid "Euphoria" msgstr "Euforie" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Obslužná rutina výjimky - přístup pod paměťovým místem. %08llx%08llx" @@ -2223,16 +2249,21 @@ msgstr "Obslužná rutina výjimky - přístup pod paměťovým místem. %08llx% msgid "Execute" msgstr "Spustit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exportovat všechny Uložené hry" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Export Selhal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exportovat Soubor" @@ -2240,7 +2271,7 @@ msgstr "Exportovat Soubor" msgid "Export Recording" msgstr "Exportovat Nahrávku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exportovat Nahrávku..." @@ -2256,9 +2287,10 @@ msgstr "Exportovat uloženou hru Wii (Experimentální)" msgid "Export all saves" msgstr "Exportovat všechny Uložené hry" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Exportování selhalo, zkusit znovu?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Export Selhal" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2280,44 +2312,44 @@ msgstr "Extra Parametr" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parametr užitečný pouze v ''Metroid: Other M''" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Extrahovat Všechny Soubory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Extrahovat Zavaděč Aplikace..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Extrahovat DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Extrahovat Adresář..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Extrahovat Soubor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Extrahuji Všechny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Extrahuji..." @@ -2333,11 +2365,11 @@ msgstr "Přehrávač FIFO" msgid "FRANCE" msgstr "FRANCIE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Velikost FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Připojení Selhalo!" @@ -2345,7 +2377,7 @@ msgstr "Připojení Selhalo!" msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2386,16 +2418,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Nelze přečíst %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Nelze číst z banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Nelze přečíst hlavičku bk" @@ -2426,12 +2458,12 @@ msgstr "" "Nelze správně číst alokační tabulku bloku\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Nelze číst data ze souboru %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Čtení dat ze souboru selhalo: %s" @@ -2452,7 +2484,7 @@ msgstr "" "Nelze správně číst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Nelze přečíst hlavičku" @@ -2464,29 +2496,34 @@ msgstr "" "Nelze správně číst hlavičku\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Selhal zápis hlavičky souboru %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Nelze přečíst jedinečné ID z obrazu disku" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Selhal zápis BT.DINF do SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Zápis bkhdr selhal" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Čtení dat ze souboru selhalo: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Zápis hlavičky selhal pro %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Selhal zápis hlavičky souboru %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Perština" @@ -2498,11 +2535,11 @@ msgstr "Rychlá" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hře." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2510,7 +2547,7 @@ msgstr "" "závažná desynchronizace. Přehrávání ukončeno. (Chyba v PlayWiimote: %u != " "%u, bajt %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Přehrávač Fifo" @@ -2551,16 +2588,16 @@ msgstr "Soubor nerozpoznán jako paměťová karta" msgid "File not compressed" msgstr "Soubor není komprimovaný" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Neznámý režim otevření : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" @@ -2588,7 +2625,7 @@ msgstr "Vynutit 16:9" msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" @@ -2620,7 +2657,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2642,7 +2679,7 @@ msgstr "" msgid "Forward" msgstr "Dopředu" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2651,6 +2688,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Nalezeno %d výsledků pro '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Nelze uložit %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2680,7 +2722,7 @@ msgstr "Rozsah Snímku" msgid "Frame S&kipping" msgstr "Přes&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Limit Snímků:" @@ -2692,9 +2734,9 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myši" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francouzština" @@ -2707,7 +2749,7 @@ msgstr "Pražce" msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "CelObr" @@ -2719,7 +2761,7 @@ msgstr "Rozlišení celé obrazovky:" msgid "GCI File(*.gci)" msgstr "Soubor GCI(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GCPad" @@ -2727,27 +2769,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID Hry:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Hra už běží!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Hra neběží!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Hra nenalezena!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Nastavení Konkrétní Hry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Nastavení Hry" @@ -2755,7 +2797,7 @@ msgstr "Nastavení Hry" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Soubory uložených her GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2764,16 +2806,16 @@ msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Gamecube Pad nastavení" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Kódy Gecko" @@ -2789,7 +2831,7 @@ msgstr "" "(buď špatný kód, nebo typ kódu není ještě podporován. Zkuste použít )" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Obecné" @@ -2798,9 +2840,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Němčina" @@ -2809,11 +2851,11 @@ msgstr "Němčina" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index je větší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Grafická nastavení" @@ -2838,7 +2880,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Řečtina" @@ -2866,7 +2908,7 @@ msgstr "Hacky" msgid "Header checksum failed" msgstr "Kontrolní součet hlavičky selhal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebrejština" @@ -2878,7 +2920,7 @@ msgstr "Výška" msgid "Help" msgstr "Nápověda" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2900,7 +2942,7 @@ msgstr "" "\n" "Sajonara!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2939,7 +2981,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Hostovat" @@ -2948,11 +2990,11 @@ msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Maďarština" @@ -2960,12 +3002,12 @@ msgstr "Maďarština" msgid "Hybrid Wiimote" msgstr "Hybridní Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2978,11 +3020,11 @@ msgstr "" "IDNázvu %016llx.\n" "Dolphin se teď pravděpodobně zasekne." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - špatný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Nastavení IPL" @@ -2998,11 +3040,11 @@ msgstr "Infračer. Ukazovátko" msgid "IR Sensitivity:" msgstr "Citlivost Infračer.:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Adresáře ISO" @@ -3014,7 +3056,7 @@ msgstr "ITÁLIE" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3058,9 +3100,15 @@ msgstr "" msgid "Import Save" msgstr "Importovat Uloženou hru" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Import selhal, zkusit znovu?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importovat Uloženou hru" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Export Selhal" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3082,21 +3130,17 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlavičku\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Ve Hře" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "Ve Hře" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Limit Snímků:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3116,7 +3160,7 @@ msgstr "Vložit" msgid "Insert Encrypted or Decrypted code here..." msgstr "Zde vložte Zašifrovaný nebo Rozšifrovaný kód..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3124,7 +3168,7 @@ msgstr "Vložit SD Kartu" msgid "Insert name here.." msgstr "Zde vložte jméno..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Instalovat WAD" @@ -3132,30 +3176,31 @@ msgstr "Instalovat WAD" msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Chyba v kontrole celistvosti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Kontrola celistvosti dokončena" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Kontrola celistvosti dokončena. Nebyly nalezeny žádné chyby." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3164,11 +3209,11 @@ msgstr "" "Kontrola celistvosti oddílu %d selhala. Váš výpis ISO je pravěpodobně " "poškozen nebo byl nesprávně opraven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Nastavení Rozhraní" @@ -3193,15 +3238,15 @@ msgstr "Vnitřní chyba LZO - lzo_init() selhalo" msgid "Internal Resolution:" msgstr "Vnitřní Rozlišení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Převaděč (VELMI pomalé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Neplatná Velikost(%x) nebo Kouzelné slovo (%x)" @@ -3234,7 +3279,7 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" @@ -3250,13 +3295,13 @@ msgstr "Neplatný řetězec hledání (nelze převést na číslo)" msgid "Invalid search string (only even string lengths supported)" msgstr "Neplatný řetězec hledání (jsou podporovány pouze sudé délky řetězce)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Neplatný stav" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italština" @@ -3264,16 +3309,16 @@ msgstr "Italština" msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporučeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japonština" @@ -3299,8 +3344,8 @@ msgstr "Okno vždy navrchu" msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Korejština" @@ -3318,16 +3363,16 @@ msgstr "Tlačítko L" msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Jazyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Zpoždění:" @@ -3370,7 +3415,7 @@ msgstr "" msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Limitovat podle SzS" @@ -3469,15 +3514,15 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State Slot 9" msgstr "Nahrát Slot Stavu 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3496,10 +3541,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Načíst přednastavené hodnoty z dostupných hackových vzorů." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Místní" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Záznam" @@ -3533,11 +3574,11 @@ msgid "Logger Outputs" msgstr "Výstup Zapisovače" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Protokolování" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Připojení k serveru ztraceno!" @@ -3545,7 +3586,7 @@ msgstr "Připojení k serveru ztraceno!" msgid "M Button" msgstr "Tlačítko M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3554,7 +3595,7 @@ msgstr "" "MD5 se neshoduje\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" @@ -3568,11 +3609,11 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Hlavní Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID Výrobce:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Výrobce:" @@ -3608,7 +3649,7 @@ msgid "Memory Byte" msgstr "Bajt Paměti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Paměťová karta" @@ -3620,7 +3661,7 @@ msgstr "" "Správce Paměťových karet Varování-Před použitím zálohujte, měl by být " "spravený, ale mohl by věci poškodit!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3645,7 +3686,7 @@ msgstr "Velikost paměťové karty se neshoduje s velikosti hlavičky" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mikrofon" @@ -3658,7 +3699,7 @@ msgstr "Min" msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3808,7 +3849,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3855,7 +3896,7 @@ msgstr "Nenalezena žádná ISO nebo WADS" msgid "No audio output" msgstr "Žádný zvukový výstup" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Nebyl nalezen žádný plakát s názvem %s" @@ -3881,7 +3922,7 @@ msgstr "Žádné volné záznamy indexu adresáře" msgid "No recorded file" msgstr "Žádný soubor s nahrávkou" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" @@ -3890,11 +3931,11 @@ msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norský Bokmål" @@ -3902,17 +3943,17 @@ msgstr "Norský Bokmål" msgid "Not Equal" msgstr "Nerovná se" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "není uložená hra Wii nebo nelze číst z hlavičky souboru o velikosti %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Nepřipojen" @@ -3958,7 +3999,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Vypnuto" @@ -3966,16 +4007,20 @@ msgstr "Vypnuto" msgid "Offset:" msgstr "Logická Adresa:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Zobrazovat zprávy na obrazovce" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Otevřít" @@ -3988,7 +4033,7 @@ msgstr "Otevřít &adresář umístění" msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Otevřít soubor..." @@ -4014,6 +4059,16 @@ msgstr "OpenCL Dekodér Textury" msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4039,7 +4094,7 @@ msgstr "" msgid "Other" msgstr "Jiné" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4050,7 +4105,7 @@ msgstr "" msgid "Output" msgstr "Výstup" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "S&pustit nahrávku..." @@ -4058,7 +4113,7 @@ msgstr "S&pustit nahrávku..." msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Pad " @@ -4087,21 +4142,21 @@ msgstr "Parametry" msgid "Partition %i" msgstr "Oddíl %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Cesty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pozastavit" @@ -4114,7 +4169,7 @@ msgstr "Pozastavit na konci filmu" msgid "Per-Pixel Lighting" msgstr "Osvětlení Podle Pixelu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Dokonalá" @@ -4124,9 +4179,9 @@ msgid "Perspective %d" msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Spustit" @@ -4138,7 +4193,7 @@ msgstr "Přehrát nahrávku" msgid "Play/Pause" msgstr "Přehrát/Pozastavit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Hratelné" @@ -4146,11 +4201,11 @@ msgstr "Hratelné" msgid "Playback Options" msgstr "Možnosti Přehrávání" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Hráči" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Prosím potvrďte..." @@ -4162,36 +4217,36 @@ msgstr "Před uložením si prosím vytvořte perspektivu" msgid "Plus-Minus" msgstr "Plus-Mínus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polština" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugalština" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugalština (Brazilská)" @@ -4199,17 +4254,17 @@ msgstr "Portugalština (Brazilská)" msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Předčasný konec filmu v PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Předčasný konec filmu v PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Předčasný konec filmu v PlayWiimote. %u > %u" @@ -4242,7 +4297,7 @@ msgstr "Profil" msgid "Properties" msgstr "Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Zahodit Vyrovnávací Paměť" @@ -4250,8 +4305,8 @@ msgstr "Zahodit Vyrovnávací Paměť" msgid "Question" msgstr "Otázka" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Ukončit" @@ -4312,6 +4367,11 @@ msgstr "Opravdové Wiimoty" msgid "Record" msgstr "Nahrávat" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Možnosti Nahrávání" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Informace o Nahrávání" @@ -4347,7 +4407,7 @@ msgstr "" "Pokud si nejste jisti, vyberte Žádný." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Obnovit" @@ -4356,14 +4416,14 @@ msgstr "Obnovit" msgid "Refresh List" msgstr "Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Obnovit seznam her" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Odstranit" @@ -4394,7 +4454,7 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4412,15 +4472,15 @@ msgstr "Pravý Stick" msgid "Rumble" msgstr "Vibrace" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Spustit DSP HLE a LLE na samostatném vlákně (nedoporučeno: může způsobit " "problémy se zvukem u HLE a zasekávání u LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Ruština" @@ -4433,7 +4493,7 @@ msgid "Safe" msgstr "Bezpečná" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Uložit" @@ -4494,28 +4554,28 @@ msgstr "Uložit do Slotu Stavu 8" msgid "Save State Slot 9" msgstr "Uložit do Slotu Stavu 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Uložit Stav..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Uložit současnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno..." @@ -4537,7 +4597,7 @@ msgstr "Skenuji pro ISO" msgid "Scanning..." msgstr "Skenuji..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "SnímkObrz" @@ -4553,7 +4613,7 @@ msgstr "Hledat" msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Hledat Podadresáře" @@ -4576,12 +4636,12 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4603,19 +4663,19 @@ msgstr "Vyberte soubor s uloženou pozicí pro import" msgid "Select floating windows" msgstr "Vybrat plovoucí okna" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4692,7 +4752,7 @@ msgstr "" "\n" "Pokud si nejste jisti, použijte OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Poslat" @@ -4704,11 +4764,11 @@ msgstr "Umístění Senzorové Tyče:" msgid "Separator" msgstr "Oddělovač" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Srbština" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4729,7 +4789,7 @@ msgstr "Nastavit jako výchozí paměťovou kartu %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index je větší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4737,19 +4797,20 @@ msgstr "" "Nastavá zpoždění (v ms). Vyšší hodnoty mohou snížit praskání zvuku. Pouze " "pro podpůrnou vrstvu OpenAL." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Nastavení..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Nelze najít soubor s nastavením" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Třes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Krátké Jméno:" @@ -4757,23 +4818,28 @@ msgstr "Krátké Jméno:" msgid "Shoulder Buttons" msgstr "Zadní Tlačítka" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Zobrazit &Konzoli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Zobrazit Záznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Zobrazit &Stavový řádek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Zobrazit Panel Nás&trojů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Výchozí" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Zobrazit Disky" @@ -4785,11 +4851,11 @@ msgstr "Zobrazit EFB Regiony Kopie" msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Zobrazit Francii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Zobrazit GameCube" @@ -4797,35 +4863,35 @@ msgstr "Zobrazit GameCube" msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Zobrazit Itálii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Zobrazit JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Zobrazit Koreu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Jazyk Zobrazení:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Zobrazit Nastavení &Záznamu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Zobrazit PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Zobrazit Platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Zobrazit Regiony" @@ -4833,27 +4899,27 @@ msgstr "Zobrazit Regiony" msgid "Show Statistics" msgstr "Zobrazit Statistiky" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Zobrazit Tchaj-wan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Zobrazit USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Zobrazit Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Zobrazit Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Zobrazí rámeček s potvrzením před zastavením hry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4871,7 +4937,7 @@ msgstr "Zobrazit první blok" msgid "Show lag counter" msgstr "Zobrazit počítadlo zpoždění" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4909,7 +4975,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Zobrazit neznámé" @@ -4927,7 +4993,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Šikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Zjednodušená čínština" @@ -4935,11 +5001,11 @@ msgstr "Zjednodušená čínština" msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Přeskočit BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Přeskočit čištění DCBZ" @@ -4963,17 +5029,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -4981,7 +5047,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snímek" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Softwarový Vykreslovač" @@ -4998,7 +5064,7 @@ msgstr "" "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " "zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Nastavení Zvuku" @@ -5016,9 +5082,9 @@ msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Španělština" @@ -5046,37 +5112,29 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Zvýšit rychlost přenosu Disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Čtvercový Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Standardní Ovladač" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Spustit &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Začít na&hrávat" @@ -5092,7 +5150,7 @@ msgstr "Stav" msgid "State Saves" msgstr "Ukládání stavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Volant" @@ -5101,7 +5159,7 @@ msgid "Stick" msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Zastavit" @@ -5132,16 +5190,16 @@ msgstr "Brnkat" msgid "Subtract" msgstr "Odečíst" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Soubor úspěšně exportován do %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Uložení byly úspěšně importovány" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5149,11 +5207,11 @@ msgstr "" msgid "Swing" msgstr "Švihnutí" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Synchronizovat vlákno GPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5161,8 +5219,8 @@ msgstr "" "Synchronizuje vlákna GPU a CPU, aby se zabránilo náhodným zasekáváním v " "režimu dvojitého jádra. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Jazyk Systému:" @@ -5191,13 +5249,13 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Vytvořit Snímek Obrazovky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bonga)" @@ -5217,7 +5275,7 @@ msgstr "Vyrovnávací Paměť Textur" msgid "Texture Format Overlay" msgstr "Překryv Formátu Textury" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD byl úspěšně nainstalován" @@ -5229,13 +5287,13 @@ msgstr "Adresa je neplatná" msgid "The checksum was successfully fixed" msgstr "Kontrolní součet byl úspěšně opraven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5291,7 +5349,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5299,23 +5357,23 @@ msgstr "" "Zvolený jazyk není Vašim systémem podporován. Vracím se na výchozí jazyk " "systému." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Verze serveru a Netplay klienta jsou nekompatibilní!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Server je plný!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Server odpověděl: hra v současnosti běží!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Server zaslal neznámou chybovou zprávu!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Zadaný soubor \"%s\" neexistuje" @@ -5324,11 +5382,11 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Vzhled:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5336,7 +5394,7 @@ msgstr "" "Musí existovat lístek pro 00000001/00000002. Vaše NAND vypsání je " "pravděpodobně neúplné" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5352,7 +5410,7 @@ msgstr "" "Tento simulátor action replay nepodporuje kód, který mění samotný Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v některých hrách." @@ -5376,7 +5434,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5388,7 +5446,7 @@ msgstr "" "měli byste také vypnout Přiškrcení Zvuku v DSP (v závislosti na hře může " "spravit klikání zvuku, ale také může způsobit neustálý hluk)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5441,7 +5499,7 @@ msgstr "EFB Kopie" msgid "Toggle Fog" msgstr "Zapnout Všechny Typy Záznamů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Přepnout na Celou Obrazovku" @@ -5451,11 +5509,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Nahoře" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Tradiční Čínština" @@ -5479,7 +5537,7 @@ msgstr "" "Pokus o čtení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turečtina" @@ -5532,7 +5590,7 @@ msgstr "" "rozšifrovaný kód. Ujistěte se, že jste ho správně zadali.\n" "Chtěli byste tento řádek ignorovat a pokračovat v analýze?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Nedefinován %i" @@ -5569,12 +5627,12 @@ msgstr "Neznámý příkaz 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Neznámý záznam typu %i v SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Přijata neznámá zpráva s id : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!" @@ -5593,7 +5651,7 @@ msgstr "Aktualizovat" msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" @@ -5605,7 +5663,7 @@ msgstr "Použít Celou Obrazovku" msgid "Use Hex" msgstr "Použít Šestnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" @@ -5630,6 +5688,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5652,7 +5719,7 @@ msgstr "Pomůcky" msgid "V-Sync" msgstr "V-Synch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Hack Rychlosti" @@ -5677,7 +5744,7 @@ msgstr "Úroveň" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Obraz" @@ -5685,17 +5752,17 @@ msgstr "Obraz" msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Hlasitost" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalace WAD selhala: chyba při vytváření %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Instalace WAD selhala: chyba při vytváření lístku" @@ -5729,7 +5796,7 @@ msgstr "Varování - ELF se spouští ve špatném režimu konzole!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouští ve špatném režimu konzole!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5753,7 +5820,7 @@ msgstr "" "a mají stejný název jako soubor na Vaši paměťové kartě\n" "Pokračovat?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5765,7 +5832,7 @@ msgstr "" "měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze " "pro čtení." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5777,7 +5844,7 @@ msgstr "" "načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k " "desynchronizaci." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5827,23 +5894,19 @@ msgstr "Hack Širokoúhlého obrazu" msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii Kořen NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Import uložených pozic Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5852,7 +5915,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze číst ze souboru" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5861,7 +5924,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Připojen" @@ -5869,7 +5932,7 @@ msgstr "Wiimote Připojen" msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wiimote nastavení" @@ -5893,14 +5956,14 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Pracuji..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5965,7 +6028,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nemůžete zavřít panely, které mají uvnitř stránky." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Musíte si zvolit hru!!" @@ -5983,7 +6046,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnění změn musíte Dolphin restartovat." @@ -5997,7 +6060,7 @@ msgstr "" "Chtěli byste nyní přestat a problém opravit?\n" "Pokud zvolíte \"Ne\", mlže být zvuk poškozený." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6016,7 +6079,7 @@ msgstr "" "Měl by být 0x%04x (ale je 0x%04llx)\n" "Chcete vytvořit nový?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -6084,7 +6147,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "zavaděč aplikace (.img)" @@ -6097,7 +6160,17 @@ msgstr "iCacheJIT: Přečten Opcode z %x. Prosím nahlaste." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Přijata neznámá zpráva s id : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute při běhu aplikace vrátil -1!" @@ -6131,9 +6204,27 @@ msgstr "| NEBO" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "Nelze najít Wiimote podle bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Nelze nastavit pady. Hráč odešel, nebo hra v současnosti běží!.\n" +#~ "(nastavení padů za běhu hry není ještě podporováno)" + #~ msgid "Enable Hotkeys" #~ msgstr "Povolit klávesové zkratky" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Pouze " +#~ "pro podpůrnou vrstvu OpenAL. Možná bude třeba přejmenovat soft_oal.dll na " +#~ "OpenAL32.dll aby toto fungovalo." + +#~ msgid "Export failed, try again?" +#~ msgstr "Exportování selhalo, zkusit znovu?" + #~ msgid "Failed to Listen!!" #~ msgstr "Naslouchání Selhalo!!" @@ -6158,12 +6249,21 @@ msgstr "| NEBO" #~ "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " #~ "VYPNUTO = Rychlé)" +#~ msgid "Import failed, try again?" +#~ msgstr "Import selhal, zkusit znovu?" + +#~ msgid "In-Game" +#~ msgstr "Ve Hře" + #~ msgid "Last Overwritten State" #~ msgstr "Poslední Přepsaný Stav" #~ msgid "Last Saved State" #~ msgstr "Poslední Uložený Stav" +#~ msgid "Local" +#~ msgstr "Místní" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Znovu připojit Wiimote při Nahrání Stavu" @@ -6185,3 +6285,6 @@ msgstr "| NEBO" #~ "způsobit vážné chyby.\n" #~ "\n" #~ "Pokud si nejste jisti, nechejte odškrtnuté." + +#~ msgid "Wii Save Import" +#~ msgstr "Import uložených pozic Wii" diff --git a/Languages/po/de.po b/Languages/po/de.po index cb256465d0..da87aaebe5 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-05 23:28+0000\n" "Last-Translator: Ghabry \n" "Language-Team: German (http://www.transifex.com/projects/p/dolphin-emu/" @@ -27,9 +27,9 @@ msgstr "" msgid " (too many to display)" msgstr " (zu viele zum anzeigen)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " Spiel: " @@ -46,7 +46,7 @@ msgstr "" "\"%s\" existiert nicht.\n" "Eine neue 16MB Memcard erstellen?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ist kein gültiges GC/Wii-Image oder kein GC/Wii-Image." @@ -71,8 +71,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "" @@ -113,12 +113,17 @@ msgstr "" "Die Datei ist nicht groß genug um eine gültige Memory Card Datei zu sein (0x" "%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s konnte nicht geöffnet werden." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s konnte nicht geöffnet werden." + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "Die Datei %s ist 0 Byte groß." @@ -128,7 +133,7 @@ msgstr "Die Datei %s ist 0 Byte groß." msgid "%s is already compressed! Cannot compress it further." msgstr "%s ist bereits komprimiert und kann nicht erneut komprimiert werden." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "Der Dateiname %s ist zu lang (maximal 45 Zeichen)" @@ -157,7 +162,7 @@ msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" msgid "&& AND" msgstr "&& UND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "Über &Dolphin" @@ -165,7 +170,7 @@ msgstr "Über &Dolphin" msgid "&Boot from DVD Drive..." msgstr "Von &DVD-Laufwerk starten..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Haltepunkte" @@ -173,7 +178,7 @@ msgstr "&Haltepunkte" msgid "&Browse for ISOs..." msgstr "Nach ISOs &suchen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Cheat-Manager" @@ -197,11 +202,11 @@ msgstr "&Emulation" msgid "&File" msgstr "&Datei" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Vollbild" @@ -209,7 +214,7 @@ msgstr "&Vollbild" msgid "&Graphics Settings" msgstr "&Grafikeinstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Hilfe" @@ -217,7 +222,7 @@ msgstr "&Hilfe" msgid "&Hotkey Settings" msgstr "&Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -229,11 +234,11 @@ msgstr "Spielstand &laden" msgid "&Memcard Manager (GC)" msgstr "&Speicherkarten-Verwaltung (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Arbeitsspeicher" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "Ö&ffnen..." @@ -241,11 +246,11 @@ msgstr "Ö&ffnen..." msgid "&Options" msgstr "&Optionen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "Pau&se" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Start" @@ -253,39 +258,39 @@ msgstr "&Start" msgid "&Properties" msgstr "&Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "S&chreibgeschützer Modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "Liste &aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Register" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "S&ound" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "Sto&pp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "E&xtras" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Ansicht" @@ -374,7 +379,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -382,7 +387,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -390,8 +395,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Ein NetPlay-Fenster ist bereits geöffnet!" @@ -418,8 +423,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -444,13 +447,13 @@ msgstr "" "\n" "TCP Port zum Hoster muss geöffnet sein!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR Codes" @@ -583,11 +586,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "ActionReplay-Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -595,9 +598,9 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Hinzufügen..." @@ -649,36 +652,36 @@ msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii-Dateien (elf, dol, gcm, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii-Imagedateien (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM-Dateien (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" @@ -707,7 +710,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -724,7 +727,7 @@ msgstr "" "Schaltet einen Post-Processing Effekt wenn ein Frame beendet wurde. Wenn " "unsicher, wähle (aus)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabisch" @@ -733,7 +736,7 @@ msgstr "Arabisch" msgid "Are you sure you want to delete \"%s\"?" msgstr "Möchtest du wirklich \"%s\" löschen?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -741,16 +744,16 @@ msgstr "" "Sollen diese Dateien wirklich gelöscht werden?\n" "Löschen kann nicht rückgängig gemacht werden!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "ARM JIT (Experimentell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -759,12 +762,12 @@ msgstr "Seitenverhältnis:" msgid "At least one pane must remain open." msgstr "Mindestens eine Palette muss geöffnet bleiben." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -772,7 +775,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Automatisch" @@ -811,7 +814,7 @@ msgstr "BP-Register" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Backend-Einstellungen" @@ -829,7 +832,7 @@ msgstr "Hintergrund-Eingabe" msgid "Backward" msgstr "Rückwärts" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Ungültige Header-Datei" @@ -842,11 +845,11 @@ msgstr "" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Bannerdetails" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Banner:" @@ -858,7 +861,7 @@ msgstr "Leiste" msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -887,7 +890,7 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Unten" @@ -896,11 +899,11 @@ msgstr "Unten" msgid "Bound Controls: %lu" msgstr "Steuerung festlegen: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Defekt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Durchsuchen" @@ -908,15 +911,15 @@ msgstr "Durchsuchen" msgid "Browse for a directory to add" msgstr "Ordner suchen und hinzufügen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -926,7 +929,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Tasten" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -948,7 +951,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" @@ -972,7 +975,7 @@ msgstr "" "\n" "Wenn du dir unsicher bist, wähle es nicht aus." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -987,9 +990,9 @@ msgstr "" msgid "Cancel" msgstr "Abbrechen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Kann %s nicht öffnen" @@ -998,7 +1001,7 @@ msgstr "Kann %s nicht öffnen" msgid "Cannot unregister events with events pending" msgstr "Kann während ausstehenden Events keine bereits Events de-registrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1008,7 +1011,7 @@ msgstr "" "Die Datei %s kann nicht als Speicherkarte verwendet werden, weil sie keine " "gültige Gamecube-Speicherkarte ist." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1020,7 +1023,7 @@ msgstr "" msgid "Caps Lock" msgstr "Feststelltaste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalanisch" @@ -1028,11 +1031,11 @@ msgstr "Katalanisch" msgid "Center" msgstr "Mitte" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Wechseln" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Disc &wechseln..." @@ -1040,11 +1043,11 @@ msgstr "Disc &wechseln..." msgid "Change Disc" msgstr "Disc wechseln" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Spiel wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1060,12 +1063,12 @@ msgstr "Parameter sign zu zFar ändern (nach Korrektur)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Parameter sign zu zNear ändern (nach Korrektur)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1081,39 +1084,39 @@ msgstr "Cheatsuche" msgid "Cheats Manager" msgstr "Cheat-Verwaltung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Prüfe die Unversehrtheit der Partition" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Prüfe die Unversehrtheit der Partition..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Wähle ein NAND Stammverzeichnis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1121,15 +1124,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Wähle eine Datei als Apploader aus: (Gilt nur für Discs aus Verzeichnissen)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Zielordner für Extraktion auswählen" @@ -1148,7 +1151,7 @@ msgstr "Klassik" msgid "Clear" msgstr "Löschen" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1158,7 +1161,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Schließen" @@ -1183,7 +1186,7 @@ msgstr "Befehl" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Kommentar:" @@ -1195,12 +1198,12 @@ msgstr "ISO komprimieren..." msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Komprimiere ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Einstellungen" @@ -1214,22 +1217,22 @@ msgstr "Einstellungen" msgid "Configure Control" msgstr "Steuerung bearbeiten" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Pads konfigurieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Einstellungen ...." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Überschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Beim Beenden bestätigen" @@ -1238,17 +1241,17 @@ msgstr "Beim Beenden bestätigen" msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "USB-Tastatur angeschlossen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "USB-Tastatur angeschlossen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote %i verbinden" @@ -1269,7 +1272,7 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Verbinden..." @@ -1289,7 +1292,7 @@ msgstr "Strg" msgid "Convert to GCI" msgstr "Zu GCI konvertieren" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" @@ -1298,7 +1301,7 @@ msgstr "Kopieren fehlgeschlagen" msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Kern" @@ -1312,7 +1315,7 @@ msgstr "%s konnte nicht erstellt werden" msgid "Could not initialize backend %s." msgstr "Konnte Backend %s nicht initialisieren." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1323,22 +1326,16 @@ msgstr "" "dies ist kein GC/Wii Backup. Bitte beachten Sie, dass die ursprünglichen GC/" "Wii-Discs von den meisten PC-DVD-Laufwerken nicht gelesen werden können." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Konnte ISO-Datei %s nicht erkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Konnte %s nicht speichern" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1362,11 +1359,11 @@ msgstr "" "Wenn einer dieser Fälle zutriffst, solltest du den Speicherort der " "Speicherkarte in den Optionen ändern." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1379,7 +1376,7 @@ msgstr "" msgid "Count:" msgstr "Anzahl:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Land:" @@ -1419,12 +1416,12 @@ msgstr "" msgid "Crossfade" msgstr "Fadenkreuz" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Benutzerdefinierter Projection-Hack" @@ -1432,11 +1429,11 @@ msgstr "Benutzerdefinierter Projection-Hack" msgid "Custom Projection Hack Settings" msgstr "Benutzerdefinierter Projection-Hack Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tschechisch" @@ -1448,36 +1445,36 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "DSP-Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD Laufwerk:" @@ -1491,7 +1488,7 @@ msgstr "" "DVDLowUnencryptedRead - Kritischer Fehler: Datenträger kann nicht gelesen " "werden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1499,7 +1496,7 @@ msgstr "" msgid "Data Size" msgstr "Datengröße" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Datum:" @@ -1536,8 +1533,8 @@ msgstr "ISO dekomprimieren..." msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" @@ -1550,7 +1547,7 @@ msgstr "Spieleliste aktualisieren" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Standard ISO:" @@ -1592,8 +1589,8 @@ msgstr "" msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1605,7 +1602,7 @@ msgstr "Skala" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1668,7 +1665,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disc" @@ -1695,24 +1692,60 @@ msgstr "" msgid "Divide" msgstr "Division" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II Dekodierer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin-&Webseite" @@ -1728,12 +1761,12 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin-FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1741,7 +1774,7 @@ msgstr "Dolphin TAS Filme (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin auf &Google Code" @@ -1761,12 +1794,12 @@ msgstr "" "Dolphin ist so eingestellt, dass alle Spiele versteckt werden. Hier " "doppelklicken um alle Spiele anzuzeigen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin war nicht in der Lage die gewünschte Aktion auszuführen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1793,11 +1826,11 @@ msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" msgid "Drums" msgstr "Trommeln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Audio dumpen" @@ -1846,9 +1879,9 @@ msgstr "" "\n" "Aktiviere diese Option nur, wenn du weißt, was du tust." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holländisch" @@ -1880,7 +1913,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Frühe Speicher Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Bearbeiten" @@ -1892,16 +1925,20 @@ msgstr "ActionReplay Code bearbeiten" msgid "Edit Config" msgstr "Einstellungen bearbeiten" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Patch bearbeiten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Bearbeiten..." @@ -1913,7 +1950,7 @@ msgstr "Effekt" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Emu-Thread läuft bereits." @@ -1953,7 +1990,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Status:" @@ -1980,11 +2017,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Aktiviere Bounding Box Calculation" @@ -1992,27 +2029,27 @@ msgstr "Aktiviere Bounding Box Calculation" msgid "Enable Cache" msgstr "Aktiviere Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Cheats aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (schneller)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "MMU aktivieren" @@ -2020,7 +2057,7 @@ msgstr "MMU aktivieren" msgid "Enable Progressive Scan" msgstr "Progressiven Scan aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Bildschirmschoner aktivieren" @@ -2028,7 +2065,7 @@ msgstr "Bildschirmschoner aktivieren" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Breitbildmodus" @@ -2045,7 +2082,7 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2073,7 +2110,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2081,11 +2118,11 @@ msgstr "" "Dies aktivieren, um \"The Legend of Zelda: Twilight Princess\" zu " "beschleunigen. Dies für JEDES andere Spiel deaktivieren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2093,19 +2130,13 @@ msgstr "" "Dolby Pro Logic II Emulation wird aktiviert, indem 5.1 Surround verwendet " "wird. Nicht für OS X verfügbar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Dolby Pro Logic II Emulation wird aktiviert, indem 5.1 Surround verwendet " "wird. Funktioniert nur mit OpenAL backend." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2114,7 +2145,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2133,9 +2164,9 @@ msgstr "" msgid "End" msgstr "Ende" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Englisch" @@ -2164,11 +2195,11 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Fehler" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " @@ -2201,7 +2232,6 @@ msgid "Euphoria" msgstr "Euphorie" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2210,16 +2240,21 @@ msgstr "" msgid "Execute" msgstr "Ausführen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Alle Spielstände exportieren" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Datei exportieren" @@ -2227,7 +2262,7 @@ msgstr "Datei exportieren" msgid "Export Recording" msgstr "Aufnahme exportieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Aufnahme exportieren..." @@ -2243,9 +2278,10 @@ msgstr "Wii Spielstand exportieren (Experimentell)..." msgid "Export all saves" msgstr "Alle Spielstände exportieren" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Exportieren fehlgeschlagen, ein weiteres mal versuchen?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Exportieren fehlgeschlagen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2267,44 +2303,44 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parameter nur in ''Metroid: Other M'' sinnvoll." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Alle Dateien extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Apploader extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "DOL extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Ordner extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Datei extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Extrahiere alle Dateien" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Extrahiere Ordner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Extrahieren..." @@ -2320,11 +2356,11 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "FRANKREICH" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST Größe:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Verbindungsaufbau fehlgeschlagen!" @@ -2332,7 +2368,7 @@ msgstr "Verbindungsaufbau fehlgeschlagen!" msgid "Failed to download codes." msgstr "Download der Codes fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Extrahieren nach %s ist fehlgeschlagen!" @@ -2364,16 +2400,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Konnte %s nicht lesen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Fehler beim Lesen von banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2404,12 +2440,12 @@ msgstr "" "Konnte die Blockzuteilungtabellen nicht richtig lesen\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Fehler beim Lesen von Daten aus Datei %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2430,7 +2466,7 @@ msgstr "" "Konnte das Verzeichnis nicht richtig lesen\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2442,29 +2478,34 @@ msgstr "" "Konnte den Header nicht richtig lesen\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Fehler beim Schreiben eines Header für Datei %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Fehler beim Lesen einer eindeutigen ID des Disc-Images." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Fehler beim Schreiben von BT.DINF nach SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Fehler beim Schreiben von bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Fehler beim Lesen von Daten aus Datei %d" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Fehler beim Schreiben eines Header für %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Fehler beim Schreiben eines Header für Datei %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Farsi" @@ -2476,17 +2517,17 @@ msgstr "Schnell" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo Player" @@ -2527,16 +2568,16 @@ msgstr "Diese Datei wird nicht als Memorycard anerkannt." msgid "File not compressed" msgstr "Datei nicht komprimiert" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" @@ -2564,7 +2605,7 @@ msgstr "16:9 erzwingen" msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "NTSC-J erzwingen" @@ -2592,7 +2633,7 @@ msgstr "" "\n" "Aktiviere diese Option nur, wenn du weißt, was du tust." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2611,7 +2652,7 @@ msgstr "" msgid "Forward" msgstr "Vorwärts" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2620,6 +2661,11 @@ msgstr "" msgid "Found %d results for '" msgstr "%d Ergebnisse gefunden für '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Konnte %s nicht speichern" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2649,7 +2695,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Framelimit:" @@ -2661,9 +2707,9 @@ msgstr "Bilder zum Aufzeichnen" msgid "Free Look" msgstr "Frei Umsehen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Französisch" @@ -2676,7 +2722,7 @@ msgstr "" msgid "From" msgstr "von" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Vollbild" @@ -2688,7 +2734,7 @@ msgstr "Vollbildauflösung:" msgid "GCI File(*.gci)" msgstr "GCI Datei(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC-Pad" @@ -2696,27 +2742,27 @@ msgstr "GC-Pad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "Spiel-ID:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Spiel wird bereits emuliert!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Spiel wird nicht emuliert!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Spiel nicht gefunden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Spiel-Spezifische Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Spieleinstellungen" @@ -2724,7 +2770,7 @@ msgstr "Spieleinstellungen" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube Speicherdateien (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2733,16 +2779,16 @@ msgid "Gamecube &Pad Settings" msgstr "GameCube &Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube-Speicherkarten (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Einstellungen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko-Codes" @@ -2756,7 +2802,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Allgemein" @@ -2765,9 +2811,9 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Allgemeine Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Deutsch" @@ -2776,11 +2822,11 @@ msgstr "Deutsch" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Der Index ist größer als AR-Codelisten-Größe %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Grafikeinstellungen" @@ -2799,7 +2845,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Griechisch" @@ -2827,7 +2873,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebräisch" @@ -2839,7 +2885,7 @@ msgstr "Höhe" msgid "Help" msgstr "Hilfe" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2851,7 +2897,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2888,7 +2934,7 @@ msgid "Home" msgstr "Pos1" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2897,11 +2943,11 @@ msgid "Hotkey Configuration" msgstr "Kurztastenbelegung" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Kurztasten" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Ungarisch" @@ -2909,14 +2955,14 @@ msgstr "Ungarisch" msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Versucht Daten von einem unbekannten Ticket zu bekommen: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2925,11 +2971,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhaftes Ziel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL-Einstellungen" @@ -2945,11 +2991,11 @@ msgstr "IR-Zeiger" msgid "IR Sensitivity:" msgstr "IR-Empfindlichkeit:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO-Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "ISO-Verzeichnisse" @@ -2961,7 +3007,7 @@ msgstr "ITALIEN" msgid "Icon" msgstr "Symbol" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2993,9 +3039,15 @@ msgstr "" msgid "Import Save" msgstr "Spielstand importieren" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importieren fehlgeschlagen, noch einmal versuchen?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Spielstand importieren" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Exportieren fehlgeschlagen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3017,21 +3069,17 @@ msgstr "" "Importierte Datei hat die Erweiterung sav,\n" "aber besitzt keinen korrekten Header." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Im Spiel" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "In-Game" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Framelimit:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3051,7 +3099,7 @@ msgstr "Einfügen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "SD-Karte eingesetzt" @@ -3059,7 +3107,7 @@ msgstr "SD-Karte eingesetzt" msgid "Insert name here.." msgstr "Namen hier eingeben.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "WAD installieren" @@ -3067,41 +3115,42 @@ msgstr "WAD installieren" msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "WAD installieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Oberfläche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Benutzeroberflächeneinstellungen" @@ -3127,15 +3176,15 @@ msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" @@ -3168,7 +3217,7 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" @@ -3184,13 +3233,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Ungültiger Status" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italienisch" @@ -3198,16 +3247,16 @@ msgstr "Italienisch" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT-Recompiler (Empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL-Recompiler (Experimentell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japanisch" @@ -3230,8 +3279,8 @@ msgstr "" msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Koreanisch" @@ -3249,16 +3298,16 @@ msgstr "L-Taste" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Sprache:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Latenz:" @@ -3301,7 +3350,7 @@ msgstr "" msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "" @@ -3400,15 +3449,15 @@ msgstr "Status aus Slot 8 laden" msgid "Load State Slot 9" msgstr "Status aus Slot 1 laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Status laden..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Wii-Systemmenü laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Systemmenü %d%c laden" @@ -3424,10 +3473,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Lokal" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Log" @@ -3457,11 +3502,11 @@ msgid "Logger Outputs" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Logging" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Die Verbindung zum Server wurde getrennt!" @@ -3469,7 +3514,7 @@ msgstr "Die Verbindung zum Server wurde getrennt!" msgid "M Button" msgstr "Mittlere Taste" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3478,7 +3523,7 @@ msgstr "" "MD5 Konflikt\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3492,11 +3537,11 @@ msgstr "MadCatz Gameshark Dateien(*.gcs)" msgid "Main Stick" msgstr "Main Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "Hersteller-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Hersteller:" @@ -3527,7 +3572,7 @@ msgid "Memory Byte" msgstr "Seicherbyte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Speicherkarte" @@ -3539,7 +3584,7 @@ msgstr "" "Memory-Card Manager WARNUNG - Erstelle Backups bevor der Benutzung. Dies " "sollte zwar gefixt sein, aber könnte dennoch Probleme machen (mangle stuff)!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3566,7 +3611,7 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mikrofon" @@ -3579,7 +3624,7 @@ msgstr "Min" msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3724,7 +3769,7 @@ msgstr "Num Tab" msgid "NP Up" msgstr "Num Hoch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3771,7 +3816,7 @@ msgstr "Keine ISOs oder WADs gefunden" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Keine Banner-Datei für Tittel %s gefunden." @@ -3797,7 +3842,7 @@ msgstr "Keine freien Verzeichnis-Indexeinträge." msgid "No recorded file" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." @@ -3806,11 +3851,11 @@ msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norwegisch" @@ -3818,19 +3863,19 @@ msgstr "Norwegisch" msgid "Not Equal" msgstr "Ungleich" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Nicht Festgelegt" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" "Dies ist kein Wii-Spielstand oder das Lesen der Größenangabe im Dateiheader " "%x ist gescheitert." -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Nicht Verbunden" @@ -3876,7 +3921,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Aus" @@ -3884,16 +3929,20 @@ msgstr "Aus" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Nur %d Blöcke verfügbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Öffnen" @@ -3906,7 +3955,7 @@ msgstr "Beinhaltenden &Ordner öffnen..." msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Datei öffnen..." @@ -3932,6 +3981,16 @@ msgstr "OpenCL Textur-Dekoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Texturen Dekodierer" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3958,7 +4017,7 @@ msgstr "" msgid "Other" msgstr "Andere" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3970,7 +4029,7 @@ msgstr "" msgid "Output" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Au&fnahme abspielen..." @@ -3978,7 +4037,7 @@ msgstr "Au&fnahme abspielen..." msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Pad " @@ -4007,21 +4066,21 @@ msgstr "Parameter" msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Pfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pause" @@ -4034,7 +4093,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfekt" @@ -4044,9 +4103,9 @@ msgid "Perspective %d" msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Start" @@ -4058,7 +4117,7 @@ msgstr "Aufnahme abspielen" msgid "Play/Pause" msgstr "Start/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Spielbar" @@ -4066,11 +4125,11 @@ msgstr "Spielbar" msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4082,36 +4141,36 @@ msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4:" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" @@ -4119,17 +4178,17 @@ msgstr "Portugiesisch (Brasilianisch)" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4162,7 +4221,7 @@ msgstr "Profil" msgid "Properties" msgstr "Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Cache leeren" @@ -4170,8 +4229,8 @@ msgstr "Cache leeren" msgid "Question" msgstr "Frage" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Beenden" @@ -4232,6 +4291,11 @@ msgstr "Echte Wiimotes" msgid "Record" msgstr "" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Aufnahme abspielen" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "" @@ -4262,7 +4326,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Aktualisieren" @@ -4271,14 +4335,14 @@ msgstr "Aktualisieren" msgid "Refresh List" msgstr "Liste aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Entfernen" @@ -4306,7 +4370,7 @@ msgstr "Ergebnisse" msgid "Return" msgstr "Eingabe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4324,13 +4388,12 @@ msgstr "Stick rechts" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russisch" @@ -4343,7 +4406,7 @@ msgid "Safe" msgstr "Sicher" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Speichern" @@ -4404,28 +4467,28 @@ msgstr "In Slot 8 speichern" msgid "Save State Slot 9" msgstr "In Slot 1 speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Spiel speichern..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." @@ -4447,7 +4510,7 @@ msgstr "Suche nach ISOs" msgid "Scanning..." msgstr "Suche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "ScrShot" @@ -4463,7 +4526,7 @@ msgstr "Suche" msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" @@ -4486,12 +4549,12 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Wähle eine Wii WAD zum Installieren aus." @@ -4510,19 +4573,19 @@ msgstr "Speicherdatei zum Importieren auswählen" msgid "Select floating windows" msgstr "Wähle unverankerte Fenster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Status zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4575,7 +4638,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Senden" @@ -4587,11 +4650,11 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4613,25 +4676,26 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Der Index ist größer als die AR-Code-Listengröße %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Einstellungen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Schütteln" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Kurzer Name:" @@ -4639,23 +4703,28 @@ msgstr "Kurzer Name:" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "&Konsole anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "&Log anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "&Statusleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "&Werkzeugleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Standard" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Laufwerke anzeigen" @@ -4667,11 +4736,11 @@ msgstr "" msgid "Show FPS" msgstr "FPS anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Frankreich anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "GameCube anzeigen" @@ -4679,35 +4748,35 @@ msgstr "GameCube anzeigen" msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Italien anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "JAP anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Korea anzeigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Anzeigen auf:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "PAL anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Plattformen anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Regionen anzeigen" @@ -4715,27 +4784,27 @@ msgstr "Regionen anzeigen" msgid "Show Statistics" msgstr "Statistiken anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Taiwan anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "USA anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Wad anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Wii anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Vor dem Beenden der Emulation bestätigen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4755,7 +4824,7 @@ msgstr "Ersten Block anzeigen" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4786,7 +4855,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Unbekannte Anzeigen" @@ -4801,7 +4870,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinesisch (Vereinfacht)" @@ -4809,11 +4878,11 @@ msgstr "Chinesisch (Vereinfacht)" msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "BIOS überspringen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4831,17 +4900,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B:" @@ -4849,7 +4918,7 @@ msgstr "Slot B:" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Software-Renderer" @@ -4861,7 +4930,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Audio-Einstellungen" @@ -4879,9 +4948,9 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spanisch" @@ -4901,37 +4970,29 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Disc-Übertragungsrate beschleunigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Standard-Controller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "&NetPlay starten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "&Aufnahme starten" @@ -4947,7 +5008,7 @@ msgstr "Status" msgid "State Saves" msgstr "Status" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Lenkrad" @@ -4956,7 +5017,7 @@ msgid "Stick" msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Stopp" @@ -4982,16 +5043,16 @@ msgstr "Klimpern" msgid "Subtract" msgstr "Subtrahieren" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Die Datei wurde erfolgreich nach %s exportiert" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Die gespeicherte Datei wurde erfolgreich importiert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4999,18 +5060,18 @@ msgstr "" msgid "Swing" msgstr "Schwingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "GPU-Thread synchronisieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Systemsprache:" @@ -5039,13 +5100,13 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Screenshot erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "" @@ -5065,7 +5126,7 @@ msgstr "" msgid "Texture Format Overlay" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "Die WAD-Datei wurde erfolgreich installiert" @@ -5077,13 +5138,13 @@ msgstr "Die Adresse ist ungültig" msgid "The checksum was successfully fixed" msgstr "Die Prüfsumme wurde erfolgreich korrigiert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Der ausgewählte Ordner befindet sich bereits in der Liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5138,7 +5199,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "Der Spielstand, den du kopieren möchtest, hat eine ungültige Dateigröße." -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5146,24 +5207,24 @@ msgstr "" "Die ausgewählte Sprache wird von Ihrem System nicht unterstützt. Kehre nun " "zum Systemstandart zurück." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "" "Die Version von dem Server und Client´s NetPlay sind zueinander inkompatibel!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Der Server ist voll!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Der Server meldet: Das Spiel läuft derzeit!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Der Server sendete einen unbekannten Fehler!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Die ausgewählte Datei \"%s\" existiert nicht" @@ -5172,11 +5233,11 @@ msgstr "Die ausgewählte Datei \"%s\" existiert nicht" msgid "The value is invalid" msgstr "Der eingegebene Wert ist ungültig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Design:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5184,7 +5245,7 @@ msgstr "" "Es müsste ein Ticket für 00000001/00000002 vorhanden sein. Ihr NAND-Dump ist " "wahrscheinlich unvollständig." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5201,7 +5262,7 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dies könnte zu Verlangsamung im Wii-Menü und einigen Spielen führen." @@ -5217,7 +5278,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -5225,7 +5286,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5279,7 +5340,7 @@ msgstr "EFB Kopien" msgid "Toggle Fog" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Vollbildmodus umschalten" @@ -5289,11 +5350,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinesisch (Traditionell)" @@ -5317,7 +5378,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Türkisch" @@ -5365,7 +5426,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Undefiniert %i" @@ -5402,12 +5463,12 @@ msgstr "Unbekannter Befehl 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Unbekannter Eintrag-Typ %i in SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Unbekannte Meldung mit ID: %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5427,7 +5488,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" @@ -5439,7 +5500,7 @@ msgstr "Verwende gesamten Bildschirm" msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" @@ -5459,6 +5520,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5476,7 +5546,7 @@ msgstr "Hilfsmittel" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Speed Hack" @@ -5501,7 +5571,7 @@ msgstr "Ausführung" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Video" @@ -5509,17 +5579,17 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Lautstärke" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-Installation fehlgeschlagen: Konnte %s nicht erstellen" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "WAD-Installation fehlgeschlagen: Fehler bei der Ticket-Erstellung" @@ -5549,7 +5619,7 @@ msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Warnung - Starte ISO im falschen Consolen-Modus!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5573,7 +5643,7 @@ msgstr "" "besitzen.\n" "Möchtest du fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5585,7 +5655,7 @@ msgstr "" "einen anderen Spielstand, bevor du fortfährst oder lade diesen Spielstand im " "schreibgeschützen Modus." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5597,7 +5667,7 @@ msgstr "" "oder lade diesen Spielstand im schreibgeschützen Modus, andernfalls könnten " "Desyncs auftreten." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5650,23 +5720,19 @@ msgstr "Breitbild-Hack" msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii-Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Wii-Spielstand importieren" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-Speicherdaten (*.bin)|*.bin" @@ -5675,7 +5741,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Konnte die Datei nicht lesen" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5684,7 +5750,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5692,7 +5758,7 @@ msgstr "Wiimote Verbunden" msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wiimote-Einstellungen" @@ -5716,14 +5782,14 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Arbeite..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5788,7 +5854,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Es können keine Paletten geschlossen werden, die Seiten behinhalten." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Sie müssen ein Spiel auswählen!" @@ -5804,7 +5870,7 @@ msgstr "Du musst eine gültige Dezimal-, Hexadezimal- oder Oktalzahl eingeben." msgid "You must enter a valid profile name." msgstr "Sie müssen einen gültigen Profilamen eingeben!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Sie müssen Dolphin neu starten, damit die Änderungen wirksam werden." @@ -5818,7 +5884,7 @@ msgstr "" "Möchtest du die Emulation anhalten und das Problem beheben?\n" "Wenn du \"Nein\" wählst, könnte die Audiowiedergabe merkwürdig klingen." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5837,7 +5903,7 @@ msgstr "" "Erwartet wurde eine Größe von 0x%04x (aber deine ist 0x%04llx).\n" "Soll eine neue Datei generiert werden?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP-Hack" @@ -5887,7 +5953,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -5900,7 +5966,17 @@ msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Unbekannte Meldung mit ID: %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute gab beim Anwendungsstart -1 zurück!" @@ -5922,6 +5998,9 @@ msgstr "| ODER" #~ msgid "Enable Hotkeys" #~ msgstr "Kurztasten aktivieren" +#~ msgid "Export failed, try again?" +#~ msgstr "Exportieren fehlgeschlagen, ein weiteres mal versuchen?" + #~ msgid "Failed to load bthprops.cpl" #~ msgstr "bthprops.cpl konnte nicht geladen werden." @@ -5940,11 +6019,23 @@ msgstr "| ODER" #~ "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, " #~ "OFF = Schnell)" +#~ msgid "Import failed, try again?" +#~ msgstr "Importieren fehlgeschlagen, noch einmal versuchen?" + +#~ msgid "In-Game" +#~ msgstr "In-Game" + #~ msgid "Last Overwritten State" #~ msgstr "Letzter überschriebener Status" #~ msgid "Last Saved State" #~ msgstr "Letzter gespeicherter Status" +#~ msgid "Local" +#~ msgstr "Lokal" + #~ msgid "Set" #~ msgstr "Zuweisen" + +#~ msgid "Wii Save Import" +#~ msgstr "Wii-Spielstand importieren" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 5f7d5bc380..27a4ececa1 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,9 +21,9 @@ msgstr "" msgid " (too many to display)" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "" @@ -38,7 +38,7 @@ msgid "" " Create a new 16MB Memcard?" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -63,8 +63,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "" @@ -95,12 +95,17 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, c-format +msgid "%s failed: kr=%x" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "" @@ -110,7 +115,7 @@ msgstr "" msgid "%s is already compressed! Cannot compress it further." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "" @@ -139,7 +144,7 @@ msgstr "" msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "" @@ -147,7 +152,7 @@ msgstr "" msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "" @@ -155,7 +160,7 @@ msgstr "" msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "" @@ -179,11 +184,11 @@ msgstr "" msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "" @@ -191,7 +196,7 @@ msgstr "" msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "" @@ -199,7 +204,7 @@ msgstr "" msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "" @@ -211,11 +216,11 @@ msgstr "" msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "" @@ -223,11 +228,11 @@ msgstr "" msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "" @@ -235,39 +240,39 @@ msgstr "" msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "" @@ -355,7 +360,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -363,7 +368,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -371,8 +376,8 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "" @@ -396,8 +401,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -406,13 +409,13 @@ msgid "" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "" @@ -524,11 +527,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "" @@ -536,9 +539,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "" @@ -576,36 +579,36 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "" @@ -633,7 +636,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "" @@ -648,7 +651,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -657,21 +660,21 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "" @@ -680,12 +683,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "" @@ -693,7 +696,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "" @@ -729,7 +732,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "" @@ -747,7 +750,7 @@ msgstr "" msgid "Backward" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "" @@ -760,11 +763,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "" @@ -776,7 +779,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "" @@ -805,7 +808,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "" @@ -814,11 +817,11 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "" @@ -826,15 +829,15 @@ msgstr "" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "" @@ -844,7 +847,7 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -866,7 +869,7 @@ msgstr "" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "" @@ -883,7 +886,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -898,9 +901,9 @@ msgstr "" msgid "Cancel" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "" @@ -909,7 +912,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -917,7 +920,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -927,7 +930,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -935,11 +938,11 @@ msgstr "" msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "" @@ -947,11 +950,11 @@ msgstr "" msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -965,11 +968,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "" @@ -985,39 +988,39 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "" @@ -1025,14 +1028,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "" @@ -1051,7 +1054,7 @@ msgstr "" msgid "Clear" msgstr "" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1059,7 +1062,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "" @@ -1084,7 +1087,7 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "" @@ -1096,12 +1099,12 @@ msgstr "" msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "" @@ -1115,22 +1118,22 @@ msgstr "" msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "" @@ -1139,16 +1142,16 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Connect Balance Board" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1169,7 +1172,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "" @@ -1189,7 +1192,7 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "" @@ -1198,7 +1201,7 @@ msgstr "" msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "" @@ -1212,7 +1215,7 @@ msgstr "" msgid "Could not initialize backend %s." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1220,22 +1223,16 @@ msgid "" "most PC DVD drives." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1249,11 +1246,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1264,7 +1261,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "" @@ -1301,12 +1298,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "" @@ -1314,11 +1311,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" @@ -1330,36 +1327,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "" @@ -1371,7 +1368,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1379,7 +1376,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "" @@ -1416,8 +1413,8 @@ msgstr "" msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "" @@ -1429,7 +1426,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "" @@ -1471,8 +1468,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "" @@ -1484,7 +1481,7 @@ msgstr "" msgid "Direct3D11" msgstr "" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "" @@ -1534,7 +1531,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "" @@ -1558,24 +1555,60 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "" @@ -1591,12 +1624,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1604,7 +1637,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "" @@ -1620,12 +1653,12 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" @@ -1649,11 +1682,11 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "" @@ -1690,9 +1723,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1721,7 +1754,7 @@ msgstr "" msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "" @@ -1733,16 +1766,20 @@ msgstr "" msgid "Edit Config" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "" @@ -1754,7 +1791,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "" @@ -1781,7 +1818,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "" @@ -1803,11 +1840,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1815,27 +1852,27 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "" @@ -1843,7 +1880,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "" @@ -1851,7 +1888,7 @@ msgstr "" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "" @@ -1868,7 +1905,7 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1894,33 +1931,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -1929,7 +1960,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -1946,9 +1977,9 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1977,11 +2008,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2008,7 +2039,6 @@ msgid "Euphoria" msgstr "" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2017,16 +2047,20 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +msgid "Export All Wii Saves" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "" @@ -2034,7 +2068,7 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "" @@ -2050,8 +2084,8 @@ msgstr "" msgid "Export all saves" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +msgid "Export failed" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 @@ -2074,44 +2108,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "" @@ -2127,11 +2161,11 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "" @@ -2139,7 +2173,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2171,16 +2205,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2204,12 +2238,12 @@ msgid "" "(0x6000-0x7FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2226,7 +2260,7 @@ msgid "" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2236,29 +2270,34 @@ msgid "" "(0x0000-0x1FFF)" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, c-format +msgid "Failed to read header for file %d" +msgstr "" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, c-format +msgid "Failed to write data to file: %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "" @@ -2270,17 +2309,17 @@ msgstr "" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "" @@ -2317,16 +2356,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2354,7 +2393,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "" @@ -2378,7 +2417,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2395,7 +2434,7 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2404,6 +2443,11 @@ msgstr "" msgid "Found %d results for '" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, c-format +msgid "Found %x save files" +msgstr "" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2433,7 +2477,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "" @@ -2445,9 +2489,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "" @@ -2460,7 +2504,7 @@ msgstr "" msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "" @@ -2472,7 +2516,7 @@ msgstr "" msgid "GCI File(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "" @@ -2480,27 +2524,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "" @@ -2508,7 +2552,7 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "" @@ -2517,16 +2561,16 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "" @@ -2540,7 +2584,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "" @@ -2549,9 +2593,9 @@ msgstr "" msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "" @@ -2560,11 +2604,11 @@ msgstr "" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "" @@ -2583,7 +2627,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "" @@ -2611,7 +2655,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "" @@ -2623,7 +2667,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2635,7 +2679,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2665,7 +2709,7 @@ msgid "Home" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "" @@ -2674,11 +2718,11 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "" @@ -2686,12 +2730,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2700,11 +2744,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "" @@ -2720,11 +2764,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "" @@ -2736,7 +2780,7 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2768,8 +2812,12 @@ msgstr "" msgid "Import Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +msgid "Import Wii Save" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +msgid "Import failed" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 @@ -2788,20 +2836,16 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 msgid "Increase Frame limit" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "" @@ -2821,7 +2865,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "" @@ -2829,7 +2873,7 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "" @@ -2837,39 +2881,40 @@ msgstr "" msgid "Install to Wii Menu" msgstr "" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "" @@ -2892,15 +2937,15 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" @@ -2930,7 +2975,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "" @@ -2946,13 +2991,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "" @@ -2960,16 +3005,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "" @@ -2992,8 +3037,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "" @@ -3011,16 +3056,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3056,7 +3101,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "" @@ -3144,15 +3189,15 @@ msgstr "" msgid "Load State Slot 9" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3168,10 +3213,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "" @@ -3201,11 +3242,11 @@ msgid "Logger Outputs" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "" @@ -3213,14 +3254,14 @@ msgstr "" msgid "M Button" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "" @@ -3234,11 +3275,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "" @@ -3269,7 +3310,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "" @@ -3279,7 +3320,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3298,7 +3339,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "" @@ -3311,7 +3352,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "" @@ -3448,7 +3489,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3495,7 +3536,7 @@ msgstr "" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "" @@ -3521,7 +3562,7 @@ msgstr "" msgid "No recorded file" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "" @@ -3530,11 +3571,11 @@ msgstr "" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "" @@ -3542,17 +3583,17 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "" @@ -3598,7 +3639,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "" @@ -3606,16 +3647,20 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "" @@ -3628,7 +3673,7 @@ msgstr "" msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "" @@ -3654,6 +3699,16 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3675,7 +3730,7 @@ msgstr "" msgid "Other" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3685,7 +3740,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "" @@ -3693,7 +3748,7 @@ msgstr "" msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "" @@ -3722,21 +3777,21 @@ msgstr "" msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "" @@ -3749,7 +3804,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "" @@ -3759,9 +3814,9 @@ msgid "Perspective %d" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "" @@ -3773,7 +3828,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "" @@ -3781,11 +3836,11 @@ msgstr "" msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "" @@ -3797,36 +3852,36 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "" @@ -3834,17 +3889,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3877,7 +3932,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "" @@ -3885,8 +3940,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "" @@ -3947,6 +4002,10 @@ msgstr "" msgid "Record" msgstr "" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +msgid "Record input" +msgstr "" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "" @@ -3977,7 +4036,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "" @@ -3986,14 +4045,14 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "" @@ -4021,7 +4080,7 @@ msgstr "" msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4039,13 +4098,12 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "" @@ -4058,7 +4116,7 @@ msgid "Safe" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "" @@ -4115,28 +4173,28 @@ msgstr "" msgid "Save State Slot 9" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4158,7 +4216,7 @@ msgstr "" msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "" @@ -4174,7 +4232,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "" @@ -4197,12 +4255,12 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "" @@ -4221,19 +4279,19 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "" @@ -4286,7 +4344,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "" @@ -4298,11 +4356,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4321,25 +4379,25 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +msgid "SetupWiiMem: Cant create setting file" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "" @@ -4347,23 +4405,27 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +msgid "Show Defaults" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "" @@ -4375,11 +4437,11 @@ msgstr "" msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "" @@ -4387,35 +4449,35 @@ msgstr "" msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "" @@ -4423,27 +4485,27 @@ msgstr "" msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4458,7 +4520,7 @@ msgstr "" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4489,7 +4551,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "" @@ -4504,7 +4566,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" @@ -4512,11 +4574,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4534,17 +4596,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "" @@ -4552,7 +4614,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "" @@ -4564,7 +4626,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "" @@ -4582,9 +4644,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "" @@ -4604,37 +4666,29 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "" @@ -4650,7 +4704,7 @@ msgstr "" msgid "State Saves" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "" @@ -4659,7 +4713,7 @@ msgid "Stick" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "" @@ -4685,16 +4739,16 @@ msgstr "" msgid "Subtract" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4702,18 +4756,18 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "" @@ -4742,13 +4796,13 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "" @@ -4768,7 +4822,7 @@ msgstr "" msgid "Texture Format Overlay" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "" @@ -4780,13 +4834,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -4834,29 +4888,29 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "" @@ -4865,17 +4919,17 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4887,7 +4941,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4903,7 +4957,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -4911,7 +4965,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4958,7 +5012,7 @@ msgstr "" msgid "Toggle Fog" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "" @@ -4968,11 +5022,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -4994,7 +5048,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "" @@ -5042,7 +5096,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "" @@ -5078,12 +5132,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5102,7 +5156,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5114,7 +5168,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "" @@ -5134,6 +5188,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5151,7 +5214,7 @@ msgstr "" msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "VBeam Speed Hack" msgstr "" @@ -5175,7 +5238,7 @@ msgstr "" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "" @@ -5183,17 +5246,17 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" @@ -5223,7 +5286,7 @@ msgstr "" msgid "Warning - starting ISO in wrong console mode!" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5240,7 +5303,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5248,7 +5311,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5256,7 +5319,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5292,23 +5355,19 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5317,7 +5376,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "" @@ -5326,7 +5385,7 @@ msgstr "" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "" @@ -5334,7 +5393,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "" @@ -5358,14 +5417,14 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5425,7 +5484,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "" @@ -5441,7 +5500,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5452,7 +5511,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5466,7 +5525,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "" @@ -5516,7 +5575,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "" @@ -5529,7 +5588,16 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +msgid "unknown message received" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 057acead14..25a128a4ae 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 19:05+0000\n" "Last-Translator: link_to_the_past \n" "Language-Team: Greek (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr "(πολλά αποτελέσματα για να εμφανιστούν)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Παιχνίδι : " @@ -43,7 +43,7 @@ msgstr "" "Το \"%s\" δεν υπάρχει.\n" "Δημιουργία καινούριας Memcard 16MB;" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -69,8 +69,8 @@ msgstr "%d δείγματα" msgid "%d samples (quality level %d)" msgstr "%d δείγματα (επίπεδο ποιότητας %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s υπάρχει ήδη, θέλετε αντικατάσταση;" @@ -109,12 +109,17 @@ msgstr "" "το αρχείο δεν είναι αρκετά μεγάλο ώστε να αποτελεί έγκυρο αρχείο κάρτας " "μνήμης (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "αποτυχία ανοίγματος %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "αποτυχία ανοίγματος %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "Το %s είναι ένα αρχείο με 0 byte" @@ -124,7 +129,7 @@ msgstr "Το %s είναι ένα αρχείο με 0 byte" msgid "%s is already compressed! Cannot compress it further." msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται να συμπιεστεί περαιτέρω." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "" @@ -155,7 +160,7 @@ msgstr "%u Ελεύθερα μπλοκ; %u Ελεύθερες Θέσεις Φα msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Περί..." @@ -163,7 +168,7 @@ msgstr "&Περί..." msgid "&Boot from DVD Drive..." msgstr "&Εκκίνηση από τον οδηγό DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Σημεία Διακοπής" @@ -171,7 +176,7 @@ msgstr "&Σημεία Διακοπής" msgid "&Browse for ISOs..." msgstr "&Εύρεση ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Διαχειριστής Cheat" @@ -195,11 +200,11 @@ msgstr "&Εξομοίωση" msgid "&File" msgstr "&Αρχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Προώθηση ανά Καρέ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Πλήρης Οθόνη" @@ -207,7 +212,7 @@ msgstr "&Πλήρης Οθόνη" msgid "&Graphics Settings" msgstr "&Ρυθμίσεις Γραφικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Βοήθεια" @@ -215,7 +220,7 @@ msgstr "&Βοήθεια" msgid "&Hotkey Settings" msgstr "&Ρυθμίσεις Πλήκτρων Συντόμευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -227,11 +232,11 @@ msgstr "&Φόρτωση Σημείου Αποθήκευσης" msgid "&Memcard Manager (GC)" msgstr "&Διαχειριστής Καρτών Μνήμης (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Μνήμη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Άνοιγμα..." @@ -239,11 +244,11 @@ msgstr "&Άνοιγμα..." msgid "&Options" msgstr "&Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Παύση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Αναπαραγωγή" @@ -251,39 +256,39 @@ msgstr "&Αναπαραγωγή" msgid "&Properties" msgstr "&Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Μόνο Για Ανάγνωση (Εγγραφής)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Καταχωρητές" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Επανεκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Ήχος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Διακοπή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Εργαλεία" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Βίντεο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Προβολή" @@ -372,7 +377,7 @@ msgstr "<Εισάγετε όνομα εδώ>" msgid "" msgstr "<Δε βρέθηκαν αναλύσεις>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "<Τίποτα>" @@ -380,7 +385,7 @@ msgstr "<Τίποτα>" msgid "" msgstr "<Πατήστε Πλήκτρο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<Συστήματος>" @@ -388,8 +393,8 @@ msgstr "<Συστήματος>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Ένα παράθυρο NetPlay είναι ήδη ανοιχτό!!" @@ -416,8 +421,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -441,13 +444,13 @@ msgstr "" "\n" "Θα πρέπει να έχετε κάνει προώθηση της πόρτας TCP στον host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Κωδικοί AR" @@ -580,11 +583,11 @@ msgstr "Προσαρμογέας:" msgid "Add" msgstr "Προσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Προσθήκη Κωδικού ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Προσθήκη Patch" @@ -592,9 +595,9 @@ msgstr "Προσθήκη Patch" msgid "Add new pane" msgstr "Προσθήκη νέου pane" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Προσθήκη..." @@ -634,36 +637,36 @@ msgstr "" msgid "Advanced" msgstr "Για προχωρημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Ρυθμίσεις για Προχωρημένους" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Όλα τα αρχεία GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αρχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αρχεία GC/Wii ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Όλα τα αρχεία (*.*)|*.*" @@ -691,7 +694,7 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι πράγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φορτωθεί από αρχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -709,7 +712,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε (ανενεργό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Αραβικά" @@ -718,7 +721,7 @@ msgstr "Αραβικά" msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -726,17 +729,17 @@ msgstr "" "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτά τα αρχεία;\n" "Θα εξαφανιστούν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για " "πάντα!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (πειραματικός)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -745,12 +748,12 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane πρέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Backend Ήχου:" @@ -758,7 +761,7 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Αυτόματα" @@ -798,7 +801,7 @@ msgstr "BP Καταχωρητές" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" @@ -816,7 +819,7 @@ msgstr "Χειρισμός με Ανεστίαστο Παραθ." msgid "Backward" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Μη Έγκυρη Κεφαλίδα Αρχείου" @@ -829,11 +832,11 @@ msgstr "" msgid "Banner" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Λεπτομέρειες Εικονιδίου:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Εικονίδιο:" @@ -845,7 +848,7 @@ msgstr "Bar" msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -874,7 +877,7 @@ msgid "Blue Right" msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Βάση" @@ -883,11 +886,11 @@ msgstr "Βάση" msgid "Bound Controls: %lu" msgstr "Δεσμευμένοι Χειρισμοί: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Χαλασμένο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Εύρεση" @@ -895,15 +898,15 @@ msgstr "Εύρεση" msgid "Browse for a directory to add" msgstr "Εύρεση φακέλου για προσθήκη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Εύρεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Εύρεση φακέλου προορισμού" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -913,7 +916,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Κουμπιά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -937,7 +940,7 @@ msgstr "Stick Κάμερας" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" @@ -960,7 +963,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Αδυναμία εύρεσης του WiiMote με handle σύνδεσης %02x" @@ -975,9 +978,9 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Cancel" msgstr "Άκυρο" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Αποτυχία ανοίγματος %s" @@ -987,7 +990,7 @@ msgid "Cannot unregister events with events pending" msgstr "" "Δεν μπορεί να γίνει κατάργηση καταχώρησης συμβάντων όταν ορισμένα εκκρεμούν." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -998,7 +1001,7 @@ msgstr "" "%s\n" "δεν είναι έγκυρο αρχείο κάρτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1010,7 +1013,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Καταλανικά" @@ -1018,11 +1021,11 @@ msgstr "Καταλανικά" msgid "Center" msgstr "Κέντρο" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Αλλαγή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Αλλαγή &Δίσκου..." @@ -1030,11 +1033,11 @@ msgstr "Αλλαγή &Δίσκου..." msgid "Change Disc" msgstr "Αλλαγή Δίσκου" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Αλλαγή Παιχνιδιού" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1050,11 +1053,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Συνομιλία" @@ -1070,39 +1073,39 @@ msgstr "Αναζήτηση Cheat" msgid "Cheats Manager" msgstr "Διαχείριση Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Έλεγχος Ακεραιότητας Κατάτμησης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Έλεγχος ακεραιότητας..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Κινέζικα (Παραδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο ρίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο ρίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα προεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για προσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αρχείο για άνοιγμα" @@ -1110,7 +1113,7 @@ msgstr "Επιλέξτε ένα αρχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάρτα μνήμης:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1118,8 +1121,8 @@ msgstr "" "Επιλέξτε ένα αρχείο για χρήση ως apploader: (έχει εφαρμογή σε δίσκους που " "απαρτίζονται μόνο από φακέλους)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο προς αποσυμπίεση" @@ -1138,7 +1141,7 @@ msgstr "Κλασικό Χειριστήριο" msgid "Clear" msgstr "Καθάρισ." -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1148,7 +1151,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Κλείσιμο" @@ -1173,7 +1176,7 @@ msgstr "Εντολή" msgid "Comment" msgstr "Σχόλιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Σχόλιο:" @@ -1185,12 +1188,12 @@ msgstr "Συμπίεση ISO..." msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Συμπίεση ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Ρυθμίσεις" @@ -1204,22 +1207,22 @@ msgstr "Ρυθμίσεις" msgid "Configure Control" msgstr "Ρυθμίσεις Χειριστηρίου" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Ρυθμίσεις Χειριστηρίων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης Αρχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" @@ -1228,17 +1231,17 @@ msgstr "Επιβεβαίωση Διακοπής" msgid "Connect" msgstr "Σύνδεση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Σύνδεση Πληκτρολογίου USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Σύνδεση Πληκτρολογίου USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Σύνδεση Wiimote %i" @@ -1259,7 +1262,7 @@ msgstr "Σύνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "Σύνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Γίνεται Σύνδεση..." @@ -1279,7 +1282,7 @@ msgstr "Χειριστήριο" msgid "Convert to GCI" msgstr "Μετατροπή σε GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Η αντιγραφή απέτυχε" @@ -1288,7 +1291,7 @@ msgstr "Η αντιγραφή απέτυχε" msgid "Copy to Memcard %c" msgstr "Αντιγραφή στην κάρτα μνήμης %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Πυρήνας" @@ -1302,7 +1305,7 @@ msgstr "Αποτυχία δημιουργίας %s" msgid "Could not initialize backend %s." msgstr "Αποτυχία εκκίνησης backend %s" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1314,26 +1317,16 @@ msgstr "" " Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μπορούν να αναγνωστούν " "από τους περισσότερους PC DVD οδηγούς." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Αποτυχία αναγνώρισης του αρχείου ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Αποτυχία αποθήκευσης του %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Αδυναμία καθορισμού χειριστηρίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι " -"τρέχει!\n" -"(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται προς " -"το παρόν)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1355,11 +1348,11 @@ msgstr "" "Άμα ναι, τότε μπορεί να χρειαστεί να ορίσετε ξανά την θέση της κάρτας μνήμης " "στις ρυθμίσεις." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εύρεσης εντολής ανοίγματος για την επέκταση 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1372,7 +1365,7 @@ msgstr "" msgid "Count:" msgstr "Πλήθος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Χώρα:" @@ -1412,12 +1405,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Ο τρέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Προσαρμοζόμενο Projection Hack" @@ -1425,11 +1418,11 @@ msgstr "Προσαρμοζόμενο Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ρυθμίσεις Προσαρμοζόμενου Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Προσαρμόστε ορισμένες παραμέτρους Ορθογραφικής Προβολής." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Τσέχικα" @@ -1441,36 +1434,37 @@ msgstr "D" msgid "D-Pad" msgstr "Ψηφιακό Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γρήγορη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αργή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP σε Ξεχωριστό Νήμα" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP σε Ξεχωριστό Νήμα" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Ρίζα DVD:" @@ -1483,7 +1477,7 @@ msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" "DVDLowUnencryptedRead - Σφάλμα Τερματισμού: αποτυχία ανάγνωσης από τον τομέα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1491,7 +1485,7 @@ msgstr "" msgid "Data Size" msgstr "Μέγεθος Δεδομένων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Ημερομηνία:" @@ -1528,8 +1522,8 @@ msgstr "Αποσυμπίεση ISO..." msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" @@ -1542,7 +1536,7 @@ msgstr "Ανανέωση λίστας παιχνιδιών" msgid "Default" msgstr "Προεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Προεπιλεγμένο ISO:" @@ -1586,8 +1580,8 @@ msgstr "" msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1599,7 +1593,7 @@ msgstr "Dial" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1667,7 +1661,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Δίσκος" @@ -1694,24 +1688,60 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II αποκωδικοποιητής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις Γραφικών Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Ιστοσελίδα του &Dolphin" @@ -1727,12 +1757,12 @@ msgstr "Ρυθμίσεις Εξομοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1740,7 +1770,7 @@ msgstr "Dolphin TAS Ταινίες (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Ρυθμίσεις Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" @@ -1760,12 +1790,12 @@ msgstr "" "Το Dolphin είναι ρυθμισμένο να αποκρύπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστούν όλα τα παιχνίδια..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Το Dolphin δεν μπόρεσε να ολοκληρώσει την ζητούμενη ενέργεια." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1792,11 +1822,11 @@ msgstr "Μεταφορτώθηκαν %lu κωδικοί. (προστέθηκαν msgid "Drums" msgstr "Τύμπανα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" @@ -1844,9 +1874,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Ολλανδικά" @@ -1879,7 +1909,7 @@ msgstr "ΕΥΡΩΠΗ" msgid "Early Memory Updates" msgstr "Ενημερώσεις Μνήμης Νωρίς" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Επεξεργασία" @@ -1891,16 +1921,20 @@ msgstr "Επεξεργασία Κωδικού ActionReplay" msgid "Edit Config" msgstr "Επεξεργασία Ρυθμίσεων" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Επεξεργασία Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Επεξεργασία τρέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Επεξεργασία..." @@ -1912,7 +1946,7 @@ msgstr "Εφέ" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" @@ -1951,7 +1985,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Εξομοιωμένο Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Κατάσταση Λειτουργίας:" @@ -1979,11 +2013,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ενεργοποίηση Καταγραφής AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Ενεργοποίηση Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Ενεργοποίηση Bounding Box Υπολογισμών" @@ -1991,27 +2025,27 @@ msgstr "Ενεργοποίηση Bounding Box Υπολογισμών" msgid "Enable Cache" msgstr "Ενεργοποίηση Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Ενεργοποίηση Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Ενεργοποίηση Διπλού Πυρήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Ενεργοποίηση Διπλού Πυρήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Ενεργοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Ενεργοποίηση Idle Skipping (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Ενεργοποίηση MMU" @@ -2019,7 +2053,7 @@ msgstr "Ενεργοποίηση MMU" msgid "Enable Progressive Scan" msgstr "Ενεργοποίηση Προοδευτικής Σάρωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Ενεργοποίηση Προφύλαξης Οθόνης" @@ -2027,7 +2061,7 @@ msgstr "Ενεργοποίηση Προφύλαξης Οθόνης" msgid "Enable Speaker Data" msgstr "Ενεργοποίηση Δεδομένων Ηχείου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Ενεργοποίηση Ευρείας Οθόνης" @@ -2050,7 +2084,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2087,7 +2121,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2095,11 +2129,11 @@ msgstr "" "Ενεργοποιήστε το για να επιταχύνετε το The Legend of Zelda: Twilight " "Princess. Απενεργοποιήστε το για τα υπόλοιπα παιχνίδια." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Ενεργοποιεί το Προσαρμοζόμενο Projection Hack" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2107,22 +2141,13 @@ msgstr "" "Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 surround. " "Δεν διατίθεται για OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 surround. " "Μόνο για OpenAL backend." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 surround. " -"Μόνο για OpenAL backend. Μπορεί να χρειαστεί να μετονομάσετε το soft_oal.dll " -"σε OpenAL32.dll για να λειτουργήσει." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2135,7 +2160,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2157,9 +2182,9 @@ msgstr "" msgid "End" msgstr "Τέλος" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Αγγλικά" @@ -2188,11 +2213,11 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Σφάλμα" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " @@ -2226,7 +2251,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2236,16 +2260,21 @@ msgstr "" msgid "Execute" msgstr "Εκτέλεση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Εξαγωγή όλων των αποθηκεύσεων" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Εξαγωγή Αρχείου" @@ -2253,7 +2282,7 @@ msgstr "Εξαγωγή Αρχείου" msgid "Export Recording" msgstr "Εξαγωγή Εγγραφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Εξαγωγή Εγγραφής..." @@ -2269,9 +2298,10 @@ msgstr "Εξαγωγή Αποθήκευσης Wii (Πειραματικό)" msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεύσεων" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Αποτυχία εξαγωγής, προσπάθεια ξανά;" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Αποτυχία Εξαγωγής" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2293,44 +2323,44 @@ msgstr "Επιπλέον Παράμετρος" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Η Επιπλέον Παράμετρος είναι χρήσιμη μόνο στο ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Εξαγωγή όλων των αρχείων..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Εξαγωγή Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Εξαγωγή DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Εξαγωγή Φακέλου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Εξαγωγή Αρχείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αρχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." @@ -2346,11 +2376,11 @@ msgstr "Αναπαραγωγή FIFO" msgid "FRANCE" msgstr "ΓΑΛΛΙΑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Μέγεθος FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Αποτυχία σύνδεσης!" @@ -2358,7 +2388,7 @@ msgstr "Αποτυχία σύνδεσης!" msgid "Failed to download codes." msgstr "Αποτυχία μεταφόρτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2400,16 +2430,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Αποτυχία ανάγνωσης %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Αποτυχία ανάγνωσης της κεφαλίδας bk" @@ -2440,12 +2470,12 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του BAT\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο: %s" @@ -2466,7 +2496,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Αποτυχία ανάγνωσης κεφαλίδας" @@ -2478,29 +2508,34 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Αποτυχία ανάγνωσης μοναδικού ID από την εικόνα δίσκου" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Αποτυχία εγγραφής του BT.DINF στο SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Αποτυχία εγγραφής του bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Αποτυχία εγγραφής της κεφαλίδας για το %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Περσικά" @@ -2512,11 +2547,11 @@ msgstr "Γρήγορη" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Γρήγορη έκδοση του MMU. Δε δουλεύει για όλα τα παιχνίδια." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2524,7 +2559,7 @@ msgstr "" "Ανεπανόρθωτος αποσυγχρονισμός. Ακύρωση αναπαραγωγής. (Σφάλμα σε " "PlayWiimote: %u != %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Αναπαραγωγή Fifo" @@ -2565,16 +2600,16 @@ msgstr "Το αρχείο δεν αναγνωρίζεται σαν κάρτα μ msgid "File not compressed" msgstr "Το αρχείο δεν είναι συμπιεσμένο" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Άγνωστη λειτουργία ανοίγματος : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Αρχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο τύπος αρχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" @@ -2602,7 +2637,7 @@ msgstr "Επιβολή 16:9" msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" @@ -2635,7 +2670,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2658,7 +2693,7 @@ msgstr "" msgid "Forward" msgstr "Μπροστά" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2667,6 +2702,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Βρέθηκαν %d αποτελέσματα για '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Αποτυχία αποθήκευσης του %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2696,7 +2736,7 @@ msgstr "Εύρος Καρέ" msgid "Frame S&kipping" msgstr "Παράλειψη Κ&αρέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Περιορισμός Καρέ:" @@ -2708,9 +2748,9 @@ msgstr "Καρέ Προς Εγγραφή" msgid "Free Look" msgstr "Ελεύθερη Ματιά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Γαλλικά" @@ -2723,7 +2763,7 @@ msgstr "Frets" msgid "From" msgstr "Από" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Πλήρης Οθόνη" @@ -2735,7 +2775,7 @@ msgstr "Ανάλυση Πλήρους Οθόνης:" msgid "GCI File(*.gci)" msgstr "Αρχεία GCI(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GCPad" @@ -2743,27 +2783,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID Παιχνιδιού:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Το παιχνίδι εκτελείται ήδη!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Το παιχνίδι δεν εκτελείται!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Το παιχνίδι δεν βρέθηκε!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Ρυθμίσεις Συγκεκριμένου Παιχνιδιού" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Ρυθμίσεις Παιχνιδιού" @@ -2771,7 +2811,7 @@ msgstr "Ρυθμίσεις Παιχνιδιού" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube αρχεία αποθήκευσης(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2780,16 +2820,16 @@ msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Ρυθμίσεις Χειριστηρίου Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Κωδικοί Gecko" @@ -2807,7 +2847,7 @@ msgstr "" "codehandler.bin αρχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Γενικά" @@ -2816,9 +2856,9 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Γερμανικά" @@ -2829,11 +2869,11 @@ msgstr "" "GetARCode: Ο δείκτης είναι μεγαλύτερος από το μέγεθος %lu της λίστας των " "κωδικών ar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Γραφικά" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Ρυθμίσεις Γραφικών" @@ -2859,7 +2899,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Ελληνικά" @@ -2887,7 +2927,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Εβραϊκά" @@ -2899,7 +2939,7 @@ msgstr "Ύψος" msgid "Help" msgstr "Βοήθεια" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2921,7 +2961,7 @@ msgstr "" "\n" "Αντίο!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2961,7 +3001,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2970,11 +3010,11 @@ msgid "Hotkey Configuration" msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Πλήκτρα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Ουγγρικά" @@ -2982,14 +3022,14 @@ msgstr "Ουγγρικά" msgid "Hybrid Wiimote" msgstr "Υβριδικό Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Απόπειρα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήριο: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -3002,11 +3042,11 @@ msgstr "" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει τώρα." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυρος προορισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" @@ -3022,11 +3062,11 @@ msgstr "Δείκτης IR" msgid "IR Sensitivity:" msgstr "Ευαισθησία IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Λεπτομέρειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Φάκελοι ISO" @@ -3038,7 +3078,7 @@ msgstr "ΙΤΑΛΙΑ" msgid "Icon" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3083,9 +3123,15 @@ msgstr "" msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Αποτυχία εισαγωγής, δοκιμή ξανά;" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Εισαγωγή Αποθήκευσης" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Αποτυχία Εξαγωγής" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3107,21 +3153,17 @@ msgstr "" "Το εισαγώμενο αρχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Εντός Παιχνιδιού" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "Εντός Παιχνιδιού" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Περιορισμός Καρέ:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Πληροφορίες" @@ -3141,7 +3183,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Εισαγωγή Κάρτας SD" @@ -3149,7 +3191,7 @@ msgstr "Εισαγωγή Κάρτας SD" msgid "Insert name here.." msgstr "Εισάγετε όνομα εδώ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Εγκατάσταση WAD" @@ -3157,30 +3199,31 @@ msgstr "Εγκατάσταση WAD" msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο Μενού Wii" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει " "ακόμα." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Σφάλμα Ελέγχου Ακεραιότητας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Ο έλεγχος ακεραιότητας ολοκληρώθηκε." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Ο έλεγχος ακεραιότητας ολοκληρώθηκε. Δε βρέθηκαν σφάλματα." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3189,11 +3232,11 @@ msgstr "" "Ο έλεγχος ακεραιότητας για την κατάτμηση %d απέτυχε. Το αρχείο έχει " "πιθανότατα αλλοιωθεί ή έχει γίνει patched με λάθος τρόπο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" @@ -3218,15 +3261,15 @@ msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία lzo_init()" msgid "Internal Resolution:" msgstr "Εσωτερική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αργός)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Εισαγωγή" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Μη έγκυρο μέγεθος (%x) ή μαγική λέξη (%x)" @@ -3259,7 +3302,7 @@ msgstr "" "%s\n" " Ίσως χρειαστεί να ξαναεξάγετε την εικόνα αυτού του παιχνιδιού από τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Μη έγκυρο αρχείο εγγραφής" @@ -3275,13 +3318,13 @@ msgstr "Μη έγκυρο string αναζήτησης (δεν μπορεί να msgid "Invalid search string (only even string lengths supported)" msgstr "Μη έγκυρο string αναζήτησης (μόνο ζυγά μήκη string υποστηρίζονται)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Μη έγκυρο κατάσταση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Ιταλικά" @@ -3289,16 +3332,16 @@ msgstr "Ιταλικά" msgid "JAPAN" msgstr "ΙΑΠΩΝΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (προτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL πειραματικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Ιαπωνικά" @@ -3324,8 +3367,8 @@ msgstr "Διατήρηση Παραθύρου στην Κορυφή" msgid "Key" msgstr "Πλήκτρο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Κορεάτικα" @@ -3343,16 +3386,16 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Γλώσσα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Χρονοκαθυστέρηση: " @@ -3395,7 +3438,7 @@ msgstr "" msgid "Less Than" msgstr "Μικρότερο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Περιορισμός με βάση τα Καρέ" @@ -3494,15 +3537,15 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης 8" msgid "Load State Slot 9" msgstr "Φόρτωση Σημείου Αποθήκευσης 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Φόρτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Φόρτωση Μενού Συστήματος Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Φόρτωση Μενού Συστήματος Wii %d%c" @@ -3521,10 +3564,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Φόρτωση προεπιλεγμένων τιμών από διαθέσιμα πρότυπα hack." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Τοπικό" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Καταγραφή" @@ -3559,11 +3598,11 @@ msgid "Logger Outputs" msgstr "Έξοδοι Καταγραφής" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Καταγραφή" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Χάθηκε η σύνδεση με τον διακομιστή!" @@ -3571,7 +3610,7 @@ msgstr "Χάθηκε η σύνδεση με τον διακομιστή!" msgid "M Button" msgstr "M Button" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3580,7 +3619,7 @@ msgstr "" "Ασυμφωνία MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3594,11 +3633,11 @@ msgstr "Αρχεία MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Κύριο Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID Δημιουργού:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Δημιουργός:" @@ -3635,7 +3674,7 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Κάρτα Μνήμης" @@ -3647,7 +3686,7 @@ msgstr "" "Διαχειριστής Καρτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγραφα ασφαλείας πριν την " "χρήση, αν και διορθωμένος μπορεί να χαλάσει πράγματα!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3674,7 +3713,7 @@ msgstr "" msgid "Menu" msgstr "Μενού" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Μικρόφωνο" @@ -3687,7 +3726,7 @@ msgstr "Ελάχιστη" msgid "Misc" msgstr "Διάφορα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Διάφορες Ρυθμίσεις" @@ -3837,7 +3876,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3884,7 +3923,7 @@ msgstr "Δε βρέθηκαν ISO ή WAD" msgid "No audio output" msgstr "Καμία έξοδος ήχου" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Δε βρέθηκε αρχείο εικονιδίου για τον τίτλο %s" @@ -3910,7 +3949,7 @@ msgstr "Δεν υπάρχουν ελεύθερες εγγραφές φακέλω msgid "No recorded file" msgstr "Κανένα εγγεγραμένο αρχείο" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Δε βρέθηκε φάκελος αποθήκευσης για τον τίτλο %s" @@ -3919,11 +3958,11 @@ msgstr "Δε βρέθηκε φάκελος αποθήκευσης για τον #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Νορβηγικά Bokmaal" @@ -3931,19 +3970,19 @@ msgstr "Νορβηγικά Bokmaal" msgid "Not Equal" msgstr "Όχι ίσο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Μη Ορισμένο" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" "Δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αρχείου " "μεγέθους %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3989,7 +4028,7 @@ msgstr "Αντικείμενο" msgid "Object Range" msgstr "Εύρος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Ανενεργός" @@ -3997,16 +4036,20 @@ msgstr "Ανενεργός" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Απεικόνιση Μηνυμάτων Στην Οθόνη" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Άνοιγμα" @@ -4019,7 +4062,7 @@ msgstr "Άνοιγμα &τοποθεσίας αρχείου" msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Άνοιγμα αρχείου..." @@ -4045,6 +4088,16 @@ msgstr "OpenCL Αποκωδικοποιητής Υφών" msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4071,7 +4124,7 @@ msgstr "" msgid "Other" msgstr "Άλλα" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4083,7 +4136,7 @@ msgstr "" msgid "Output" msgstr "Έξοδος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Αναπα&ραγωγή Εγγραφής" @@ -4091,7 +4144,7 @@ msgstr "Αναπα&ραγωγή Εγγραφής" msgid "Pad" msgstr "Χειριστήριο" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Χειριστήριο" @@ -4120,21 +4173,21 @@ msgstr "Παράμετροι" msgid "Partition %i" msgstr "Κατάτμηση %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Φάκελοι" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Παύση" @@ -4147,7 +4200,7 @@ msgstr "Παύση στο τέλος της ταινίας" msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Τέλειο" @@ -4157,9 +4210,9 @@ msgid "Perspective %d" msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Αναπαραγωγή" @@ -4171,7 +4224,7 @@ msgstr "Αναπαραγωγή Εγγραφής" msgid "Play/Pause" msgstr "Αναπαραγωγή/Παύση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Παίζεται" @@ -4179,11 +4232,11 @@ msgstr "Παίζεται" msgid "Playback Options" msgstr "Ρυθμίσεις Αναπαραγωγής" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Παρακαλώ επιβεβαιώστε..." @@ -4195,36 +4248,36 @@ msgstr "Παρακαλώ δημιουργήστε μια οπτική πριν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Θύρα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Θύρα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Θύρα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Θύρα 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Θύρα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Πορτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Πορτογαλικά (Βραζιλιάνικα)" @@ -4232,17 +4285,17 @@ msgstr "Πορτογαλικά (Βραζιλιάνικα)" msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Πρόωρος τερματισμός της ταινίας σε PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Πρόωρος τερματισμός της ταινίας σε PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Πρόωρος τερματισμός της ταινίας σε PlayWiimote. %u > %u" @@ -4275,7 +4328,7 @@ msgstr "Προφίλ" msgid "Properties" msgstr "Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Καθαρισμός Cache" @@ -4283,8 +4336,8 @@ msgstr "Καθαρισμός Cache" msgid "Question" msgstr "Ερώτηση" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Έξοδος" @@ -4345,6 +4398,11 @@ msgstr "Πραγματικά Wiimotes" msgid "Record" msgstr "Εγγραφή" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Ρυθμίσεις Εγγραφής" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Πληροφορίες Εγγραφής" @@ -4380,7 +4438,7 @@ msgstr "" "Αν δεν είστε σίγουροι, επιλέξτε Καμία." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Ανανέωση" @@ -4389,14 +4447,14 @@ msgstr "Ανανέωση" msgid "Refresh List" msgstr "Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Αφαίρεση" @@ -4427,7 +4485,7 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4445,15 +4503,15 @@ msgstr "Δεξί Stick" msgid "Rumble" msgstr "Δόνηση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Εκτέλεση DSP HLE και LLE σε ξεχωριστό νήμα (δεν προτείνεται: μπορεί να " "προκαλέσει προβλήματα στον ήχο με HLE και κολλήματα με LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Ρώσικα" @@ -4466,7 +4524,7 @@ msgid "Safe" msgstr "Ασφαλής" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Αποθήκ." @@ -4527,28 +4585,28 @@ msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" msgid "Save State Slot 9" msgstr "Αποθήκευση Σημείου Αποθήκευσης 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Αποθήκευση Σημείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Αποθήκευση τρέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4572,7 +4630,7 @@ msgstr "Αναζήτηση για ISOs" msgid "Scanning..." msgstr "Ανίχνευση..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Στιγμιότυπο" @@ -4588,7 +4646,7 @@ msgstr "Αναζήτηση" msgid "Search Filter" msgstr "Φίλτρο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" @@ -4611,12 +4669,12 @@ msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Επιλέξτε το Αρχείο Εγγραφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση" @@ -4638,19 +4696,19 @@ msgstr "Επιλέξτε ένα αρχείο αποθήκευσης για ει msgid "Select floating windows" msgstr "Επιλέξτε αιωρούμενα παράθυρα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Επιλέξτε το αρχείο για φόρτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόρτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4730,7 +4788,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, χρησιμοποιήστε το OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Αποστολή" @@ -4742,11 +4800,11 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "Διαχωριστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Σερβικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4769,7 +4827,7 @@ msgstr "" "SetARCode_IsActive: Ο δείκτης είναι μεγαλύτερος από το μέγεθος λίστας των " "κωδικών ar %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4777,19 +4835,20 @@ msgstr "" "Ορίζει την χρονοκαθυστέρηση (σε ms). Υψηλότερες τιμές μπορεί να μειώσουν τις " "διακοπές στον ήχο. Μόνο για OpenAL backend." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Ρυθμίσεις..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem:Αδυναμία εύρεσης αρχείου ρυθμίσεων" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Κούνημα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Σύντομο Όνομα:" @@ -4797,23 +4856,28 @@ msgstr "Σύντομο Όνομα:" msgid "Shoulder Buttons" msgstr "Κουμπιά Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Εμφάνιση &Κονσόλας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Εμφάνιση Παραθύρου Κατα&γραφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Εμφάνιση Μπάρας Κατάστασης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Εμφάνιση Γραμμής &Εργαλείων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Προεπιλ." + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" @@ -4825,11 +4889,11 @@ msgstr "Εμφάνιση Περιοχών EFB Αντιγραφών" msgid "Show FPS" msgstr "Εμφάνιση FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Εμφάνιση Γαλλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Εμφάνιση GameCube" @@ -4837,35 +4901,35 @@ msgstr "Εμφάνιση GameCube" msgid "Show Input Display" msgstr "Εμφάνιση Προβολής Χειρισμών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Εμφάνιση Ιταλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Εμφάνιση JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Εμφάνιση Κορέας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Εμφάνιση Ρυθμίσεων &Καταγραφέα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Εμφάνιση PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Εμφάνιση Πλατφόρμας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Εμφάνιση Περιοχών" @@ -4873,27 +4937,27 @@ msgstr "Εμφάνιση Περιοχών" msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Εμφάνιση Ταϊβάν" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Εμφάνιση USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Εμφάνιση Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Εμφάνιση Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Εμφάνιση επιβεβαίωσης πριν τη διακοπή ενός παιχνιδιού." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4912,7 +4976,7 @@ msgstr "Εμφάνιση πρώτου μπλοκ" msgid "Show lag counter" msgstr "Εμφάνιση μετρητή καθυστέρησης " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4951,7 +5015,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" @@ -4969,7 +5033,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Οριζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" @@ -4977,11 +5041,11 @@ msgstr "Κινέζικα Απλοποιημένα" msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Παράλειψη BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Παράληψη εκκαθάρισης DCBZ" @@ -5006,17 +5070,17 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Θέση Β" @@ -5024,7 +5088,7 @@ msgstr "Θέση Β" msgid "Snapshot" msgstr "Στιγμιότυπο" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Απεικόνιση Λογισμικού" @@ -5041,7 +5105,7 @@ msgstr "" "Θέλετε όντως να χρησιμοποιήσετε την απεικόνιση λογισμικού; Αν δεν είστε " "σίγουροι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" @@ -5059,9 +5123,9 @@ msgstr "Αποτυχία δημιουργίας buffer ήχου: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Ισπανικά" @@ -5090,37 +5154,29 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Επιτάχυνση του Ρυθμού Μεταφοράς από τον Δίσκο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Τετράγωνο Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Τυπικός Controller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Εκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Εκκίνηση Λειτουργίας &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Εκκίνηση Ε&γγραφής" @@ -5136,7 +5192,7 @@ msgstr "Λειτ." msgid "State Saves" msgstr "Σημεία Αποθήκευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Τιμόνι" @@ -5145,7 +5201,7 @@ msgid "Stick" msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Διακοπή" @@ -5176,16 +5232,16 @@ msgstr "Strum" msgid "Subtract" msgstr "Subtract" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Επιτυχής εξαγωγή αρχείου στο %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5193,11 +5249,11 @@ msgstr "" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Συγχρονισμός του νήματος της GPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5206,8 +5262,8 @@ msgstr "" "κολλήματα σε λειτουργία Διπλού Πυρήνα . (Ενεργό = Συμβατότητα, Ανενεργό = " "Ταχύτητα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" @@ -5236,13 +5292,13 @@ msgstr "Αριστερό Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Δημιουργία Στιγμιότυπου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5262,7 +5318,7 @@ msgstr "Cache Υφών" msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "Το WAD εγκαταστάθηκε με επιτυχία" @@ -5274,13 +5330,13 @@ msgstr "Η διεύθυνση είναι άκυρη" msgid "The checksum was successfully fixed" msgstr "Το checksum διορθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βρίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5338,7 +5394,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "Το σημείο αποθήκευσης που προσπαθείτε να αντιγράψετε έχει μη έγκυρο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5346,23 +5402,23 @@ msgstr "" "Η επιλεγμένη γλώσσα δεν υποστηρίζεται από το σύστημά σας. Επαναφορά στην " "προεπιλογή συστήματος." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Οι εκδόσεις NetPlay του διακομιστή και του πελάτη δεν είναι συμβατές!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Ο διακομιστής είναι γεμάτος!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Ο διακομιστής απάντησε: το παιχνίδι τρέχει!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Ο διακομιστής επέστρεψε ένα άγνωστο μήνυμα σφάλματος!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Το επιλεγμένο αρχείο \"%s\" δεν υπάρχει" @@ -5371,11 +5427,11 @@ msgstr "Το επιλεγμένο αρχείο \"%s\" δεν υπάρχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυρη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Θέμα:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5383,7 +5439,7 @@ msgstr "" "Πρέπει να υπάρχει εισητήριο για 00000001/00000002. Το NAND dump σας είναι " "πιθανότατα ημιτελές." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5400,7 +5456,7 @@ msgstr "" "Αυτός ο προσομοιωτής action replay δεν υποστηρίζει κωδικούς που αλλάζουν το " "ίδιο το Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Αυτό μπορεί να προκαλέσει καθυστερήσεις στο Μενού Wii και σε μερικά " @@ -5429,7 +5485,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5442,7 +5498,7 @@ msgstr "" "διορθώσει ορισμένα κλικαρίσματα στον ήχο άλλα και να προκαλέσει συνεχές " "θόρυβο αναλόγα με το παιχνίδι)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5497,7 +5553,7 @@ msgstr "EFB Αντίγραφα" msgid "Toggle Fog" msgstr "Εναλλαγή Όλων Τύπων Καταγραφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Εναλλαγή Πλήρους Οθόνης" @@ -5507,11 +5563,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Κορυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Κινέζικα Παραδοσιακά " @@ -5535,7 +5591,7 @@ msgstr "" "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Τουρκικά" @@ -5589,7 +5645,7 @@ msgstr "" "τον πληκτρολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γραμμή και να συνεχίσετε με το parsing;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Μη ορισμένο %i" @@ -5626,12 +5682,12 @@ msgstr "Άγνωστη εντολή 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Άγνωστος τύπος καταχώρησης %i στο SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d Αποσύνδεση παίκτη!" @@ -5650,7 +5706,7 @@ msgstr "Ενημέρωση" msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Χρήση Λειτουργίας EuRGB60 (PAL60)" @@ -5662,7 +5718,7 @@ msgstr "Χρήση Πλήρους Οθόνης" msgid "Use Hex" msgstr "Χρήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Χρήση Οθονών Πανικού" @@ -5687,6 +5743,15 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5710,7 +5775,7 @@ msgstr "Εργαλεία" msgid "V-Sync" msgstr "Κάθετος Συγχρονισμός" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Speed Hack" @@ -5735,7 +5800,7 @@ msgstr "Αναλυτικότητα" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Βίντεο" @@ -5743,17 +5808,17 @@ msgstr "Βίντεο" msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Ένταση" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του εισιτηρίου" @@ -5788,7 +5853,7 @@ msgstr "Προειδοποίηση - εκκίνηση ELF σε λάθος λει msgid "Warning - starting ISO in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση ISO σε λάθος λειτουργία κονσόλας!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5814,7 +5879,7 @@ msgstr "" "και έχουν το ίδιο όνομα με αρχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5826,7 +5891,7 @@ msgstr "" "φορτώσετε άλλο σημείο αποθήκευσης πρωτού συνεχίσετε ή να φορτώσετε το τρέχων " "με απενεργοποιημένη την λειτουργία Μόνο Για Ανάγνωση (Εγγραφής)." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5839,7 +5904,7 @@ msgstr "" "την λειτουργία Μόνο Για Ανάγνωση (Εγγραφής). Ειδάλλως πιθανώς θα εμφανιστεί " "ασυγχρονισμός." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5891,23 +5956,19 @@ msgstr "Hack Ευρείας Οθόνης" msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Εισαγωγή Αποθήκευσης Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5916,7 +5977,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αρχείο" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5925,7 +5986,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5933,7 +5994,7 @@ msgstr "Συνδεδεμένο Wiimote" msgid "Wiimote Motor" msgstr "Μοτέρ Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Ρυθμίσεις Wiimote" @@ -5957,14 +6018,14 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Σε εργασία..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -6032,7 +6093,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Δεν μπορείτε να κλείσετε pane που έχουν σελίδες." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Πρέπει να επιλέξετε ένα παιχνίδι!!" @@ -6048,7 +6109,7 @@ msgstr "Πρέπει να εισάγετε μία έγκυρη οκταδική msgid "You must enter a valid profile name." msgstr "Πρέπει να εισάγετε ένα έγκυρο όνομα προφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Πρέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." @@ -6063,7 +6124,7 @@ msgstr "" "Θέλετε να γίνει διακοπή τώρα για να διορθώσετε το πρόβλημα;\n" "Εάν επιλέξετε \"Όχι\", ο ήχος μπορεί να είναι χαλασμένος." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6082,7 +6143,7 @@ msgstr "" "Θα έπρεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n" "Θέλετε να δημιουργηθεί ένα καινούριο;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -6149,7 +6210,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6162,7 +6223,17 @@ msgstr "iCacheJIT: Ανάγνωση Opcode από %x. Παρακαλώ να το msgid "s" msgstr "." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστρεψε -1 κατά την εκκίνηση της εφαρμογής!" @@ -6196,9 +6267,29 @@ msgstr "| OR" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "Αποτυχία εύρεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Αδυναμία καθορισμού χειριστηρίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι " +#~ "τρέχει!\n" +#~ "(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται " +#~ "προς το παρόν)" + #~ msgid "Enable Hotkeys" #~ msgstr "Ενεργοποίηση Συντομεύσεων" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 " +#~ "surround. Μόνο για OpenAL backend. Μπορεί να χρειαστεί να μετονομάσετε το " +#~ "soft_oal.dll σε OpenAL32.dll για να λειτουργήσει." + +#~ msgid "Export failed, try again?" +#~ msgstr "Αποτυχία εξαγωγής, προσπάθεια ξανά;" + #~ msgid "Failed to Listen!!" #~ msgstr "Αποτυχία ακρόασης!!" @@ -6223,12 +6314,21 @@ msgstr "| OR" #~ "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = " #~ "Συμβατό, Ανενεργό = Γρήγορο)" +#~ msgid "Import failed, try again?" +#~ msgstr "Αποτυχία εισαγωγής, δοκιμή ξανά;" + +#~ msgid "In-Game" +#~ msgstr "Εντός Παιχνιδιού" + #~ msgid "Last Overwritten State" #~ msgstr "Τελευταίο Επαναγραμμένο Σημείο Αποθ." #~ msgid "Last Saved State" #~ msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." +#~ msgid "Local" +#~ msgstr "Τοπικό" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Επανασύνδεση Wiimote Κατά Την Φόρτωση Σημείου Αποθήκευσης" @@ -6251,3 +6351,6 @@ msgstr "| OR" #~ "του OpenGL και μπορεί να προκαλέσει μεγάλα προβλήματα.\n" #~ "\n" #~ "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." + +#~ msgid "Wii Save Import" +#~ msgstr "Εισαγωγή Αποθήκευσης Wii" diff --git a/Languages/po/en.po b/Languages/po/en.po index bb5201b3e1..e9c2285bc7 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -20,9 +20,9 @@ msgstr "" msgid " (too many to display)" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "" @@ -37,7 +37,7 @@ msgid "" " Create a new 16MB Memcard?" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -62,8 +62,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "" @@ -94,12 +94,17 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, c-format +msgid "%s failed: kr=%x" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "" @@ -109,7 +114,7 @@ msgstr "" msgid "%s is already compressed! Cannot compress it further." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "" @@ -138,7 +143,7 @@ msgstr "" msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "" @@ -146,7 +151,7 @@ msgstr "" msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "" @@ -154,7 +159,7 @@ msgstr "" msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "" @@ -178,11 +183,11 @@ msgstr "" msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "" @@ -190,7 +195,7 @@ msgstr "" msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "" @@ -198,7 +203,7 @@ msgstr "" msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "" @@ -210,11 +215,11 @@ msgstr "" msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "" @@ -222,11 +227,11 @@ msgstr "" msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "" @@ -234,39 +239,39 @@ msgstr "" msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "" @@ -354,7 +359,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -362,7 +367,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -370,8 +375,8 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "" @@ -395,8 +400,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -405,13 +408,13 @@ msgid "" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "" @@ -523,11 +526,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "" @@ -535,9 +538,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "" @@ -575,36 +578,36 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "" @@ -632,7 +635,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "" @@ -647,7 +650,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -656,21 +659,21 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "" @@ -679,12 +682,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "" @@ -692,7 +695,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "" @@ -728,7 +731,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "" @@ -746,7 +749,7 @@ msgstr "" msgid "Backward" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "" @@ -759,11 +762,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "" @@ -775,7 +778,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "" @@ -804,7 +807,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "" @@ -813,11 +816,11 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "" @@ -825,15 +828,15 @@ msgstr "" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "" @@ -843,7 +846,7 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -865,7 +868,7 @@ msgstr "" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "" @@ -882,7 +885,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -897,9 +900,9 @@ msgstr "" msgid "Cancel" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "" @@ -908,7 +911,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -916,7 +919,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -926,7 +929,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -934,11 +937,11 @@ msgstr "" msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "" @@ -946,11 +949,11 @@ msgstr "" msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -964,11 +967,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "" @@ -984,39 +987,39 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "" @@ -1024,14 +1027,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "" @@ -1050,7 +1053,7 @@ msgstr "" msgid "Clear" msgstr "" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1058,7 +1061,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "" @@ -1083,7 +1086,7 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "" @@ -1095,12 +1098,12 @@ msgstr "" msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "" @@ -1114,22 +1117,22 @@ msgstr "" msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "" @@ -1138,16 +1141,16 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Connect Balance Board" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1168,7 +1171,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "" @@ -1188,7 +1191,7 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "" @@ -1197,7 +1200,7 @@ msgstr "" msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "" @@ -1211,7 +1214,7 @@ msgstr "" msgid "Could not initialize backend %s." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1219,22 +1222,16 @@ msgid "" "most PC DVD drives." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1248,11 +1245,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1263,7 +1260,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "" @@ -1300,12 +1297,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "" @@ -1313,11 +1310,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" @@ -1329,36 +1326,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "" @@ -1370,7 +1367,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1378,7 +1375,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "" @@ -1415,8 +1412,8 @@ msgstr "" msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "" @@ -1428,7 +1425,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "" @@ -1470,8 +1467,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "" @@ -1483,7 +1480,7 @@ msgstr "" msgid "Direct3D11" msgstr "" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "" @@ -1533,7 +1530,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "" @@ -1557,24 +1554,60 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "" @@ -1590,12 +1623,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1603,7 +1636,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "" @@ -1619,12 +1652,12 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" @@ -1648,11 +1681,11 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "" @@ -1689,9 +1722,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1720,7 +1753,7 @@ msgstr "" msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "" @@ -1732,16 +1765,20 @@ msgstr "" msgid "Edit Config" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "" @@ -1753,7 +1790,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "" @@ -1780,7 +1817,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "" @@ -1802,11 +1839,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1814,27 +1851,27 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "" @@ -1842,7 +1879,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "" @@ -1850,7 +1887,7 @@ msgstr "" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "" @@ -1867,7 +1904,7 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1893,33 +1930,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -1928,7 +1959,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -1945,9 +1976,9 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1976,11 +2007,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2007,7 +2038,6 @@ msgid "Euphoria" msgstr "" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2016,16 +2046,20 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +msgid "Export All Wii Saves" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "" @@ -2033,7 +2067,7 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "" @@ -2049,8 +2083,8 @@ msgstr "" msgid "Export all saves" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +msgid "Export failed" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 @@ -2073,44 +2107,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "" @@ -2126,11 +2160,11 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "" @@ -2138,7 +2172,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2170,16 +2204,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2203,12 +2237,12 @@ msgid "" "(0x6000-0x7FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2225,7 +2259,7 @@ msgid "" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2235,29 +2269,34 @@ msgid "" "(0x0000-0x1FFF)" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, c-format +msgid "Failed to read header for file %d" +msgstr "" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, c-format +msgid "Failed to write data to file: %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "" @@ -2269,17 +2308,17 @@ msgstr "" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "" @@ -2316,16 +2355,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2353,7 +2392,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "" @@ -2377,7 +2416,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2394,7 +2433,7 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2403,6 +2442,11 @@ msgstr "" msgid "Found %d results for '" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, c-format +msgid "Found %x save files" +msgstr "" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2432,7 +2476,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "" @@ -2444,9 +2488,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "" @@ -2459,7 +2503,7 @@ msgstr "" msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "" @@ -2471,7 +2515,7 @@ msgstr "" msgid "GCI File(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "" @@ -2479,27 +2523,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "" @@ -2507,7 +2551,7 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "" @@ -2516,16 +2560,16 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "" @@ -2539,7 +2583,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "" @@ -2548,9 +2592,9 @@ msgstr "" msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "" @@ -2559,11 +2603,11 @@ msgstr "" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "" @@ -2582,7 +2626,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "" @@ -2610,7 +2654,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "" @@ -2622,7 +2666,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2634,7 +2678,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2664,7 +2708,7 @@ msgid "Home" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "" @@ -2673,11 +2717,11 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "" @@ -2685,12 +2729,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2699,11 +2743,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "" @@ -2719,11 +2763,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "" @@ -2735,7 +2779,7 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2767,8 +2811,12 @@ msgstr "" msgid "Import Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +msgid "Import Wii Save" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +msgid "Import failed" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 @@ -2787,20 +2835,16 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 msgid "Increase Frame limit" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "" @@ -2820,7 +2864,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "" @@ -2828,7 +2872,7 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "" @@ -2836,39 +2880,40 @@ msgstr "" msgid "Install to Wii Menu" msgstr "" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "" @@ -2891,15 +2936,15 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" @@ -2929,7 +2974,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "" @@ -2945,13 +2990,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "" @@ -2959,16 +3004,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "" @@ -2991,8 +3036,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "" @@ -3010,16 +3055,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3055,7 +3100,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "" @@ -3143,15 +3188,15 @@ msgstr "" msgid "Load State Slot 9" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3167,10 +3212,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "" @@ -3200,11 +3241,11 @@ msgid "Logger Outputs" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "" @@ -3212,14 +3253,14 @@ msgstr "" msgid "M Button" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "" @@ -3233,11 +3274,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "" @@ -3268,7 +3309,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "" @@ -3278,7 +3319,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3297,7 +3338,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "" @@ -3310,7 +3351,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "" @@ -3447,7 +3488,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3494,7 +3535,7 @@ msgstr "" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "" @@ -3520,7 +3561,7 @@ msgstr "" msgid "No recorded file" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "" @@ -3529,11 +3570,11 @@ msgstr "" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "" @@ -3541,17 +3582,17 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "" @@ -3597,7 +3638,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "" @@ -3605,16 +3646,20 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "" @@ -3627,7 +3672,7 @@ msgstr "" msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "" @@ -3653,6 +3698,16 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3674,7 +3729,7 @@ msgstr "" msgid "Other" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3684,7 +3739,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "" @@ -3692,7 +3747,7 @@ msgstr "" msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "" @@ -3721,21 +3776,21 @@ msgstr "" msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "" @@ -3748,7 +3803,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "" @@ -3758,9 +3813,9 @@ msgid "Perspective %d" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "" @@ -3772,7 +3827,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "" @@ -3780,11 +3835,11 @@ msgstr "" msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "" @@ -3796,36 +3851,36 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "" @@ -3833,17 +3888,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3876,7 +3931,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "" @@ -3884,8 +3939,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "" @@ -3946,6 +4001,10 @@ msgstr "" msgid "Record" msgstr "" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +msgid "Record input" +msgstr "" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "" @@ -3976,7 +4035,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "" @@ -3985,14 +4044,14 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "" @@ -4020,7 +4079,7 @@ msgstr "" msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4038,13 +4097,12 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "" @@ -4057,7 +4115,7 @@ msgid "Safe" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "" @@ -4114,28 +4172,28 @@ msgstr "" msgid "Save State Slot 9" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4157,7 +4215,7 @@ msgstr "" msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "" @@ -4173,7 +4231,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "" @@ -4196,12 +4254,12 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "" @@ -4220,19 +4278,19 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "" @@ -4285,7 +4343,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "" @@ -4297,11 +4355,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4320,25 +4378,25 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +msgid "SetupWiiMem: Cant create setting file" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "" @@ -4346,23 +4404,27 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +msgid "Show Defaults" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "" @@ -4374,11 +4436,11 @@ msgstr "" msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "" @@ -4386,35 +4448,35 @@ msgstr "" msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "" @@ -4422,27 +4484,27 @@ msgstr "" msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4457,7 +4519,7 @@ msgstr "" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4488,7 +4550,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "" @@ -4503,7 +4565,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" @@ -4511,11 +4573,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4533,17 +4595,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "" @@ -4551,7 +4613,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "" @@ -4563,7 +4625,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "" @@ -4581,9 +4643,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "" @@ -4603,37 +4665,29 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "" @@ -4649,7 +4703,7 @@ msgstr "" msgid "State Saves" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "" @@ -4658,7 +4712,7 @@ msgid "Stick" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "" @@ -4684,16 +4738,16 @@ msgstr "" msgid "Subtract" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4701,18 +4755,18 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "" @@ -4741,13 +4795,13 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "" @@ -4767,7 +4821,7 @@ msgstr "" msgid "Texture Format Overlay" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "" @@ -4779,13 +4833,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -4833,29 +4887,29 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "" @@ -4864,17 +4918,17 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4886,7 +4940,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4902,7 +4956,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -4910,7 +4964,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4957,7 +5011,7 @@ msgstr "" msgid "Toggle Fog" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "" @@ -4967,11 +5021,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -4993,7 +5047,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "" @@ -5041,7 +5095,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "" @@ -5077,12 +5131,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5101,7 +5155,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5113,7 +5167,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "" @@ -5133,6 +5187,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5150,7 +5213,7 @@ msgstr "" msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "VBeam Speed Hack" msgstr "" @@ -5174,7 +5237,7 @@ msgstr "" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "" @@ -5182,17 +5245,17 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" @@ -5222,7 +5285,7 @@ msgstr "" msgid "Warning - starting ISO in wrong console mode!" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5239,7 +5302,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5247,7 +5310,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5255,7 +5318,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5291,23 +5354,19 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5316,7 +5375,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "" @@ -5325,7 +5384,7 @@ msgstr "" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "" @@ -5333,7 +5392,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "" @@ -5357,14 +5416,14 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5424,7 +5483,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "" @@ -5440,7 +5499,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5451,7 +5510,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5465,7 +5524,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "" @@ -5515,7 +5574,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "" @@ -5528,7 +5587,16 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +msgid "unknown message received" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index ccc87a5c2a..44f2b2daea 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-17 21:42+0000\n" "Last-Translator: Puniasterus \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/dolphin-emu/" @@ -27,9 +27,9 @@ msgstr "" msgid " (too many to display)" msgstr "(demasiados para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " Juego:" @@ -46,7 +46,7 @@ msgstr "" "\"%s\" no existe.\n" "¿Crear una nueva tarjeta de memoria de 16 MB?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." @@ -71,8 +71,8 @@ msgstr "muestras %d" msgid "%d samples (quality level %d)" msgstr "muestras %d (nivel de calidad %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s ya existe. ¿Sobrescribir?" @@ -110,12 +110,17 @@ msgstr "" "El fichero no es suficientemente grande para ser un fichero de tarjeta de " "memoria válido(0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "Fallo al abrir %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "Fallo al abrir %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s es un archivo de 0 bytes" @@ -125,7 +130,7 @@ msgstr "%s es un archivo de 0 bytes" msgid "%s is already compressed! Cannot compress it further." msgstr "¡%s ya está comprimido! No puede comprimirse más." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "" @@ -156,7 +161,7 @@ msgstr "%u Bloques libres; %u entradas de dir. libres" msgid "&& AND" msgstr "&& Y" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Acerca de..." @@ -164,7 +169,7 @@ msgstr "&Acerca de..." msgid "&Boot from DVD Drive..." msgstr "&Iniciar desde unidad de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Puntos de partida" @@ -172,7 +177,7 @@ msgstr "&Puntos de partida" msgid "&Browse for ISOs..." msgstr "&Buscar ISO en..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Administrador de &trucos" @@ -196,11 +201,11 @@ msgstr "&Emulación" msgid "&File" msgstr "&Archivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "Avanzar &frame" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Pantalla completa" @@ -208,7 +213,7 @@ msgstr "&Pantalla completa" msgid "&Graphics Settings" msgstr "&Configuración gráfica" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Ayuda" @@ -216,7 +221,7 @@ msgstr "&Ayuda" msgid "&Hotkey Settings" msgstr "&Configuración de atajos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -228,11 +233,11 @@ msgstr "&Cargar estado" msgid "&Memcard Manager (GC)" msgstr "&Administrador de tarjetas de memoria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Abrir..." @@ -240,11 +245,11 @@ msgstr "&Abrir..." msgid "&Options" msgstr "&Opciones" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Jugar" @@ -252,39 +257,39 @@ msgstr "&Jugar" msgid "&Properties" msgstr "&Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Modo de solo lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registros" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Sonido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Detener" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Herramientas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Vista" @@ -373,7 +378,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -381,7 +386,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -389,8 +394,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "¡¡Una ventana de NetPlay ya está abierta!!" @@ -417,8 +422,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -443,13 +446,13 @@ msgstr "" "\n" "¡¡Debes redireccionar el puerto TCP para alojar!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "Placa base AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Códigos AR" @@ -583,11 +586,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Añadir parche" @@ -595,9 +598,9 @@ msgstr "Añadir parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Añadir..." @@ -650,36 +653,36 @@ msgstr "" msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Configuración avanzada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas las imágenes de GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" @@ -707,7 +710,7 @@ msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?" msgid "Apploader unable to load from file" msgstr "Apploader no puede cargar desde el archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -725,7 +728,7 @@ msgstr "" "\n" "Si no estás seguro, selecciona (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Árabe" @@ -734,7 +737,7 @@ msgstr "Árabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "¿Estás seguro de que quieres borrar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,15 +745,15 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (experimental)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -759,12 +762,12 @@ msgstr "Relación de aspecto:" msgid "At least one pane must remain open." msgstr "Al menos una ventana debe permancer abierta." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Motor de audio:" @@ -772,7 +775,7 @@ msgstr "Motor de audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Automático" @@ -811,7 +814,7 @@ msgstr "Registro BP" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Configuración del motor" @@ -829,7 +832,7 @@ msgstr "Detectar entrada sin foco" msgid "Backward" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Cabecera de archivo incorrecta" @@ -842,11 +845,11 @@ msgstr "" msgid "Banner" msgstr "Imagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Detalles de la imagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Imagen:" @@ -858,7 +861,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Configuración básica" @@ -887,7 +890,7 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Inferior" @@ -896,11 +899,11 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controles asignados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Roto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Buscar" @@ -908,15 +911,15 @@ msgstr "Buscar" msgid "Browse for a directory to add" msgstr "Busca un directorio para añadir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Buscar un directorio de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Busca un directorio de salida" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Búfer:" @@ -926,7 +929,7 @@ msgstr "Búfer:" msgid "Buttons" msgstr "Botones" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -950,7 +953,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "Registro CP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" @@ -975,7 +978,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "No se puede encontrar un WiiMote por el manejador de conexión %02x" @@ -990,9 +993,9 @@ msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" msgid "Cancel" msgstr "Cancelar" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "No se puede abrir %s" @@ -1001,7 +1004,7 @@ msgstr "No se puede abrir %s" msgid "Cannot unregister events with events pending" msgstr "No se puede cancelar el registro de eventos con eventos pendientes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1012,7 +1015,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1024,7 +1027,7 @@ msgstr "" msgid "Caps Lock" msgstr "Bloq Mayús" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalán" @@ -1032,11 +1035,11 @@ msgstr "Catalán" msgid "Center" msgstr "Centro" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Cambiar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Cambiar &disco..." @@ -1044,11 +1047,11 @@ msgstr "Cambiar &disco..." msgid "Change Disc" msgstr "Cambiar disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Cambiar juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1064,12 +1067,12 @@ msgstr "Cambia el signo del parámetro zFar (después de la corrección)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia el signo del parámetro zNear (después de la corrección)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "¡Cambiar esto no tendrá ningún efecto mientras el emulador esté ejecutandose!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1085,39 +1088,39 @@ msgstr "Buscar trucos" msgid "Cheats Manager" msgstr "Administrador de trucos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Comprobar integridad de la partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Comprobando integridad..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chino (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Escoge un archivo para abrir" @@ -1125,7 +1128,7 @@ msgstr "Escoge un archivo para abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1133,8 +1136,8 @@ msgstr "" "Escoge el archivo a usar como apploader: (se aplica a los discos construidos " "a partir de directorios solamente)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Escoge la carpeta de destino" @@ -1153,7 +1156,7 @@ msgstr "Clásico" msgid "Clear" msgstr "Limpiar" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1163,7 +1166,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Cerrar" @@ -1188,7 +1191,7 @@ msgstr "Comando" msgid "Comment" msgstr "Comentario" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Comentario:" @@ -1200,12 +1203,12 @@ msgstr "Comprimir ISO..." msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Comprimiendo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Configuración" @@ -1219,22 +1222,22 @@ msgstr "Configurar" msgid "Configure Control" msgstr "Configurar control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Configurar mandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" @@ -1243,17 +1246,17 @@ msgstr "Confirmar al detenerse" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Conectar teclado USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Conectar teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" @@ -1274,7 +1277,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Conectando..." @@ -1294,7 +1297,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Convertir a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Fallo al copiar" @@ -1303,7 +1306,7 @@ msgstr "Fallo al copiar" msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Núcleo" @@ -1317,7 +1320,7 @@ msgstr "No se pudo crear %s" msgid "Could not initialize backend %s." msgstr "No se pudo inicializar el motor %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1328,26 +1331,16 @@ msgstr "" "seguridad de GC/Wii. Ten en cuenta que discos de Gamecube o Wii originales " "no pueden ser leídos en la mayoría de los lectores DVD." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "No se pudo reconocer el archivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "No se pudo guardar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"No se pudieron definir los pads. ¡El jugador se fue, o el juego aún se está " -"ejecutándo!\n" -"(definir los pads mientras el juego está ejecutándose no está permitido " -"todavía)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1369,11 +1362,11 @@ msgstr "" "Si es así, entonces es posible que tengas que volver a especificar la " "ubicación de la tarjeta de memoria en las opciones." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo encontrar el comando para abrir la extensión 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1386,7 +1379,7 @@ msgstr "" msgid "Count:" msgstr "Cuenta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "País:" @@ -1426,13 +1419,13 @@ msgstr "" msgid "Crossfade" msgstr "Desvanecimiento cruzado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" "¡El directorio actual ha cambiado de %s a %s después de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Hack de proyección personalizado" @@ -1440,11 +1433,11 @@ msgstr "Hack de proyección personalizado" msgid "Custom Projection Hack Settings" msgstr "Configuración del hack de proyección personalizado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Checo" @@ -1456,36 +1449,37 @@ msgstr "D" msgid "D-Pad" msgstr "Pad direccional" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP en proceso dedicado" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP en proceso dedicado" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Raíz DVD:" @@ -1497,7 +1491,7 @@ msgstr "DVDLowRead - Error fatal: fallo al leer del volumen" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Error fatal: fallo al leer el volumen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1505,7 +1499,7 @@ msgstr "" msgid "Data Size" msgstr "Tamaño de datos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Fecha:" @@ -1542,8 +1536,8 @@ msgstr "Descomprimir ISO..." msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Descomprimir ISO" @@ -1556,7 +1550,7 @@ msgstr "Actualizar lista de juegos" msgid "Default" msgstr "Predeterminado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "ISO por defecto:" @@ -1600,8 +1594,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1613,7 +1607,7 @@ msgstr "Marcar" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1682,7 +1676,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disco" @@ -1709,24 +1703,60 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Decodificador Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuración gráfica %s de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "&Website de Dolphin" @@ -1742,12 +1772,12 @@ msgstr "Configuración de Wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1755,7 +1785,7 @@ msgstr "Películas TAS de Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuración de Wiimote de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" @@ -1775,12 +1805,12 @@ msgstr "" "Dolphin está configurado actualmente para esconder todos los juegos. Haz " "doble clic aquí para mostrarlos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin no ha podido completar la acción solicitada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1807,11 +1837,11 @@ msgstr "Se descargaron %lu códigos. (%lu añadidos)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Falso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Depósito de audio" @@ -1857,9 +1887,9 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holandés" @@ -1892,7 +1922,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Actualización frecuente de memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Editar" @@ -1904,16 +1934,20 @@ msgstr "Editar código ActionReplay" msgid "Edit Config" msgstr "Editar configuración" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Editar parche" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Editar..." @@ -1925,7 +1959,7 @@ msgstr "Efecto" msgid "Embedded Frame Buffer" msgstr "Búfer de fotogramas embebido" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "El proceso de emulación ya está ejecutándose" @@ -1964,7 +1998,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Estado de emulación:" @@ -1992,11 +2026,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" @@ -2004,27 +2038,27 @@ msgstr "Permitir el cálculo del cuadro delimitador" msgid "Enable Cache" msgstr "Habilitar caché" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Habilitar trucos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Habilitar MMU" @@ -2032,7 +2066,7 @@ msgstr "Habilitar MMU" msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" @@ -2040,7 +2074,7 @@ msgstr "Habilitar salvapantallas" msgid "Enable Speaker Data" msgstr "Activar datos de altavoz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" @@ -2062,7 +2096,7 @@ msgstr "" "\n" "Si no estás seguro, elige 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2099,7 +2133,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2107,11 +2141,11 @@ msgstr "" "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar para CUALQUIER OTRO juego." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2119,19 +2153,11 @@ msgstr "" "Activa la emulación de Dolby Pro Logic II usando 5.1 surround. No disponible " "en OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL. " -"Requiere que renombres soft_oal.dll a OpenAL32.dll para que funcione." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2144,7 +2170,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2166,9 +2192,9 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglés" @@ -2197,11 +2223,11 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al predeterminado del " @@ -2234,7 +2260,6 @@ msgid "Euphoria" msgstr "Euforia" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Exception handler - acceso debajo del espacio de memoria. %08llx%08llx" @@ -2243,16 +2268,21 @@ msgstr "Exception handler - acceso debajo del espacio de memoria. %08llx%08llx" msgid "Execute" msgstr "Ejecutar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exportar todos los guardados" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Fallo al exportar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exportar archivo" @@ -2260,7 +2290,7 @@ msgstr "Exportar archivo" msgid "Export Recording" msgstr "Exportar grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exportar grabación..." @@ -2276,9 +2306,10 @@ msgstr "Exportar guardado a uno de Wii (experimental)" msgid "Export all saves" msgstr "Exportar todos los guardados" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Fallo al exportar. ¿Intentar de nuevo?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Fallo al exportar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2300,44 +2331,44 @@ msgstr "Parámetro extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parámetro extra que es útil en «Metroid: Other M» exclusivamente." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Extraer todos los archivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Extraer Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Extraer DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Extraer directorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Extraer archivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Extraer partición..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Extrayendo directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Extrayendo..." @@ -2353,11 +2384,11 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Tamaño del FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "¡Fallo al conectar!" @@ -2365,7 +2396,7 @@ msgstr "¡Fallo al conectar!" msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Fallo al extraer a %s!" @@ -2405,16 +2436,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Error al leer %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Fallo al leer banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Fallo al leer la cabecera bk" @@ -2445,12 +2476,12 @@ msgstr "" "Falló leer la tabla de asignación de bloques correctamente\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Fallo al leer los datos del archivo %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Fallo al leer los datos del archivo: %s" @@ -2471,7 +2502,7 @@ msgstr "" "Falló la lectura del directorio\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Fallo al leer la cabecera" @@ -2483,29 +2514,34 @@ msgstr "" "Falló leer la cabecera correctamente\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Fallo al escribir la cabecera para el archivo %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Fallo al leer la ID única de la imagen de disco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Fallo al escribir BT.DINF a SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Fallo al escribir bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Fallo al leer los datos del archivo: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Fallo al escribir la cabecera para %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Fallo al escribir la cabecera para el archivo %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Persa" @@ -2517,11 +2553,11 @@ msgstr "Rápido" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versión rápida del MMU. No funciona para todos los juegos." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2529,7 +2565,7 @@ msgstr "" "Desincronización fatal. Cancelando reproducción. (Error en PlayWiimote: %u !" "= %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Jugador Fifo" @@ -2570,16 +2606,16 @@ msgstr "El archivo no es reconocido como una tarjeta de memoria" msgid "File not compressed" msgstr "Archivo sin comprimir" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo desconocido de apertura : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo 'ini' desconocido¡ !No se abrirá!" @@ -2607,7 +2643,7 @@ msgstr "Forzar 16:9" msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" @@ -2642,7 +2678,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2664,7 +2700,7 @@ msgstr "" msgid "Forward" msgstr "Adelante" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2673,6 +2709,11 @@ msgstr "" msgid "Found %d results for '" msgstr "%d coincidencias para '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "No se pudo guardar %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2702,7 +2743,7 @@ msgstr "Información de la grabación" msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Límite de fotogramas:" @@ -2714,9 +2755,9 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francés" @@ -2729,7 +2770,7 @@ msgstr "Cuerdas" msgid "From" msgstr "Desde" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Pant. compl." @@ -2741,7 +2782,7 @@ msgstr "Resolución en pantalla completa:" msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "Pad GC" @@ -2749,27 +2790,27 @@ msgstr "Pad GC" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID del juego:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "¡El juego ya está ejecutándose!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "¡El juego no está ejecutándose!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "¡Juego no encontrado!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Configuración específica del juego" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Configurar Juego" @@ -2777,7 +2818,7 @@ msgstr "Configurar Juego" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Ficheros de guardado de GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2786,16 +2827,16 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Configuración del Pad de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2813,7 +2854,7 @@ msgstr "" "en el directorio Sys y reiniciando Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "General" @@ -2822,9 +2863,9 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Alemán" @@ -2834,11 +2875,11 @@ msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: El índice es mayor que el tamaño de la lista de códigos AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Configuración gráfica" @@ -2864,7 +2905,7 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Griego" @@ -2892,7 +2933,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebreo" @@ -2904,7 +2945,7 @@ msgstr "Altura" msgid "Help" msgstr "Ayuda" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2925,7 +2966,7 @@ msgstr "" "\n" "¡Adiós!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2965,7 +3006,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Hostear" @@ -2974,11 +3015,11 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Húngaro" @@ -2986,14 +3027,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote híbrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Se trató de obtener los datos de un ticket desconocido: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -3006,11 +3047,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin probablemente se colgará ahora." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Configuración IPL" @@ -3026,11 +3067,11 @@ msgstr "Puntero IR" msgid "IR Sensitivity:" msgstr "Sensibilidad IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Detalles de la ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Directorios de ISO" @@ -3042,7 +3083,7 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icono" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3086,9 +3127,15 @@ msgstr "" msgid "Import Save" msgstr "Importar Guardado" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Fallo al importar. ¿Probar otra vez?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importar Guardado" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Fallo al exportar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3110,21 +3157,17 @@ msgstr "" "El archivo importado tiene extensión .sav\n" "pero no tiene la cabecera correcta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "En juego" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "En juego" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Límite de fotogramas:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Información" @@ -3144,7 +3187,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3152,7 +3195,7 @@ msgstr "Insertar tarjeta SD" msgid "Insert name here.." msgstr "Insertar un nombre aquí.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Instalar WAD" @@ -3160,30 +3203,31 @@ msgstr "Instalar WAD" msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Error de comprobación de la integridad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Comprobación de la integridad finalizada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Comprobación de la integridad finalizada. No se encontraron errores." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3192,11 +3236,11 @@ msgstr "" "Falló la comprobación de la integridad para la partición %d. Tu volcado está " "probablemente corrupto o ha sido parcheado incorrectamente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Configuración de la interfaz" @@ -3221,15 +3265,15 @@ msgstr "Error Interno de LZO - lzo_init() falló" msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamaño no válido(%x) o Magic word (%x)" @@ -3262,7 +3306,7 @@ msgstr "" "%s\n" "Puede ser que necesites volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" @@ -3278,13 +3322,13 @@ msgstr "Cadena de búsqueda incorrecta (no se pudo convertir en un número)" msgid "Invalid search string (only even string lengths supported)" msgstr "Búsqueda de cadena incorrecta (solo se soportan algunas longitudes)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Estado no válido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italiano" @@ -3292,16 +3336,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japonés" @@ -3327,8 +3371,8 @@ msgstr "Mantener la ventana siempre visible" msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Coreano" @@ -3346,16 +3390,16 @@ msgstr "Botón L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Latencia:" @@ -3398,7 +3442,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Usar FPS para limitar" @@ -3497,15 +3541,15 @@ msgstr "&Cargar estado 8" msgid "Load State Slot 9" msgstr "&Cargar estado 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Cargar estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3524,10 +3568,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Cargar valores ya definidos de los patrones de hack disponibles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Local" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Registrar" @@ -3562,11 +3602,11 @@ msgid "Logger Outputs" msgstr "Salida de registro" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Registrando" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "¡Se perdió la conexión con el servidor!" @@ -3574,7 +3614,7 @@ msgstr "¡Se perdió la conexión con el servidor!" msgid "M Button" msgstr "Botón M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3583,7 +3623,7 @@ msgstr "" "MD5 no coinciden\n" "%016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" @@ -3597,11 +3637,11 @@ msgstr "Archivos MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID del fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Fabricante:" @@ -3638,7 +3678,7 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3650,7 +3690,7 @@ msgstr "" "Administrador de tarjetas de memoria. ADVERTENCIA: Haz copias antes de " "usarlo; debería estar arreglado, ¡pero puede estropear cosas!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3677,7 +3717,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mic" @@ -3690,7 +3730,7 @@ msgstr "Mín." msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3839,7 +3879,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3886,7 +3926,7 @@ msgstr "Ninguna ISO o WAD ha sido encontrada." msgid "No audio output" msgstr "Sin salida de audio" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "No se encontró un archivo de banner para el juego %s" @@ -3912,7 +3952,7 @@ msgstr "No hay entradas de índice de directorio libres" msgid "No recorded file" msgstr "No hay grabaciones guardadas" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "No se encontró carpeta de guardado para el juego %s" @@ -3921,11 +3961,11 @@ msgstr "No se encontró carpeta de guardado para el juego %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" @@ -3933,19 +3973,19 @@ msgstr "Noruego Bokmal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "No definido" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" "No es un guardado de Wii o fallo de lectura para la cabecera de archivo de " "tamaño %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Sin conectar" @@ -3991,7 +4031,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Rango de objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Off" @@ -3999,16 +4039,20 @@ msgstr "Off" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Mensajes en pantalla" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Solo %d bloques disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Abrir" @@ -4021,7 +4065,7 @@ msgstr "Abrir directorio &contenedor" msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Abrir archivo..." @@ -4047,6 +4091,16 @@ msgstr "Descodificador de texturas OpenCL" msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4073,7 +4127,7 @@ msgstr "" msgid "Other" msgstr "Otros" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4085,7 +4139,7 @@ msgstr "" msgid "Output" msgstr "Salida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "&Reproducir grabación" @@ -4093,7 +4147,7 @@ msgstr "&Reproducir grabación" msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Pad" @@ -4122,21 +4176,21 @@ msgstr "Parámetros" msgid "Partition %i" msgstr "Partición %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Directorios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pausa" @@ -4149,7 +4203,7 @@ msgstr "Pausar al acabar la película" msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfecto" @@ -4159,9 +4213,9 @@ msgid "Perspective %d" msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Reproducir" @@ -4173,7 +4227,7 @@ msgstr "Reproducir grabación" msgid "Play/Pause" msgstr "Reproducir/pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Jugable" @@ -4181,11 +4235,11 @@ msgstr "Jugable" msgid "Playback Options" msgstr "Opciones de reproducción" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Jugadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4197,36 +4251,36 @@ msgstr "Por favor, crea una perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Más-menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Puerto 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" @@ -4234,17 +4288,17 @@ msgstr "Portugués (Brasil)" msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Final prematuro de la película en PlayWiimote. %u > %u" @@ -4277,7 +4331,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Limpiar caché" @@ -4285,8 +4339,8 @@ msgstr "Limpiar caché" msgid "Question" msgstr "Pregunta" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Salir" @@ -4347,6 +4401,11 @@ msgstr "Wiimotes reales" msgid "Record" msgstr "Grabar" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Opciones de grabación" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Información de la grabación" @@ -4382,7 +4441,7 @@ msgstr "" "Si no estás seguro, selecciona Ninguno." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Actualizar" @@ -4391,14 +4450,14 @@ msgstr "Actualizar" msgid "Refresh List" msgstr "Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Actualizar lista de juegos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Eliminar" @@ -4429,7 +4488,7 @@ msgstr "Resultados" msgid "Return" msgstr "Volver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4447,15 +4506,15 @@ msgstr "Stick Derecho" msgid "Rumble" msgstr "Vibración" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Ejecutar DSP HLE y LLE en un proceso dedicado (no recomendado: podría causar " "interferencias de audio con HLE y se cuelgue con LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Ruso" @@ -4468,7 +4527,7 @@ msgid "Safe" msgstr "Seguro" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Guardar" @@ -4529,28 +4588,28 @@ msgstr "Guardar estado 8" msgid "Save State Slot 9" msgstr "Guardar estado 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Guardar estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4574,7 +4633,7 @@ msgstr "Buscando ISOs" msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Pantallazo" @@ -4590,7 +4649,7 @@ msgstr "Buscar" msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" @@ -4613,12 +4672,12 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4640,19 +4699,19 @@ msgstr "Selecciona un archivo de guardado para importar" msgid "Select floating windows" msgstr "Selecciona las ventanas flotantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4732,7 +4791,7 @@ msgstr "" "\n" "Si no estás seguro, utiliza OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Enviar" @@ -4744,11 +4803,11 @@ msgstr "Posición de la barra sensora:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4771,7 +4830,7 @@ msgstr "" "SetARCode_IsActive: El índice es mayor que el tamaño de la lista de códigos " "AR %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4779,19 +4838,20 @@ msgstr "" "Ajusta la latencia (en ms). Valores más altos pueden reducir el petardeo del " "audio. Solo para el motor OpenAL." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Configuración..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Nombre corto:" @@ -4799,23 +4859,28 @@ msgstr "Nombre corto:" msgid "Shoulder Buttons" msgstr "Botones laterales" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Mostrar &consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Mostrar ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Mostrar barra de e&stado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Mostrar barra de herramien&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Predeterminado" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Mostrar unidades" @@ -4827,11 +4892,11 @@ msgstr "Mostrar regiones de copiado de EFB" msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Mostrar Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Mostrar Gamecube" @@ -4839,35 +4904,35 @@ msgstr "Mostrar Gamecube" msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Mostrar Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Mostrar idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Mostrar configuración de ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Mostrar plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Mostrar regiones" @@ -4875,27 +4940,27 @@ msgstr "Mostrar regiones" msgid "Show Statistics" msgstr "Mostar estadísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Mostrar Taiwán" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Mostrar USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Mostrar WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar una ventana de confirmación antes de detener un juego." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4914,7 +4979,7 @@ msgstr "Mostrar primer bloque" msgid "Show lag counter" msgstr "Mostrar contador de lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4952,7 +5017,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Mostrar desconocido" @@ -4970,7 +5035,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chino simplificado" @@ -4978,11 +5043,11 @@ msgstr "Chino simplificado" msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Saltar limpieza DCBZ" @@ -5007,17 +5072,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Ranura B" @@ -5025,7 +5090,7 @@ msgstr "Ranura B" msgid "Snapshot" msgstr "Instántanea" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Renderizado por software" @@ -5041,7 +5106,7 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si no estás seguro, " "elige No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Configuración de sonido" @@ -5059,9 +5124,9 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Español" @@ -5089,37 +5154,29 @@ msgstr "" "\n" "Si no estás seguro, elige 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Acelerar la transferencia de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Stick cuadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Control estándar" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Comenzar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Comenzar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Comenzar graba&ción" @@ -5135,7 +5192,7 @@ msgstr "Estado" msgid "State Saves" msgstr "Estados guardados" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Volante" @@ -5144,7 +5201,7 @@ msgid "Stick" msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Detener" @@ -5175,16 +5232,16 @@ msgstr "Rasgar" msgid "Subtract" msgstr "Sustraer" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Se exportó correctamente al archivo %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Los archivos de guardado se han importado con éxito." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5192,11 +5249,11 @@ msgstr "" msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Sincronizar subproceso de GPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5204,8 +5261,8 @@ msgstr "" "Sincroniza los subprocesos la GPU y la CPU para ayudar a prevenir bloqueos " "aleatorios en el modo a Doble Núcleo. (ON = Compatible, OFF = rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5234,13 +5291,13 @@ msgstr "Tabla izquierda" msgid "Table Right" msgstr "Tabla derecha" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Captura de pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5260,7 +5317,7 @@ msgstr "Caché de texturas" msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "El WAD ha sido instalado con éxito" @@ -5272,13 +5329,13 @@ msgstr "La dirección no es válida" msgid "The checksum was successfully fixed" msgstr "La suma de verificación fue reparada con éxito." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "El directorio escogido ya se encuentra en la lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5336,7 +5393,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "El guardado que está tratando de copiar tiene un tamaño de archivo no válido" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5344,23 +5401,23 @@ msgstr "" "El idioma seleccionado no es soportado por tu sistema. Volviendo al " "predeterminado del sistema." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "¡Las versiones de NetPlay del client y el servidor son incompatibles!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "¡El servidor está lleno!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "El servidor respondió: ¡el juego actualmente está funcionando!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "¡El servidor envió un mensaje de error desconocido!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "El archivo especificado \"%s\" no existe" @@ -5369,11 +5426,11 @@ msgstr "El archivo especificado \"%s\" no existe" msgid "The value is invalid" msgstr "El valor no es válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Tema:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5381,7 +5438,7 @@ msgstr "" "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de " "NAND esté incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5397,7 +5454,7 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Esto podría provocar peor rendimiento en el Menú de Wii y algunos juegos." @@ -5423,7 +5480,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5436,7 +5493,7 @@ msgstr "" "DSP para que tenga efecto (debería arreglar los \"clics\" de audio, pero " "puede causar ruido constante dependiendo del juego)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5490,7 +5547,7 @@ msgstr "Copias de EFB" msgid "Toggle Fog" msgstr "Alternar todos los tipos de registro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" @@ -5500,11 +5557,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chino tradicional" @@ -5528,7 +5585,7 @@ msgstr "" "Intentando leer de un SYSCONF no válido\n" "bt ids del Wiimote no están disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turco" @@ -5581,7 +5638,7 @@ msgstr "" "válido cifrado o descifrado. Asegúrate de que la has escrito correctamente.\n" "¿Te gustaría hacer caso omiso de esta línea y continuar el análisis?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" @@ -5618,12 +5675,12 @@ msgstr "Comando desconocido 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "¡Entrada desconocida de tipo %i en SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Se recibió un mensaje desconocido de id: %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5643,7 +5700,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" @@ -5655,7 +5712,7 @@ msgstr "Usar pantalla completa" msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Usar advertencias" @@ -5680,6 +5737,15 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5703,7 +5769,7 @@ msgstr "Utilidad" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "Hack de velocidad MMU" @@ -5728,7 +5794,7 @@ msgstr "Verbosidad" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Vídeo" @@ -5736,17 +5802,17 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volumen" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "La instalación del WAD falló: error al crear %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "La instalación del WAD falló: error al crear el ticket" @@ -5781,7 +5847,7 @@ msgstr "¡Advertencia - arrancando un ELF en un modo de consola incorrecto!" msgid "Warning - starting ISO in wrong console mode!" msgstr "¡Advertencia - arrancando un ISO en un modo de consola incorrecto!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5807,7 +5873,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "¿Continuar?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5818,7 +5884,7 @@ msgstr "" "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otro guardado antes " "de continuar, o cargar éste sin el modo de solo lectura." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5830,7 +5896,7 @@ msgstr "" "con el modo de solo lectura desactivado. De lo contrario probablemente " "obtengas una desincronización." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5881,23 +5947,19 @@ msgstr "Hack de pantalla ancha (widescreen)" msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importar guardado de Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5906,7 +5968,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No se pudo leer el archivo" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5915,7 +5977,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5923,7 +5985,7 @@ msgstr "Wiimote conectado" msgid "Wiimote Motor" msgstr "Motor Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Configuración Wiimote" @@ -5947,14 +6009,14 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Trabajando..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -6019,7 +6081,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "No puede cerrar ventanas que tengan páginas en ellas." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "¡¡Debes elegir un juego!!" @@ -6035,7 +6097,7 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." msgid "You must enter a valid profile name." msgstr "Debes introducir un nombre de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -6049,7 +6111,7 @@ msgstr "" "¿Deseas detener ahora para arreglar el problema?\n" "Si seleccionas \"No\", el audio se oirá con ruidos." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6068,7 +6130,7 @@ msgstr "" "Debería ser 0x%04x (pero es 0x%04llx)\n" "¿Quiere crear uno nuevo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "Zelda TP hack" @@ -6137,7 +6199,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6150,7 +6212,17 @@ msgstr "iCacheJIT: Leyendo Opcode desde %x. Por favor, comunícalo." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Se recibió un mensaje desconocido de id: %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "¡wxExecute dio un -1 al iniciar la aplicación!" @@ -6185,9 +6257,28 @@ msgstr "| OR" #~ msgstr "" #~ "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "No se pudieron definir los pads. ¡El jugador se fue, o el juego aún se " +#~ "está ejecutándo!\n" +#~ "(definir los pads mientras el juego está ejecutándose no está permitido " +#~ "todavía)" + #~ msgid "Enable Hotkeys" #~ msgstr "Habilitar atajos" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL. " +#~ "Requiere que renombres soft_oal.dll a OpenAL32.dll para que funcione." + +#~ msgid "Export failed, try again?" +#~ msgstr "Fallo al exportar. ¿Intentar de nuevo?" + #~ msgid "Failed to Listen!!" #~ msgstr "¡Fallo al escuchar!" @@ -6212,12 +6303,21 @@ msgstr "| OR" #~ "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF " #~ "= Rápido)" +#~ msgid "Import failed, try again?" +#~ msgstr "Fallo al importar. ¿Probar otra vez?" + +#~ msgid "In-Game" +#~ msgstr "En juego" + #~ msgid "Last Overwritten State" #~ msgstr "Último estado sobrescrito" #~ msgid "Last Saved State" #~ msgstr "Último estado guardado" +#~ msgid "Local" +#~ msgstr "Local" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Reconectar Wiimote al cargar estado" @@ -6239,3 +6339,6 @@ msgstr "| OR" #~ "causar errores graves.\n" #~ "\n" #~ "Si no estás seguro, déjala desmarcada." + +#~ msgid "Wii Save Import" +#~ msgstr "Importar guardado de Wii" diff --git a/Languages/po/fa.po b/Languages/po/fa.po index a04c0faec7..341b05a053 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: Delayline \n" "Language-Team: Persian (http://www.transifex.com/projects/p/dolphin-emu/" @@ -23,9 +23,9 @@ msgstr "" msgid " (too many to display)" msgstr "(برای نمایش دادن بسیار زیاد است)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "بازی :" @@ -42,7 +42,7 @@ msgstr "" "\"%s\" وجود ندارد.\n" "یک کارت حافظه ۱۶ مگا بایتی جدید ساخته شود؟" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -69,8 +69,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s وجود دارد، بازنویسی شود؟" @@ -107,12 +107,17 @@ msgstr "" "%s بارگذاری بعنوان کارت حافظه با شکست مواجه شد \n" "فایل به اندازه کافی بزرگ نیست که یک فایل کارت حافظه معتبر باشد (0x%x بایت)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s بازکردن با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s بازکردن با شکست مواجه شد" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s یک فایل با حجم ۰ بایت است" @@ -122,7 +127,7 @@ msgstr "%s یک فایل با حجم ۰ بایت است" msgid "%s is already compressed! Cannot compress it further." msgstr "%s فشرده شده است! توان فشرده سازی بیشتر را ندارد." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s برای اسم فایل بسیار دراز است، حداکثر تعداد کاراکترها ۴۵ است" @@ -151,7 +156,7 @@ msgstr "%u بلوک های آزاد; %u ورودی های پوشه آزاد" msgid "&& AND" msgstr "&& و" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&درباره..." @@ -159,7 +164,7 @@ msgstr "&درباره..." msgid "&Boot from DVD Drive..." msgstr "&بوت شدن از درایو دی وی دی..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&نقاط انفصال" @@ -167,7 +172,7 @@ msgstr "&نقاط انفصال" msgid "&Browse for ISOs..." msgstr "&مرور برای فایل های آیزو..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "مدیریت کدهای &تقلب" @@ -191,11 +196,11 @@ msgstr "&برابرسازی" msgid "&File" msgstr "&فایل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&پيشروى فریم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&تمام صفحه" @@ -203,7 +208,7 @@ msgstr "&تمام صفحه" msgid "&Graphics Settings" msgstr "تنظیمات &گرافیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&کمک" @@ -211,7 +216,7 @@ msgstr "&کمک" msgid "&Hotkey Settings" msgstr "تنظیم &شرت کاتها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&جیت" @@ -223,11 +228,11 @@ msgstr "&بارگذاری وضعیت" msgid "&Memcard Manager (GC)" msgstr "مدیر &کارت حافظه (گیم کیوب)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&حافظه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&باز کردن..." @@ -235,11 +240,11 @@ msgstr "&باز کردن..." msgid "&Options" msgstr "&گزینه ها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "مکث" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&شروع بازی" @@ -247,39 +252,39 @@ msgstr "&شروع بازی" msgid "&Properties" msgstr "خواص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&حالت فقط خواندنی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "ثبت کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "شروع &دوباره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&صدا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&توقف" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&ابزارها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&ویدیو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&دیدگاه" @@ -368,7 +373,7 @@ msgstr "<اسم را اینجا وارد کنید>" msgid "" msgstr "<سایز تصویر پیدا نشد>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "<هیچ>" @@ -376,7 +381,7 @@ msgstr "<هیچ>" msgid "" msgstr "<تکمه فشارى>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<سیستم>" @@ -384,8 +389,8 @@ msgstr "<سیستم>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "پنجره نت پلی از قبل باز است!!" @@ -410,8 +415,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -436,13 +439,13 @@ msgstr "" "\n" "شما باید درگاه TCP را به میزبان ارسال کنید!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "بُردِ مادر ای ام" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "کدهای اکشن ریپلی" @@ -571,11 +574,11 @@ msgstr "آداپتور:" msgid "Add" msgstr "اضافه کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "اضافه کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "اضافه کردن وصله" @@ -583,9 +586,9 @@ msgstr "اضافه کردن وصله" msgid "Add new pane" msgstr "اضافه کردن تکه جدید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "اضافه کردن..." @@ -637,36 +640,36 @@ msgstr "تنظیم فشار کنترل آنالوگ برای فعال کردن msgid "Advanced" msgstr "پیشرفته" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "تنظیمات پیشرفته" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "همه فایل های گیم کیوب/وی (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "همه ایمیجهای گیم کیوب/وی (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "همه فایل های گیم کیوب جی سی ام (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "همه وضعیت های ذخیره (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "همه فایل های آیزو وی (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "همه فایل های آیزو فشرده شده گیم کیوب/وی (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "همه فایل ها (*.*)|*.*" @@ -694,7 +697,7 @@ msgstr "سایز بارگذار برنامه اشتباه است...آیا این msgid "Apploader unable to load from file" msgstr "بارگذار برنامه ناتوان در بارگذاری از فایل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "بار گذار برنامه:" @@ -712,7 +715,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، (خاموش) را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "عربی" @@ -721,7 +724,7 @@ msgstr "عربی" msgid "Are you sure you want to delete \"%s\"?" msgstr "آیا شما مطمئن هستید که میخواهید \"%s\" را حذف کنید؟" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,17 +732,17 @@ msgstr "" "آیا شما مطمئن هستید که میخواهید این فایلها را حذف کنید؟\n" "این فایل ها برای همیشه از بین خواهند رفت!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "آیا شما مطمئن هستید که میخواهید این فایل را حذف کنید؟ این فایل برای همیشه " "از بین خواهند رفت!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "نسبت طول به عرض تصویر:" @@ -748,12 +751,12 @@ msgstr "نسبت طول به عرض تصویر:" msgid "At least one pane must remain open." msgstr "حداقل یک قطه می بایست باز بماند." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "پشتوانه صدا:" @@ -761,7 +764,7 @@ msgstr "پشتوانه صدا:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: خطا در باز کردن دستگاه خروجی صدا.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "اتوماتیک" @@ -800,7 +803,7 @@ msgstr "ثبت اشاره گر پایه" msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "تنظیمات پشتوانه" @@ -818,7 +821,7 @@ msgstr "ورودی پس زمینه" msgid "Backward" msgstr "به عقب" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "سرخط ناصحیح فایل" @@ -831,11 +834,11 @@ msgstr "" msgid "Banner" msgstr "نشان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "جزئیات نشان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "نشان:" @@ -847,7 +850,7 @@ msgstr "نوار" msgid "Basic" msgstr "بنیانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "تنظیمات بنیانی" @@ -876,7 +879,7 @@ msgid "Blue Right" msgstr "آبی راست" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "پائین" @@ -885,11 +888,11 @@ msgstr "پائین" msgid "Bound Controls: %lu" msgstr "کنترل های محدودیت: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "خراب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "مرور" @@ -897,15 +900,15 @@ msgstr "مرور" msgid "Browse for a directory to add" msgstr "مرور برای پوشه جهت اضافه کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "مرور برای پوشه آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "مرور برای پوشه خروجی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "حافظه موقت:" @@ -915,7 +918,7 @@ msgstr "حافظه موقت:" msgid "Buttons" msgstr "دکمه ها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -939,7 +942,7 @@ msgstr "استیک سی" msgid "CP reg" msgstr "ثبت سی پی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "موتور پردازشگر برابرساز" @@ -961,7 +964,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -976,9 +979,9 @@ msgstr "" msgid "Cancel" msgstr "لغو کردن" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "قادر به باز گشایی نیست %s" @@ -987,7 +990,7 @@ msgstr "قادر به باز گشایی نیست %s" msgid "Cannot unregister events with events pending" msgstr "رویدادهایی را که معوق اند نمی تواند از ثبت درآورد." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -998,7 +1001,7 @@ msgstr "" "%s\n" "این یک فایل کارت حافظه معتبر گیم کیوب نیست" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1010,7 +1013,7 @@ msgstr "" msgid "Caps Lock" msgstr "کپس لاک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "کاتالان" @@ -1018,11 +1021,11 @@ msgstr "کاتالان" msgid "Center" msgstr "مرکز" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "تعویض" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "تعویض &دیسک..." @@ -1030,11 +1033,11 @@ msgstr "تعویض &دیسک..." msgid "Change Disc" msgstr "تعویض دیسک" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "تعویض بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1050,12 +1053,12 @@ msgstr "تغییرات علامت به پارامتر z دور (بعد از تص msgid "Changes sign to zNear Parameter (after correction)" msgstr "تغییرات علامت به پارامتر z نزدیک (بعد از تصحیح)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "تغییر دادن این مورد در حالی که برابرساز در حال اجراست اثری نخواهد داشت!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "گپ زدن" @@ -1071,39 +1074,39 @@ msgstr "جستجوی کد تقلب" msgid "Cheats Manager" msgstr "مدیر کدهای تقلب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "برسی عدم نقص پارتیشن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "برسی عدم نقص..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "چینی (ساده شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "انتخاب یک پوشه ریشه برای دی وی دی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "انتخاب یک پوشه ریشه برای نند:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "انتخاب آیزو پیش فرض:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضافه کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "انتخاب فایل برای باز کردن" @@ -1111,7 +1114,7 @@ msgstr "انتخاب فایل برای باز کردن" msgid "Choose a memory card:" msgstr "انتخاب کارت حافظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1119,8 +1122,8 @@ msgstr "" "انتخاب فایل برای استفاده بعنوان بارگذار برنامه: (به دیسک هایی که فقط از پوشه " "ها ساخته شده اند اعمال می کند)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "انتخاب پوشه برای استخراج به آن" @@ -1139,7 +1142,7 @@ msgstr "کلاسیک" msgid "Clear" msgstr "پاک کردن" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1149,7 +1152,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "بستن" @@ -1174,7 +1177,7 @@ msgstr "دستور" msgid "Comment" msgstr "توضیح" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "توضیح:" @@ -1186,12 +1189,12 @@ msgstr "فشرده کردن آیزو..." msgid "Compress selected ISOs..." msgstr "فشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "در حال فشرده کردن آیزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "پیکربندی" @@ -1205,22 +1208,22 @@ msgstr "پیکربندی" msgid "Configure Control" msgstr "کنترل پیکربندی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "پیکربندی گیم پدها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "تائید بازنویسی فایل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "تائید برای توقف" @@ -1229,17 +1232,17 @@ msgstr "تائید برای توقف" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "اتصال کیبورد USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "اتصال ویموت %i" @@ -1260,7 +1263,7 @@ msgstr "اتصال ویموت ۳" msgid "Connect Wiimote 4" msgstr "اتصال ویموت ۴" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "در حال اتصال..." @@ -1280,7 +1283,7 @@ msgstr "کنترل" msgid "Convert to GCI" msgstr "تبدیل به جی سی آی" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "کپی با شکست مواجه شد" @@ -1289,7 +1292,7 @@ msgstr "کپی با شکست مواجه شد" msgid "Copy to Memcard %c" msgstr "کپی به کارت حافظه %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "هسته" @@ -1303,7 +1306,7 @@ msgstr "قادر به ساخت نیست %s" msgid "Could not initialize backend %s." msgstr "قادر به نصب پشتوانه نیست %s" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1314,25 +1317,16 @@ msgstr "" "نیست. لطفا توجه داشته باشید که دیسک های اصلی گیم کیوب/وی توسط اکثر دی وی دی " "درایوهای کامپیوتر قابل خواندن نیستند." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "قادر به تشخیص فایل آیزو %s نبود" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "قادر به ذخیره کردن نیست %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"قادر به ست کردن گیم پدها نیست. بازی کن بازی را ترک کرده و یا بازی در حال " -"اجرا است!\n" -"(ست کردن گیم پدها در حالی که بازی در حال اجرا است فعلا پشتیبانی نمی شود)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1346,11 +1340,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "قادر به یافتن دستور باز برای پسوند 'ini' نیست!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1363,7 +1357,7 @@ msgstr "" msgid "Count:" msgstr "شماردن:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "کشور:" @@ -1403,12 +1397,12 @@ msgstr "" msgid "Crossfade" msgstr "ضرب دری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "هک کردن دستی تصویر" @@ -1416,11 +1410,11 @@ msgstr "هک کردن دستی تصویر" msgid "Custom Projection Hack Settings" msgstr "تنظیمات مربوط به هک کردن دستی تصویر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "دستکاری برخی از پارامتر های خطوط عمودی تصویر." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "چکوسلواکی" @@ -1432,36 +1426,36 @@ msgstr "D" msgid "D-Pad" msgstr "پد هدایتی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "پردازشگر صدای دلفین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "موتور برابرساز پردازشگر صدای دلفین" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "برابرسازی سطح بالای پردازشگر صدای دلفین (سریع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "مفسر سطح پائین پردازشگر صدای دلفین (کند)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "ری کامپایلر سطح پائین پردازشگر صدای دلفین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "تنظیمات پردازشگر صدای دلفین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "ریشه دی وی دی:" @@ -1476,7 +1470,7 @@ msgstr "" "خواندن سطح پائین کد گشایی شده دی وی دی - خطای مهلک: خواندن از روی دیسک با " "شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1484,7 +1478,7 @@ msgstr "" msgid "Data Size" msgstr "اندازه داده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "تاریخ:" @@ -1521,8 +1515,8 @@ msgstr "ناهمفشرده کردن آیزو..." msgid "Decompress selected ISOs..." msgstr "ناهمفشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "در حال ناهمفشرده کردن آیزو" @@ -1535,7 +1529,7 @@ msgstr "به روز کردن لیست بازی" msgid "Default" msgstr "پیش فرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "آیزو پیش فرز:" @@ -1579,8 +1573,8 @@ msgstr "" msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1592,7 +1586,7 @@ msgstr "شماره گیری" msgid "Direct3D11" msgstr "Direct3D ۱۱" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D ۹" @@ -1661,7 +1655,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "دیسک" @@ -1688,24 +1682,60 @@ msgstr "" msgid "Divide" msgstr "تقسیم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "آیا می خواهید برابرسازی فعلی را متوقف کنید؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "کدبردار دالبی پرو لاجیک دو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "دلفین" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "دلفین %s پیکربندی گرافیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "&وب سایت دلفین" @@ -1721,12 +1751,12 @@ msgstr "پیکربندی ویمیوت برابرسازی شده دلفین" msgid "Dolphin FIFO" msgstr "دلفین فیفو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "پیکربندی گیم پد گیم کیوب دلفین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "فیلم های تاس دلفین (*.dtm)" @@ -1734,7 +1764,7 @@ msgstr "فیلم های تاس دلفین (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "پیکربندی ویموت دلفین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "دلفین در &گوگل کد" @@ -1754,12 +1784,12 @@ msgstr "" "دلفین در حال حاضر ست شده است که همه بازی ها را مخفی کند. برای نمایش بازی ها " "دو بار اینجا کلیک کنید..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "دلفین نتوانست عمل خواسته شده را تکمیل کند." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1786,11 +1816,11 @@ msgstr "%lu کد دانلود شد. (%lu عدد اضافه شد)" msgid "Drums" msgstr "طبل ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "مصنوعی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "نسخه برداری صدا" @@ -1838,9 +1868,9 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "هلندی" @@ -1873,7 +1903,7 @@ msgstr "اروپا" msgid "Early Memory Updates" msgstr "به روز شدن های اولیه حافظه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "ویرایش" @@ -1885,16 +1915,20 @@ msgstr "ویرایش کدهای اکشن ریپلی" msgid "Edit Config" msgstr "ویرایش پیکربندی" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "ویرایش وصله" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "ویرایش چشم انداز جاری" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "ویرایش..." @@ -1906,7 +1940,7 @@ msgstr "افکت" msgid "Embedded Frame Buffer" msgstr "حافظه میانجی فریم جاساز شده" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "ریسمان شبیه ساز قبلا اجرا شده است" @@ -1945,7 +1979,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "ویموت برابرسازی شده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "وضعیت برابرساز:" @@ -1973,11 +2007,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "فعال کردن واقعه نگاری اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "فعال کردن ادغام بلوک" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "فعال کردن محاسبه حد جعبه" @@ -1985,27 +2019,27 @@ msgstr "فعال کردن محاسبه حد جعبه" msgid "Enable Cache" msgstr "فعال کردن حافظه ميانى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "فعال کردن کدهای تقلب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "فعال کردن پردازنده با دو هسته یا بیشتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "فعال کردن پردازنده با دو هسته یا بیشتر (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "فعال کردن جهش بیکاری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "فعال کردن جهش بیکاری (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "فعال کردن واحد مدیریت حافظه" @@ -2013,7 +2047,7 @@ msgstr "فعال کردن واحد مدیریت حافظه" msgid "Enable Progressive Scan" msgstr "فعال کردن پويش تصاعدی (Progressive Scan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "فعال کردن اسکیرین سیور" @@ -2021,7 +2055,7 @@ msgstr "فعال کردن اسکیرین سیور" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "فعال کردن صفحه عریض" @@ -2043,7 +2077,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، حالت 1x را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2079,7 +2113,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2087,11 +2121,11 @@ msgstr "" "برای بالا بردن سرعت بازی افسانه زلدا: شاهدخت سپیده دم این گزینه را فعال " "کنید. غیرفعال برای هر بازی دیگر." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "فعال کردن پروژه هک دستی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2099,22 +2133,13 @@ msgstr "" "فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). در " "OSX موجود نیست." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). " "فقط پشتوانه اپن ای ال (OpenAL)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). " -"فقط پشتوانه اپن ای ال (OpenAL). شاید تغییر نام soft_oal.dll به OpenAL32.dll " -"برای به کار انداختن این امکان احتیاج باشد." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2127,7 +2152,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2149,9 +2174,9 @@ msgstr "" msgid "End" msgstr "پایان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "انگلیسی" @@ -2180,11 +2205,11 @@ msgstr "همگن" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "خطا" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "بارگذاری زبان انتخاب شده با شکست مواجه شد. برگشت به زبان پیش فرض سیستم." @@ -2216,7 +2241,6 @@ msgid "Euphoria" msgstr "خوشی" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "دستگذار استثناء - دسترسی فضای پایینی حافظه. %08llx%08llx" @@ -2225,16 +2249,21 @@ msgstr "دستگذار استثناء - دسترسی فضای پایینی حا msgid "Execute" msgstr "اجرا کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "صادر کردن همه ذخیره ها" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "صادر کردن با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "صادر کردن فایل" @@ -2242,7 +2271,7 @@ msgstr "صادر کردن فایل" msgid "Export Recording" msgstr "صادر کردن ضبط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "صادر کردن ضبط..." @@ -2258,9 +2287,10 @@ msgstr "صادر کردن فایل ذخیره وی (آزمایشی)" msgid "Export all saves" msgstr "صادر کردن همه ذخیره ها" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "صادر کردن با شکست مواجه شد، کوشش دوباره؟" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "صادر کردن با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2282,44 +2312,44 @@ msgstr "پارامتر اضافی" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "پارامترهای یدکی مفید تنها برای \"Metroid Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "استخراج همه فایل ها..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "استخراج بارگذار برنامه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "استخراج دال..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "استخراج پوشه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "استخراج فایل..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "استخراج پارتیشن..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "استخراج کردن %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "استخراج کردن همه فایل ها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "استخراج کردن پوشه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "استخراج کردن..." @@ -2335,11 +2365,11 @@ msgstr "پخش کننده فیفو" msgid "FRANCE" msgstr "فرانسه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "اندازه اف اس تی:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "اتصال با شکست مواجه شد!" @@ -2347,7 +2377,7 @@ msgstr "اتصال با شکست مواجه شد!" msgid "Failed to download codes." msgstr "دانلود کدها با شکست مواجه شد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "استخراج به %s با شکست مواجه شد!" @@ -2388,16 +2418,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "خواندن %s با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "خواندن banner.bin با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2428,12 +2458,12 @@ msgstr "" "خواندن صحیح جدول تخصیص بلوک با شکست مواجه شد\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "خواندن داده از فایل با شکست مواجه شد %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2454,7 +2484,7 @@ msgstr "" "خواندن صحیح پوشه با شکست مواجه شد\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2466,29 +2496,34 @@ msgstr "" "خواندن سرخط با شکست مواجه شد\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "نوشتن سرخط برای فایل %d با شکست مواجه شد" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "خواندن آی دی یگانه از ایمیج دیسک با شکست مواجه شد" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "نوشتن BT.DINF به SYSCONF با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "نوشتن bkhdr با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "خواندن داده از فایل با شکست مواجه شد %d" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "نوشتن سرخط برای %s با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "نوشتن سرخط برای فایل %d با شکست مواجه شد" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "پارسی" @@ -2500,18 +2535,18 @@ msgstr "سریع" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "نسخه سریع واحد مدیریت حافظه. برای همه بازی ها عمل نمی کند." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" "همگاه سازی مجدد مهلک. خروج نمایش. (خطا در ویموت پخش: %u !=%u, بایت %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "پخش کننده فیفو" @@ -2552,16 +2587,16 @@ msgstr "فایل به عنوان کارت حافظه شناخته نشده اس msgid "File not compressed" msgstr "فایل فشرده نیست" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "ورودی/خروجی فایل: حالت گشودن ناشناس : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "فایل سیستم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع فایل 'ini' ناشناس است! باز نخواهد شد!" @@ -2589,7 +2624,7 @@ msgstr "۱۶:۹ اجباری" msgid "Force 4:3" msgstr "۴:۳ اجباری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "کنسول به عنوان NTSC-J اجباری" @@ -2622,7 +2657,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2644,7 +2679,7 @@ msgstr "" msgid "Forward" msgstr "جلو" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2653,6 +2688,11 @@ msgstr "" msgid "Found %d results for '" msgstr "پیدا کردن نتایج %d برای '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "قادر به ذخیره کردن نیست %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2682,7 +2722,7 @@ msgstr "محدوده فریم" msgid "Frame S&kipping" msgstr "پری&دن از روی فریم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "حد فریم:" @@ -2694,9 +2734,9 @@ msgstr "فریم ها برای ضبط شدن" msgid "Free Look" msgstr "نگاه آزاد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "فرانسوی" @@ -2709,7 +2749,7 @@ msgstr "تحریک" msgid "From" msgstr "از" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "تمام صفحه" @@ -2721,7 +2761,7 @@ msgstr "وضوح حالت تمام صفحه:" msgid "GCI File(*.gci)" msgstr "فایل جی سی آی(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "گیم پد گیم کیوب" @@ -2729,27 +2769,27 @@ msgstr "گیم پد گیم کیوب" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "آی دی بازی:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "بازی قبلا اجرا شده است!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "بازی اجرا نشده است!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "تنظیمات مشخصات بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "پیکربندی بازی" @@ -2757,7 +2797,7 @@ msgstr "پیکربندی بازی" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "فایل های ذخیره بازی گیم کیوب(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "گیم کیوب" @@ -2766,16 +2806,16 @@ msgid "Gamecube &Pad Settings" msgstr "تنظیمات &دسته گیم کیوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "کارت های حافظه گیم کیوب (*.raw.*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "تنظیمات دسته گیم کیوب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "کدهای گیکو" @@ -2793,7 +2833,7 @@ msgstr "" "استفاده کنید.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "کلی" @@ -2802,9 +2842,9 @@ msgstr "کلی" msgid "General Settings" msgstr "تنظیمات جامع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "آلمانی" @@ -2813,11 +2853,11 @@ msgstr "آلمانی" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "گرفتن کد اکشن ریپلی: فهرست بزرگتر از سایز لیست است %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "گرافیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "تنظیمات گرافیک" @@ -2842,7 +2882,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "یونانی" @@ -2870,7 +2910,7 @@ msgstr "هک" msgid "Header checksum failed" msgstr "چک کردن سر خط برای یافتن خطا با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "عبری" @@ -2882,7 +2922,7 @@ msgstr "ارتفاع" msgid "Help" msgstr "کمک" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2894,7 +2934,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2935,7 +2975,7 @@ msgid "Home" msgstr "خانه" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "میزبان" @@ -2944,11 +2984,11 @@ msgid "Hotkey Configuration" msgstr "پیکربندی شرت کات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "شرت کاتها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "مجارستانی" @@ -2956,13 +2996,13 @@ msgstr "مجارستانی" msgid "Hybrid Wiimote" msgstr "ویموت مخلوط" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: آزمایش برای گرفتن داده از یک بلیط ناشناخته: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2971,11 +3011,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - مقصد ناصحیح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "تنظیمات آی پی ال" @@ -2991,11 +3031,11 @@ msgstr "اشاره گر فروسرخ" msgid "IR Sensitivity:" msgstr "میزان حساسیت فروسرخ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "جزئیات آیزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "پوشه های آیزو" @@ -3007,7 +3047,7 @@ msgstr "ایتالیا" msgid "Icon" msgstr "تندیس" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3051,9 +3091,15 @@ msgstr "" msgid "Import Save" msgstr "وارد کردن ذخیره" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "وارد کردن با شکست مواجه شد، سعی دوباره؟" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "وارد کردن ذخیره" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "صادر کردن با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3075,21 +3121,17 @@ msgstr "" "پسوند فایل وارد شده اس ای وی می باشد\n" "اما دارای سرخط صحیح نمی باشد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "در بازی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "در بازی" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "حد فریم:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "مشخصات" @@ -3109,7 +3151,7 @@ msgstr "درج" msgid "Insert Encrypted or Decrypted code here..." msgstr "درج کد رمز شده و یا کشف شده..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "درج کارت اس دی" @@ -3117,7 +3159,7 @@ msgstr "درج کارت اس دی" msgid "Insert name here.." msgstr "درج اسم..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "نصب واد" @@ -3125,30 +3167,31 @@ msgstr "نصب واد" msgid "Install to Wii Menu" msgstr "نصب به فهرست انتخاب وی" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "نصب دستگذار استثناء فراخوانده شد، اما این پلتفورم هنوز از این امکان پشتیبانی " "نمی کند." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "در حال نصب واد..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "خطای بررسی درست بودن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "بررسی درست بودن به پایان رسید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "بررسی درست بودن به پایان رسید. خطایی پیدا نشد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3157,11 +3200,11 @@ msgstr "" "بررسی درست بودن پارتیشن %d با شکست مواجه شد. نسخه برداری شما به احتمال زیاد " "خراب یا نادرست وصله خورده است." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "واسط گرافیک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "تنظیمات واسط گرافیک" @@ -3186,15 +3229,15 @@ msgstr "خطای داخلی LZO - lzo_init() با شکست مواجه شد" msgid "Internal Resolution:" msgstr "وضوح داخلی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "صفحه نخست" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "سایز نا معتبر (%x) یا کلمه جادو (%x)" @@ -3227,7 +3270,7 @@ msgstr "" "%s\n" "شاید لازم باشد شما مجدد از این بازی نسخه برداری کنید." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "فایل ضبط نامعتبر" @@ -3243,13 +3286,13 @@ msgstr "رشته جستجوی نامعتبر (قادر به تبدیل به عد msgid "Invalid search string (only even string lengths supported)" msgstr "رشته جستجوی نامعتبر (فقط رشته های با طول زوج پشتیبانی می شود)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "وضعیت نامعتبر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "ایتالیایی" @@ -3257,16 +3300,16 @@ msgstr "ایتالیایی" msgid "JAPAN" msgstr "ژاپن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "ژاپنی" @@ -3292,8 +3335,8 @@ msgstr "بر راس نگه داشتن پنجره" msgid "Key" msgstr "کلید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "کره ای" @@ -3311,16 +3354,16 @@ msgstr "دکمه ال" msgid "L-Analog" msgstr "ال آنالوگ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "زمان بيکارى:" @@ -3363,7 +3406,7 @@ msgstr "" msgid "Less Than" msgstr "کمتر از" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "محدود کردن توسط تعداد فریم ها بر ثانیه" @@ -3462,15 +3505,15 @@ msgstr "بارگذاری وضعیت - شکاف ۸" msgid "Load State Slot 9" msgstr "بارگذاری وضعیت - شکاف ۱" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "بارگذاری وضعیت..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "بارگذاری منوی سیستم وی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "بارگذاری منوی سیستم وی %d%c" @@ -3489,10 +3532,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "بارگذاری مقدار های از پیش تنظیم شده از الگوهای هک موجود است." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "محلی" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "ثبت وقایع" @@ -3526,11 +3565,11 @@ msgid "Logger Outputs" msgstr "خروجی های واقعه نگار" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "واقعه نگاری" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "ارتباط با سرور قطع شد!" @@ -3538,7 +3577,7 @@ msgstr "ارتباط با سرور قطع شد!" msgid "M Button" msgstr "دکمه ام" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3547,7 +3586,7 @@ msgstr "" "چک سام MD5 ناهمسان است\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "هک کردن سرعت واحد مدیریت حافظه" @@ -3561,11 +3600,11 @@ msgstr "فایل های گیم شارک مد کتذ (*.gcs)" msgid "Main Stick" msgstr "استیک اصلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "آی دی سازنده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "سازنده" @@ -3596,7 +3635,7 @@ msgid "Memory Byte" msgstr "بایت حافظه" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "کارت حافظه" @@ -3608,7 +3647,7 @@ msgstr "" "اخطار: قبل از استفاده از کارت حافظه بک آپ بگیرید، شاید درست شود اما اطلاعات " "از بین خواهد رفت!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3633,7 +3672,7 @@ msgstr "سایز کارت حافظه با سرخط تطابق ندارد" msgid "Menu" msgstr "فهرست انتخاب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "میکروفن" @@ -3646,7 +3685,7 @@ msgstr "حداقل" msgid "Misc" msgstr "متفرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "تنظیمات متفرقه" @@ -3795,7 +3834,7 @@ msgstr "تب ان پی" msgid "NP Up" msgstr "بالا ان پی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3842,7 +3881,7 @@ msgstr "هیچ آیزو یا وادی پیدا نشد" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "فایل نشان برای عنوان %s پیدا نشد" @@ -3868,7 +3907,7 @@ msgstr "بدون مقادیر اطلاعاتی فهرست پوشه آزاد" msgid "No recorded file" msgstr "بدون فایل ضبط شده" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "پوشه فایل ذخیره برای عنوان %s پیدا نشد" @@ -3877,11 +3916,11 @@ msgstr "پوشه فایل ذخیره برای عنوان %s پیدا نشد" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "هیچ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "بوکمال نروژی" @@ -3889,17 +3928,17 @@ msgstr "بوکمال نروژی" msgid "Not Equal" msgstr "برابر نیست" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "ست نشده است" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "متصل نشده است" @@ -3945,7 +3984,7 @@ msgstr "شیی" msgid "Object Range" msgstr "محدوده شیی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "خاموش" @@ -3953,16 +3992,20 @@ msgstr "خاموش" msgid "Offset:" msgstr "افست:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "پیام های روی صفحه نمایش" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "فقط بلوک های %d موجود است" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "گشودن" @@ -3975,7 +4018,7 @@ msgstr "باز کردن پوشه &شامل" msgid "Open Wii &save folder" msgstr "باز کردن پوشه &ذخیره وی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "گشودن فایل..." @@ -4001,6 +4044,16 @@ msgstr "کدبرداری بافت اشیاء توسط OpenCL" msgid "OpenMP Texture Decoder" msgstr "کدبرداری بافت اشیاء توسط OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4026,7 +4079,7 @@ msgstr "" msgid "Other" msgstr "غیره" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4038,7 +4091,7 @@ msgstr "" msgid "Output" msgstr "خروجی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "ض&بط کردن بازی..." @@ -4046,7 +4099,7 @@ msgstr "ض&بط کردن بازی..." msgid "Pad" msgstr "گیم پد" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "گیم پد" @@ -4075,21 +4128,21 @@ msgstr "پارامترها" msgid "Partition %i" msgstr "پارتیشن %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "وصله ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "مکث" @@ -4102,7 +4155,7 @@ msgstr "مکث در پایان فیلم" msgid "Per-Pixel Lighting" msgstr "نورپردازی به ازای هر پیکسل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "کامل" @@ -4112,9 +4165,9 @@ msgid "Perspective %d" msgstr "چشم انداز %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "شروع بازی" @@ -4126,7 +4179,7 @@ msgstr "شروع ضبط" msgid "Play/Pause" msgstr "شروع بازی/مکث" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "قابل بازی" @@ -4134,11 +4187,11 @@ msgstr "قابل بازی" msgid "Playback Options" msgstr "گزینه های بازنواخت" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "لطفا تایید کنید..." @@ -4150,36 +4203,36 @@ msgstr "لطفا قبل از ذخیره کردن یک چشم انداز بساز msgid "Plus-Minus" msgstr "مینوس پلاس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "درگاه ۱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "درگاه ۲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "درگاه ۳" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "درگاه ۴" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "درگاه :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "پرتقالی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "پرتقالی (برزیلی)" @@ -4187,17 +4240,17 @@ msgstr "پرتقالی (برزیلی)" msgid "Post-Processing Effect:" msgstr "افکت ها:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "پایان نابهنگام فیلم در کنترل کننده پخش. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "پایان نابهنگام فیلم در ویموت پخش. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "پایان نابهنگام فیلم در ویموت پخش. %u > %u" @@ -4230,7 +4283,7 @@ msgstr "پروفایل" msgid "Properties" msgstr "خواص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "پاکسازی حافظه ميانى" @@ -4238,8 +4291,8 @@ msgstr "پاکسازی حافظه ميانى" msgid "Question" msgstr "سوال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "خارج شدن" @@ -4300,6 +4353,11 @@ msgstr "ویموت های واقعی" msgid "Record" msgstr "ضبط" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "گزینه های ضبط" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "اطلاعات ضبط" @@ -4336,7 +4394,7 @@ msgstr "" "اگر در این مورد اطمینان ندارید، \"هیچ\" را انتخاب کنید." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "به روز کردن" @@ -4345,14 +4403,14 @@ msgstr "به روز کردن" msgid "Refresh List" msgstr "به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "به روز کردن لیست بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "پاک کردن" @@ -4383,7 +4441,7 @@ msgstr "نتایج" msgid "Return" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4401,13 +4459,12 @@ msgstr "استیک راست" msgid "Rumble" msgstr "شوک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "روسی" @@ -4420,7 +4477,7 @@ msgid "Safe" msgstr "بی خطر" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "ذخیره" @@ -4481,28 +4538,28 @@ msgstr "ذخیره وضعیت - شکاف ۸" msgid "Save State Slot 9" msgstr "ذخیره وضعیت - شکاف ۱" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "ذخیره وضعیت..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "ذخیره بعنوان..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "ذخیره جی سی ام/آیزو فشرده شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "دخیره چشم انداز فعلی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "ذخیره جی سی ام/آیزو ناهمفشرده شده" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "ذخیره وضعیت فیلم %s خراب است، ضبط فیلم میایستد..." @@ -4524,7 +4581,7 @@ msgstr "پویش برای فایل های آیزو" msgid "Scanning..." msgstr "در حال پویش..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "عکس فوری" @@ -4540,7 +4597,7 @@ msgstr "جستجو" msgid "Search Filter" msgstr "فیلتر جستجو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "جستجوی پوشه های فرعی" @@ -4563,12 +4620,12 @@ msgstr "بخش %s در SYSCONF پیدا نشد" msgid "Select" msgstr "انتخاب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "انتخاب فایل ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "انتخاب فایل وی واد برای نصب" @@ -4590,19 +4647,19 @@ msgstr "یک فایل ذخیره برای وارد کردن انتخاب کنی msgid "Select floating windows" msgstr "انتخاب پنجره های شناور" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "انتخاب فایل برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "انتخاب فایل ذخیره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "انتخاب وضعیت برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "انتخاب وضعیت برای ذخیره" @@ -4670,7 +4727,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "فرستادن" @@ -4682,11 +4739,11 @@ msgstr "موقعیت سنسور بار:" msgid "Separator" msgstr "جدا کننده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "صربستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4709,7 +4766,7 @@ msgstr "" "ست کردن کد اکشن ریپلی_فعال است: فهرست بزرگتر از سایز لیست کد اکشن ریپلی است " "%lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4717,19 +4774,20 @@ msgstr "" "ست کردن زمان بيکارى (بر حسب میلی ثانیه). مقادیر بالاتر این زمان می تواند " "صدای ترق و تروق را کاهش دهد. فقط پشتوانه اپن ای ال (OpenAL)." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "تنظیمات..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "برپاکردن حافظه وی: ناتوان در پیدا کردن فایل تنظیم" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "لرزش" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "اسم کوتاه:" @@ -4737,23 +4795,28 @@ msgstr "اسم کوتاه:" msgid "Shoulder Buttons" msgstr "دکمه های شانه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "نمایش &میز فرمان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "نمایش &ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "نمایش نوار &وضعیت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "نمایش نوار &ابزار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "پیش فرز" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "نمایش درایوها" @@ -4765,11 +4828,11 @@ msgstr "نمایش مناطق کپی ای اف بی" msgid "Show FPS" msgstr "نمایش فریم بر ثانیه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "نمایش فرانسه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "نمایش گیم کیوب" @@ -4777,35 +4840,35 @@ msgstr "نمایش گیم کیوب" msgid "Show Input Display" msgstr "نمایش ورودی تصویر" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "نمایش ایتالیا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "نمایش ژاپن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "نمایش کره" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "نمایش زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "نمایش &پیکربندی ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "نمایش پال" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "نمایش پایگاه ها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "نمایش مناطق" @@ -4813,27 +4876,27 @@ msgstr "نمایش مناطق" msgid "Show Statistics" msgstr "نمایش آمار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "نمایش تایوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "نمایش ایالات متحده آمریکا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "نمایش واد" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "نمایش وی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "نمایش پنجره تایید قبل از متوقف کردن بازی." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4852,7 +4915,7 @@ msgstr "نمایش بلوک اول" msgid "Show lag counter" msgstr "نمایش شمارنده تاخیر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4889,7 +4952,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "نمایش ناشناخته" @@ -4907,7 +4970,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ویموت فرعی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "چینی ساده شده" @@ -4915,11 +4978,11 @@ msgstr "چینی ساده شده" msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "جهش از روی بایوس" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "از قلم انداختن پاکسازی DCBZ" @@ -4944,17 +5007,17 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "شکاف %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "شکاف ای" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "شکاف بی" @@ -4962,7 +5025,7 @@ msgstr "شکاف بی" msgid "Snapshot" msgstr "عکس فوری" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "ارائه دهنده نرم افزاری" @@ -4979,7 +5042,7 @@ msgstr "" "آیا شما واقعا قصد فعال کردن این گزینه را دارید؟ اگر در این مورد اطمینان " "ندارید، 'نه' را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "تنظیمات صدا" @@ -4997,9 +5060,9 @@ msgstr "ایجاد حافظه میانجی صدا با شکست مواجه شد: msgid "Space" msgstr "فضا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "اسپانیایی" @@ -5026,37 +5089,29 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه \"۶۴۰x۵۲۸\" را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "بالا بردن نرخ نقل و انتقال دادهای دیسک" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "استیک مربع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "کنترولر استاندارد" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "شروع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "شروع &نت پلی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "شروع &ضبط" @@ -5072,7 +5127,7 @@ msgstr "وضعیت" msgid "State Saves" msgstr "ذخیره های وضعیت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "چرخ فرمان" @@ -5081,7 +5136,7 @@ msgid "Stick" msgstr "استیک" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "توقف" @@ -5112,16 +5167,16 @@ msgstr "مرتعش کردن" msgid "Subtract" msgstr "کاستن" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "صادر کردن فایل به %s با موفقیت انجام شد" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "فایل های ذخیره با موفقیت وارد شدند" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5129,18 +5184,18 @@ msgstr "" msgid "Swing" msgstr "نوسان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "زبان سیستم:" @@ -5169,13 +5224,13 @@ msgstr "جدول چپ" msgid "Table Right" msgstr "جدول راست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "گرفتن عکس فوری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "تارو کونگا (بنگوس)" @@ -5195,7 +5250,7 @@ msgstr "حافظه ميانى بافت اشیاء" msgid "Texture Format Overlay" msgstr "قالب بندی بافت اشیاء" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "واد با موفقیت نصب شد" @@ -5207,13 +5262,13 @@ msgstr "آدرس بی اعتبار است" msgid "The checksum was successfully fixed" msgstr "چک سام با موفقیت درست شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "پوشه برگزیده قبلا در لیست بوده است" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5269,30 +5324,30 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "سایز فایل ذخیره ای که سعی در کپی کردن آن دارید بی اعتبار است" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" "زبان انتخاب شده توسط سیستم شما پشتیبانی نمی شود. برگشت به زبان پیش فرض سیستم." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "نسخه سرور و نت پلی مشتری نا سازگار است!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "سرور پر شده است!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "سرور پاسخ داد: بازی در حال اجراست!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "سرور یک پیغام خطای ناشناخته فرستاد!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "فایل مشخص شده \"%s\" وجود ندارد" @@ -5301,11 +5356,11 @@ msgstr "فایل مشخص شده \"%s\" وجود ندارد" msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "تم:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5313,7 +5368,7 @@ msgstr "" "باید بلیطی برای ۰۰۰۰۰۰۰۱/۰۰۰۰۰۰۰۲ وجود داشته باشد. نسخه برداری نند شما " "احتمالا ناقص است." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5329,7 +5384,7 @@ msgstr "" "این شبیه ساز اکشن ریپلی از کدهایی که توسط خود اکشن ریپلی پیراسته شده باشد " "پشتیبانی نمی کند." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "این مورد میتواند سبب کند شدن منوی وی و تعدادی از بازی ها شود." @@ -5353,7 +5408,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5365,7 +5420,7 @@ msgstr "" "استفاده کنید از دریچه صدا با استفاده از پردازشگر صدای دلفین (شاید صدا های " "تیک را درست کند اما همچنین می تواند موجب نویز ثابت بسته به بازی شود)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5419,7 +5474,7 @@ msgstr "کپی های ای اف بی" msgid "Toggle Fog" msgstr "تبدیل انواع ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "تبدیل حالت تمام صفحه" @@ -5429,11 +5484,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "بالا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "چینی سنتی" @@ -5457,7 +5512,7 @@ msgstr "" "تلاش برای خواندن از SYSCONF نامعتبر\n" "آی دی های بلوتوث ویموت موجود نیست" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "ترکی" @@ -5510,7 +5565,7 @@ msgstr "" "معتبر. وارسی کنید که کد را درست وارد کرده باشید.\n" "آیا مایل هستید که این خط را نادیده بگیرید و به تجزیه ادامه دهید؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "تعریف نشده %i" @@ -5547,12 +5602,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "نوع ورودی ناشناخته %i در SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "پیام ناشناخته با آی دی %d دریافت شد" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "پیام ناشناخته با آی دی:%d از بازیکن:%d بیرون انداختن بازیکن!" @@ -5571,7 +5626,7 @@ msgstr "به روز کردن" msgid "Upright Wiimote" msgstr "ویموت عمودی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "استفاده از حالت پال ۶۰ هرتز (PAL60)" @@ -5583,7 +5638,7 @@ msgstr "استفاده از حالت تمام صفحه" msgid "Use Hex" msgstr "استفاده از حالت شانزده شانزدهی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "استفاده از دستگذار پنیک" @@ -5608,6 +5663,15 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5630,7 +5694,7 @@ msgstr "کاربردی" msgid "V-Sync" msgstr "هماهنگ کردن فرکانس عمودی بازی با صفحه نمایش" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "هک کردن سرعت واحد مدیریت حافظه" @@ -5655,7 +5719,7 @@ msgstr "دراز نویسی" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "ویدیو" @@ -5663,17 +5727,17 @@ msgstr "ویدیو" msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "حجم صدا" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "نصب واد با شکست مواجه شد: خطای ایجاد %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "نصب واد با شکست مواجه شد: خطای ایجاد بلیط" @@ -5706,7 +5770,7 @@ msgstr "اخطار - شروع ای ال اف در حالت کنسول اشتبا msgid "Warning - starting ISO in wrong console mode!" msgstr "اخطار - شروع آیزو در حالت کنسول اشتباه!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5730,7 +5794,7 @@ msgstr "" "و داشتن اسم یکسان مانند یک فایل در کارت حافظه شما\n" "ادامه می دهید؟" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5742,7 +5806,7 @@ msgstr "" "دیگری را بارگذاری کنید، یا این وضعیت را با حالت فقط خواندنی خاموش بارگذاری " "کنید." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5753,7 +5817,7 @@ msgstr "" "ندارد. قبل از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را " "با حالت فقط خواندنی خاموش بارگذاری کنید. وگرنه شاید شما دچار نا همزمانی شوید." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5803,23 +5867,19 @@ msgstr "هک کردن صفحه عریض" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "وی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "میز فرمان وی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "ریشه وی نند:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "وارد کردن فایل ذخیره وی" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "فایل های ذخیره وی (*.bin)|*.bin" @@ -5828,7 +5888,7 @@ msgid "WiiWAD: Could not read from file" msgstr "وی واد: ناتوان در خواندن از فایل" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "ویموت" @@ -5837,7 +5897,7 @@ msgstr "ویموت" msgid "Wiimote %i" msgstr "ویموت %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "ویموت متصل شد" @@ -5845,7 +5905,7 @@ msgstr "ویموت متصل شد" msgid "Wiimote Motor" msgstr "موتور ویموت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "تنظیمات ویموت" @@ -5869,14 +5929,14 @@ msgstr "پنجره ها راست" msgid "Word Wrap" msgstr "پیچیدن کلمه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "در حال کار..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5936,7 +5996,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "شما نمی توانید قطعاتی که حاوی صفحات می باشند را ببندید." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "شما باید یک بازی انتخاب کنید!!" @@ -5952,7 +6012,7 @@ msgstr "شما باید یک مقدار صحیح برای دسیمال، هگز msgid "You must enter a valid profile name." msgstr "شما باید یک اسم معتبر برای پروفایل وارد کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "برای اعمال تغییرات شما باید دلفین را از نو اجرا کنید." @@ -5963,7 +6023,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5982,7 +6042,7 @@ msgstr "" "سایز فایل باید 0x%04x باشد (اما سایز این فایل 0x%04llx است)\n" "آیا میخواهید یک فایل جدید تولید شود؟" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "هک افسانه زلدا: شاهدخت سپیده دم" @@ -6049,7 +6109,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "بارگذار برنامه (.img)" @@ -6062,7 +6122,17 @@ msgstr "خطای iCacheJIT: خواندن شناسنده از %x. لطفا گزا msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "پیام ناشناخته با آی دی %d دریافت شد" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "خطای 1- wxExecute در اجرای برنامه!" @@ -6092,9 +6162,28 @@ msgstr "| یا" #~ "\n" #~ "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "قادر به ست کردن گیم پدها نیست. بازی کن بازی را ترک کرده و یا بازی در حال " +#~ "اجرا است!\n" +#~ "(ست کردن گیم پدها در حالی که بازی در حال اجرا است فعلا پشتیبانی نمی شود)" + #~ msgid "Enable Hotkeys" #~ msgstr "فعال کردن شرت کاتها" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). " +#~ "فقط پشتوانه اپن ای ال (OpenAL). شاید تغییر نام soft_oal.dll به OpenAL32." +#~ "dll برای به کار انداختن این امکان احتیاج باشد." + +#~ msgid "Export failed, try again?" +#~ msgstr "صادر کردن با شکست مواجه شد، کوشش دوباره؟" + #~ msgid "Failed to Listen!!" #~ msgstr "پذیرفتن با شکست مواجه شد!!" @@ -6116,12 +6205,21 @@ msgstr "| یا" #~ "اگر تعداد فریم های نمایش داده شده بر ثانیه نامنظم است، شاید این گزینه به " #~ "رفع آن کمک کند. (روشن = سازگار، خاموش = سریع)" +#~ msgid "Import failed, try again?" +#~ msgstr "وارد کردن با شکست مواجه شد، سعی دوباره؟" + +#~ msgid "In-Game" +#~ msgstr "در بازی" + #~ msgid "Last Overwritten State" #~ msgstr "آخرین وضعیت بازنویسی شده" #~ msgid "Last Saved State" #~ msgstr "آخرین وضعیت ذخیره شده" +#~ msgid "Local" +#~ msgstr "محلی" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "برقراری ارتباط مجدد ویموت در بارگذاری وضعیت" @@ -6130,3 +6228,6 @@ msgstr "| یا" #~ msgid "Skip Dest. Alpha Pass" #~ msgstr "از قلم انداختن مقصد آلفا پاس" + +#~ msgid "Wii Save Import" +#~ msgstr "وارد کردن فایل ذخیره وی" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 1d418cb143..46e89d15ab 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-18 10:41+0000\n" "Last-Translator: FRtranslator \n" "Language-Team: French (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr "(trop nombreux pour être affichés)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Jeu :" @@ -43,7 +43,7 @@ msgstr "" "\"%s\" n'existe pas.\n" " Voulez-vous créer une nouvelle carte mémoire de 16MB ?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -69,8 +69,8 @@ msgstr "%d échantillons" msgid "%d samples (quality level %d)" msgstr "%d échantillons (de qualité niveau %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s existe déjà. Voulez-vous le remplacer ?" @@ -108,12 +108,17 @@ msgstr "" "Le fichier n'est pas assez grand pour être un fichier de carte mémoire " "valide (0x%x octets)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "Impossible d'ouvrir %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "Impossible d'ouvrir %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s est un fichier de 0 octet" @@ -123,7 +128,7 @@ msgstr "%s est un fichier de 0 octet" msgid "%s is already compressed! Cannot compress it further." msgstr "%s est déjà compressé. Impossible de le compresser d'avantage." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s est un nom de fichier trop long, le maximum est de 45 caractères." @@ -152,7 +157,7 @@ msgstr "%u blocs libres, %u entrées de rép. libres" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&A propos..." @@ -160,7 +165,7 @@ msgstr "&A propos..." msgid "&Boot from DVD Drive..." msgstr "&Démarrer à partir du lecteur..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Points d'arrêt" @@ -168,7 +173,7 @@ msgstr "&Points d'arrêt" msgid "&Browse for ISOs..." msgstr "&Rechercher des ISOs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Gestionnaire de &cheats" @@ -192,11 +197,11 @@ msgstr "&Emulation" msgid "&File" msgstr "&Fichier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Avancement d'image" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Plein écran" @@ -204,7 +209,7 @@ msgstr "&Plein écran" msgid "&Graphics Settings" msgstr "Paramètres &Graphiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Aide" @@ -212,7 +217,7 @@ msgstr "&Aide" msgid "&Hotkey Settings" msgstr "Paramètres des &Raccouris clavier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -224,11 +229,11 @@ msgstr "&Charger l'état" msgid "&Memcard Manager (GC)" msgstr "Gestionnaire de cartes &mémoires (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Ouvrir..." @@ -236,11 +241,11 @@ msgstr "&Ouvrir..." msgid "&Options" msgstr "&Options" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Démarrer" @@ -248,39 +253,39 @@ msgstr "&Démarrer" msgid "&Properties" msgstr "&Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "Mode &Lecture seule" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "Rafraîchir la &liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Son" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Vidéo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Affichage" @@ -369,7 +374,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -377,7 +382,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -385,8 +390,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Une fenêtre Netplay est déjà ouverte !" @@ -413,8 +418,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -439,13 +442,13 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Codes AR" @@ -579,11 +582,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Ajouter un patch" @@ -591,9 +594,9 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Ajouter..." @@ -646,36 +649,36 @@ msgstr "" msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Paramètres avancés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -703,7 +706,7 @@ msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?" msgid "Apploader unable to load from file" msgstr "L'apploader ne peut charger depuis ce fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader :" @@ -722,7 +725,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabe" @@ -731,7 +734,7 @@ msgstr "Arabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -739,17 +742,17 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "ARM JIT (expérimental)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -758,12 +761,12 @@ msgstr "Format d'écran :" msgid "At least one pane must remain open." msgstr "Au moins un panneau doit rester ouvert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -771,7 +774,7 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -810,7 +813,7 @@ msgstr "Registres BP" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -828,7 +831,7 @@ msgstr "Entrée en arrière-plan" msgid "Backward" msgstr "Arrière" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Mauvaise entête de fichier" @@ -841,11 +844,11 @@ msgstr "" msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Bannière :" @@ -857,7 +860,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Paramètres de base" @@ -888,7 +891,7 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Bas" @@ -897,11 +900,11 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Corrompu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Parcourir" @@ -909,15 +912,15 @@ msgstr "Parcourir" msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer :" @@ -927,7 +930,7 @@ msgstr "Buffer :" msgid "Buttons" msgstr "Boutons" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -951,7 +954,7 @@ msgstr "Stick-C" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -975,7 +978,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" @@ -990,9 +993,9 @@ msgstr "Impossible de lire depuis DVD_Plugin - erreur fatale de DVD-Interface" msgid "Cancel" msgstr "Annuler" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Impossible d'ouvrir %s" @@ -1002,7 +1005,7 @@ msgid "Cannot unregister events with events pending" msgstr "" "Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1013,7 +1016,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1025,7 +1028,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalan" @@ -1033,11 +1036,11 @@ msgstr "Catalan" msgid "Center" msgstr "Centre" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Changer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "&Changer de disque..." @@ -1045,11 +1048,11 @@ msgstr "&Changer de disque..." msgid "Change Disc" msgstr "Changer de disque" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1065,11 +1068,11 @@ msgstr "Change le signe du paramètre zFar (après correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Change le signe du paramètre zNear (après correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1085,39 +1088,39 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Vérifier l'intégrité de la partition" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Vérification de l'intégrité..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1125,7 +1128,7 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1133,8 +1136,8 @@ msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1153,7 +1156,7 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1163,7 +1166,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Fermer" @@ -1188,7 +1191,7 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Commentaire :" @@ -1200,12 +1203,12 @@ msgstr "Compresser l'ISO" msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Compression de l'ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Configurer" @@ -1219,22 +1222,22 @@ msgstr "Configurer" msgid "Configure Control" msgstr "Configurer le contrôle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Configurer les manettes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1243,17 +1246,17 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Connecter le clavier USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" @@ -1274,7 +1277,7 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Connexion..." @@ -1294,7 +1297,7 @@ msgstr "Contrôle" msgid "Convert to GCI" msgstr "Convertir en GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Echec de la copie" @@ -1303,7 +1306,7 @@ msgstr "Echec de la copie" msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Core" @@ -1317,7 +1320,7 @@ msgstr "Impossible de créer %s" msgid "Could not initialize backend %s." msgstr "Impossible d'initialiser le moteur %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1329,26 +1332,16 @@ msgstr "" "GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur " "PC." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est " -"en cours d'exécution !\n" -"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " -"pris en charge)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1370,11 +1363,11 @@ msgstr "" "Dans ce cas, vous devez à nouveau spécifier l'emplacement du fichier de " "sauvegarde dans les options." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1387,7 +1380,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Pays :" @@ -1427,12 +1420,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Le répertoire en cours a changé de %s vers %s après wxFileSelector !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1440,11 +1433,11 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tchèque" @@ -1456,36 +1449,37 @@ msgstr "D" msgid "D-Pad" msgstr "Pad numérique" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP sur un thread dédié" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP sur un thread dédié" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1497,7 +1491,7 @@ msgstr "DVDLowRead - Erreur fatale : impossible de lire le volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erreur fatale : impossible de lire le volume" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1505,7 +1499,7 @@ msgstr "" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Date :" @@ -1542,8 +1536,8 @@ msgstr "Décompresser l'ISO" msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1556,7 +1550,7 @@ msgstr "Rafraîchir la liste des jeux" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1600,8 +1594,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1613,7 +1607,7 @@ msgstr "Appel" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1681,7 +1675,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disque" @@ -1708,24 +1702,60 @@ msgstr "" msgid "Divide" msgstr "Diviser" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Décodeur Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuration des graphismes %s pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Site &web de Dolphin" @@ -1741,12 +1771,12 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1754,7 +1784,7 @@ msgstr "Films TAS Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuration de la Wiimote pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" @@ -1774,12 +1804,12 @@ msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin n'a pas pu exécuter l'action demandée." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1806,11 +1836,11 @@ msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" msgid "Drums" msgstr "Percussions" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -1857,9 +1887,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Néerlandais" @@ -1892,7 +1922,7 @@ msgstr "Europe" msgid "Early Memory Updates" msgstr "Premières mises à jour de mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Editer" @@ -1904,16 +1934,20 @@ msgstr "Editer le code ActionReplay" msgid "Edit Config" msgstr "Editer la configuration" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Editer le patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Editer..." @@ -1925,7 +1959,7 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" @@ -1963,7 +1997,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -1991,11 +2025,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Active le calcul de la boîte liée." @@ -2003,27 +2037,27 @@ msgstr "Active le calcul de la boîte liée." msgid "Enable Cache" msgstr "Activer le cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Activer le MMU" @@ -2031,7 +2065,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2039,7 +2073,7 @@ msgstr "Activer l'économiseur d'écran" msgid "Enable Speaker Data" msgstr "Activer les données du haut-parleur" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" @@ -2062,7 +2096,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2099,7 +2133,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2107,11 +2141,11 @@ msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2119,22 +2153,13 @@ msgstr "" "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Non " "disponible sur OS X." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " "Uniquement avec le moteur OpenAL." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " -"Uniquement avec le moteur OpenAL. Il peut être nécessaire de renommer le " -"fichier soft_oal.dll en OpenAL32.dll pour que cela fonctionne." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2148,7 +2173,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2170,9 +2195,9 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Anglais" @@ -2201,11 +2226,11 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Erreur" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " @@ -2238,7 +2263,6 @@ msgid "Euphoria" msgstr "Euphorie" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2248,16 +2272,21 @@ msgstr "" msgid "Execute" msgstr "Exécuter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exporter toutes les sauvegardes" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exporter un fichier" @@ -2265,7 +2294,7 @@ msgstr "Exporter un fichier" msgid "Export Recording" msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exporter l'enregistrement..." @@ -2281,9 +2310,10 @@ msgstr "Exporter une sauvegarde Wii (expérimental)" msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "L'exportation a échoué. Essayer de nouveau ?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Echec de l'exportation" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2305,44 +2335,44 @@ msgstr "Paramètres supplémentaires" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paramètre supplémentaire utile dans ''Metroid: Other M'' uniquement." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Extraction..." @@ -2358,11 +2388,11 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Taille FST :" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Connexion impossible !" @@ -2370,7 +2400,7 @@ msgstr "Connexion impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2411,16 +2441,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Impossible de lire %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Impossible de lire banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Impossible de lire l'entête bk" @@ -2452,12 +2482,12 @@ msgstr "" "Impossible de lire correctement la table d'allocation des blocs\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Impossible de lire les données du fichier %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Impossible de lire les données du fichier %s" @@ -2478,7 +2508,7 @@ msgstr "" "Impossible de lire le dossier correctement\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Impossible de lire l'entête" @@ -2490,29 +2520,34 @@ msgstr "" "Impossible de lire l'entête correctement\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Impossible d'écire l'entête du fichier %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Impossible de lire l'ID unique depuis l'image du disque" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Impossible d'écrire BT.DINF vers SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Impossible d'écrire bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Impossible de lire les données du fichier %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Impossible d'écrire l'entête de %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Impossible d'écire l'entête du fichier %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Perse" @@ -2524,11 +2559,11 @@ msgstr "Rapide" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2536,7 +2571,7 @@ msgstr "" "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Lecteur FIFO" @@ -2577,16 +2612,16 @@ msgstr "Le fichier n'est pas reconnu comme une carte mémoire" msgid "File not compressed" msgstr "Fichier non compressé" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2614,7 +2649,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2648,7 +2683,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2670,7 +2705,7 @@ msgstr "" msgid "Forward" msgstr "Avant" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2679,6 +2714,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Trouvé %d résultats pour '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Impossible de sauvegarder %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2708,7 +2748,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Image/s max :" @@ -2720,9 +2760,9 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Français" @@ -2735,7 +2775,7 @@ msgstr "Frets" msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Plein écran" @@ -2747,7 +2787,7 @@ msgstr "Résolution en Plein écran :" msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "Manette GC" @@ -2755,27 +2795,27 @@ msgstr "Manette GC" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID du jeu :" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Le jeu est déjà en cours d'émulation !" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Le jeu n'est pas en cours d'émulation !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Jeu non trouvé !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Config du Jeu" @@ -2783,7 +2823,7 @@ msgstr "Config du Jeu" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Fichiers de sauvegarde GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "GameCube" @@ -2792,16 +2832,16 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Paramètres de la manette GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Codes Gecko" @@ -2819,7 +2859,7 @@ msgstr "" "Sys, puis redémarrez Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Général" @@ -2828,9 +2868,9 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Allemand" @@ -2840,11 +2880,11 @@ msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Graphismes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Paramètres graphiques" @@ -2871,7 +2911,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Grèque" @@ -2899,7 +2939,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Echec de la vérification de la somme de contrôle de l'entête" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hébreu" @@ -2911,7 +2951,7 @@ msgstr "Hauteur" msgid "Help" msgstr "Aide" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2932,7 +2972,7 @@ msgstr "" "\n" "Sayonara !\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2974,7 +3014,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Hôte" @@ -2983,11 +3023,11 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Hongrois" @@ -2995,14 +3035,14 @@ msgstr "Hongrois" msgid "Hybrid Wiimote" msgstr "Wiimote hybride" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket " "inconnu : %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -3015,11 +3055,11 @@ msgstr "" "ID du titre : %016llx.\n" "Dolphin va probablement se bloquer maintenant." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -3035,11 +3075,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -3051,7 +3091,7 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3095,9 +3135,15 @@ msgstr "" msgid "Import Save" msgstr "Importer une sauvegarde" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "L'importation a échoué. Essayer de nouveau ?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importer une sauvegarde" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Echec de l'exportation" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3119,21 +3165,17 @@ msgstr "" "Le fichier importé a l'extension SAV\n" "mais n'a pas une entête valide" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Dans le jeu" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "Dans le jeu" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Image/s max :" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3153,7 +3195,7 @@ msgstr "Insérer" msgid "Insert Encrypted or Decrypted code here..." msgstr "Indiquer un code crypté ou décrypté ici..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3161,7 +3203,7 @@ msgstr "Insérer une carte SD" msgid "Insert name here.." msgstr "Indiquer un nom ici..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Installer un WAD" @@ -3169,30 +3211,31 @@ msgstr "Installer un WAD" msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Erreur lors de la vérification de l'intégrité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Vérification de l'intégrité terminée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Vérification de l'intégrité terminée. Aucune erreur trouvée." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3201,11 +3244,11 @@ msgstr "" "Echec de la vérification de l'intégrité pour la partition %d. Votre copie " "est certainement corrompue ou a été incorrectement patchée." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Paramètres de l'interface" @@ -3230,15 +3273,15 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRÈS lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Taille invalide (%x) ou mot Magique (%x)" @@ -3271,7 +3314,7 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" @@ -3289,13 +3332,13 @@ msgstr "" "Texte de recherche non valide (seules les longueurs de chaînes de caractères " "sont prises en charge)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Etat non valide" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italien" @@ -3303,16 +3346,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japonais" @@ -3338,8 +3381,8 @@ msgstr "Toujours au premier plan" msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Coréen" @@ -3357,16 +3400,16 @@ msgstr "Bouton L" msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Latence :" @@ -3409,7 +3452,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3508,15 +3551,15 @@ msgstr "Charger l'état du Slot 8" msgid "Load State Slot 9" msgstr "Charger l'état du Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Charger un état..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3537,10 +3580,6 @@ msgstr "" "Charger les valeurs de pré-réglage à partir de la palette de hack " "disponibles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Local" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Journal" @@ -3575,11 +3614,11 @@ msgid "Logger Outputs" msgstr "Sorties des journalisations" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Journalisation" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Connexion au serveur perdue !" @@ -3587,7 +3626,7 @@ msgstr "Connexion au serveur perdue !" msgid "M Button" msgstr "Bouton M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3596,7 +3635,7 @@ msgstr "" "MD5 non concordant\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" @@ -3610,11 +3649,11 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Concepteur :" @@ -3651,7 +3690,7 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Carte mémoire" @@ -3663,7 +3702,7 @@ msgstr "" "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant " "utilisation, devrait être OK mais corruption possible de données !" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3690,7 +3729,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Micro" @@ -3703,7 +3742,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3853,7 +3892,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3900,7 +3939,7 @@ msgstr "Aucun ISO ou WAD trouvé" msgid "No audio output" msgstr "Pas de sortie audio" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Aucune bannière trouvée pour le titre %s" @@ -3926,7 +3965,7 @@ msgstr "Aucune entrée de dossier d'index libre" msgid "No recorded file" msgstr "Aucun fichier enregistré" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" @@ -3935,11 +3974,11 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norvégien Bokmål" @@ -3947,19 +3986,19 @@ msgstr "Norvégien Bokmål" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Non défini" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" "Ce n'est pas une sauvegarde Wii ou échec de le lecture de la taille de " "l'entête du fichier %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Non connectée" @@ -4005,7 +4044,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Arrêt" @@ -4013,16 +4052,20 @@ msgstr "Arrêt" msgid "Offset:" msgstr "Offset :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Afficher les messages informatifs" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "%d blocs disponibles seulement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Ouvrir" @@ -4035,7 +4078,7 @@ msgstr "Ouvrir l'emplacement du fichier" msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Ouvrir un fichier..." @@ -4061,6 +4104,16 @@ msgstr "Décodeur de texture OpenCL" msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4087,7 +4140,7 @@ msgstr "" msgid "Other" msgstr "Autres" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4099,7 +4152,7 @@ msgstr "" msgid "Output" msgstr "Sortie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Jouer l'enregistrement..." @@ -4107,7 +4160,7 @@ msgstr "Jouer l'enregistrement..." msgid "Pad" msgstr "Manette" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Manette " @@ -4136,21 +4189,21 @@ msgstr "Paramètres" msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Chemins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pause" @@ -4163,7 +4216,7 @@ msgstr "Faire une pause à la fin du film" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Parfait" @@ -4173,9 +4226,9 @@ msgid "Perspective %d" msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Démarrer" @@ -4187,7 +4240,7 @@ msgstr "Jouer l'enregistrement..." msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Jouable" @@ -4195,11 +4248,11 @@ msgstr "Jouable" msgid "Playback Options" msgstr "Options de lecture" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Joueurs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4211,36 +4264,36 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4248,17 +4301,17 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fin de film prématurée dans Play Controller (%u + 8 > %u)" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u + %d > %u)" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u > %u)" @@ -4291,7 +4344,7 @@ msgstr "Profil" msgid "Properties" msgstr "Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Vider le cache" @@ -4299,8 +4352,8 @@ msgstr "Vider le cache" msgid "Question" msgstr "Question" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Quitter" @@ -4361,6 +4414,11 @@ msgstr "Wiimote physique" msgid "Record" msgstr "Enregistrer" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Options d'enregistrement" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Infos sur l'enregistrement" @@ -4397,7 +4455,7 @@ msgstr "" "Dans le doute, sélectionnez Aucune." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Rafraîchir" @@ -4406,14 +4464,14 @@ msgstr "Rafraîchir" msgid "Refresh List" msgstr "Rafraîchir la liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Retirer" @@ -4444,7 +4502,7 @@ msgstr "Résultats" msgid "Return" msgstr "Entrée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4462,15 +4520,15 @@ msgstr "Stick Droit" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Exécute les DSP HLE et LLE sur un thread dédié (non recommandé : peut " "provoquer des pépins avec le HLE et des blocages avec le LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russe" @@ -4483,7 +4541,7 @@ msgid "Safe" msgstr "Sûr " #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Sauver" @@ -4544,28 +4602,28 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State Slot 9" msgstr "Sauvegarder l'état vers le Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4589,7 +4647,7 @@ msgstr "Recherche d'ISO" msgid "Scanning..." msgstr "Recherche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Capt écran" @@ -4605,7 +4663,7 @@ msgstr "Rechercher" msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" @@ -4628,12 +4686,12 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4655,19 +4713,19 @@ msgstr "Sélectionner un fichier de sauvegarde à importer" msgid "Select floating windows" msgstr "Sélectionner les fenêtres flottantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4747,7 +4805,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Envoyer" @@ -4759,11 +4817,11 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4786,7 +4844,7 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4794,19 +4852,20 @@ msgstr "" "Configure la latence (en ms). Des valeurs plus élevées peuvent réduire le " "craquement audio. Uniquement avec le moteur OpenAL." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Nom court :" @@ -4814,23 +4873,28 @@ msgstr "Nom court :" msgid "Shoulder Buttons" msgstr "Boutons latéraux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Afficher la &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Afficher le &journal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Afficher la barre d'&état" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Afficher la barre d'&outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Par défaut" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Afficher les lecteurs" @@ -4842,11 +4906,11 @@ msgstr "Afficher les régions copiées d'EFB" msgid "Show FPS" msgstr "Afficher les FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Afficher France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Afficher GameCube" @@ -4854,35 +4918,35 @@ msgstr "Afficher GameCube" msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Afficher Italie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Afficher Japon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Afficher la langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Afficher la config. de journalisation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Afficher PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Afficher les plateformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Afficher les régions" @@ -4890,27 +4954,27 @@ msgstr "Afficher les régions" msgid "Show Statistics" msgstr "Afficher les statistiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Afficher Taïwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Afficher USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Afficher WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4929,7 +4993,7 @@ msgstr "Afficher le premier bloc" msgid "Show lag counter" msgstr "Afficher le compteur de lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4967,7 +5031,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Afficher les inconnus" @@ -4985,7 +5049,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinois simplifié" @@ -4993,11 +5057,11 @@ msgstr "Chinois simplifié" msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Ignorer le vidage DCBZ" @@ -5022,17 +5086,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -5040,7 +5104,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Capture" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Rendu logiciel" @@ -5057,7 +5121,7 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Paramètres audio" @@ -5075,9 +5139,9 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Espagnol" @@ -5105,37 +5169,29 @@ msgstr "" "\n" "Dans le doute, sélectionnez 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Accélerer le taux de transfert du disque" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Stick carré" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Contrôleur standard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Démarrer &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Commencer l'enregistrement" @@ -5151,7 +5207,7 @@ msgstr "Etat" msgid "State Saves" msgstr "Etats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Volant" @@ -5160,7 +5216,7 @@ msgid "Stick" msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Arrêter" @@ -5191,16 +5247,16 @@ msgstr "Gratter" msgid "Subtract" msgstr "Soustraire" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Fichier exporté avec succès vers %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Fichiers de sauvegarde importés avec succès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5208,11 +5264,11 @@ msgstr "" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Synchroniser le thread du GPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5220,8 +5276,8 @@ msgstr "" "Synchronise les transferts entre le GPU et le CPU pour éviter des blocages " "aléatoires en mode Dual Core. (Coché = Compatible, Décoché = Rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Langue du système :" @@ -5250,13 +5306,13 @@ msgstr "Table Gauche" msgid "Table Right" msgstr "Table Droite" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Capture d'écran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5276,7 +5332,7 @@ msgstr "Cache de texture" msgid "Texture Format Overlay" msgstr "Infos de format de texture" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "Le WAD a été installé avec succès" @@ -5288,13 +5344,13 @@ msgstr "L'adresse n'est pas valide" msgid "The checksum was successfully fixed" msgstr "La somme de contrôle a été corrigée avec succès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Le dossier sélectionné est déjà dans la liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5351,7 +5407,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "La sauvegarde que vous essayez de copier a une taille de fichier non valide" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5359,23 +5415,23 @@ msgstr "" "La langue sélectionnée n'est pas prise en charge par votre système. Retour à " "la langue par défaut du système." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Les versions NetPlay du serveur et du client sont incompatibles !" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Le serveur est plein !" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Le serveur a répondu que le jeu est déjà en cours d'exécution !" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Le serveur a envoyé un message d'erreur inconnu !" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Le fichier spécifié \"%s\" n'existe pas" @@ -5384,11 +5440,11 @@ msgstr "Le fichier spécifié \"%s\" n'existe pas" msgid "The value is invalid" msgstr "La valeur n'est pas valide" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Thème :" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5396,7 +5452,7 @@ msgstr "" "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " "probablement incomplète." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5412,7 +5468,7 @@ msgstr "" "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " "l'Action Replay lui-même." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." @@ -5437,7 +5493,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5450,7 +5506,7 @@ msgstr "" "pour DSP (peut éliminer les clics audio mais peut causer un bruit constant " "selon les jeux)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5506,7 +5562,7 @@ msgstr "Copies de l'EFB" msgid "Toggle Fog" msgstr "Activer tous les types de journaux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Activer le plein écran" @@ -5516,11 +5572,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5544,7 +5600,7 @@ msgstr "" "Essai de lecture à partir d'un SYSCONF non valide\n" "Les IDs BT de la Wiimote ne sont pas disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turque" @@ -5597,7 +5653,7 @@ msgstr "" "décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "%i non défini" @@ -5634,12 +5690,12 @@ msgstr "Commande 0x%08x inconnue" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Type d'entrée %i inconnue dans SYSCONF (%s@%x) !" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Reception d'un message inconnu avec l'ID : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5659,7 +5715,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5671,7 +5727,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -5696,6 +5752,15 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5719,7 +5784,7 @@ msgstr "Utilitaires" msgid "V-Sync" msgstr "Synchro verticale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "Hack de vitesse pour le MMU" @@ -5744,7 +5809,7 @@ msgstr "Niveau de détail" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Vidéo" @@ -5752,17 +5817,17 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Echec de l'installation du WAD : erreur lors de la création du ticket" @@ -5796,7 +5861,7 @@ msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !" msgid "Warning - starting ISO in wrong console mode!" msgstr "Attention : démarrage d\" l'ISO dans un mauvais mode de console !" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5822,7 +5887,7 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5834,7 +5899,7 @@ msgstr "" "autre sauvegarde avant de continuer, ou charger cette sauvegarde en " "désactivant le mode Lecture seule." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5846,7 +5911,7 @@ msgstr "" "charger cet état en désactivant le mode Lecture seule. Dans le cas " "contraire, il y aura probablement une désynchronisation." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5897,23 +5962,19 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importer une sauvegarde Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5922,7 +5983,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD : impossible de lire le fichier" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5931,7 +5992,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5939,7 +6000,7 @@ msgstr "Wiimote connectée" msgid "Wiimote Motor" msgstr "Vibreur de la Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Paramètres de la Wiimote" @@ -5963,14 +6024,14 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Travail..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -6037,7 +6098,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Vous ne pouvez pas fermer des panneaux contenant des appels." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Vous devez choisir un jeu !!" @@ -6053,7 +6114,7 @@ msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide." msgid "You must enter a valid profile name." msgstr "Vous devez entrer un profil de nom valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Vous devez redémarrer Dolphin pour que ce changement prenne effet." @@ -6067,7 +6128,7 @@ msgstr "" "Voulez-vous arrêter l'émulation maintenant pour corriger le problème ?\n" "Si vous choisissez \"Non\", l'audio pourra être déformé." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6086,7 +6147,7 @@ msgstr "" "Il devrait être de 0x%04x (au lieu de 0x%04llx).\n" "Voulez-vous en générer un nouveau ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -6153,7 +6214,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6166,7 +6227,17 @@ msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Reception d'un message inconnu avec l'ID : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6201,9 +6272,29 @@ msgstr "| OR" #~ msgstr "" #~ "Impossible de trouver la Wiimote par bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu " +#~ "est en cours d'exécution !\n" +#~ "(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " +#~ "pris en charge)" + #~ msgid "Enable Hotkeys" #~ msgstr "Activer les touches de raccourci" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " +#~ "Uniquement avec le moteur OpenAL. Il peut être nécessaire de renommer le " +#~ "fichier soft_oal.dll en OpenAL32.dll pour que cela fonctionne." + +#~ msgid "Export failed, try again?" +#~ msgstr "L'exportation a échoué. Essayer de nouveau ?" + #~ msgid "Failed to Listen!!" #~ msgstr "Ecoute impossible !" @@ -6228,12 +6319,21 @@ msgstr "| OR" #~ "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON " #~ "= Compatible, OFF = Vitesse)" +#~ msgid "Import failed, try again?" +#~ msgstr "L'importation a échoué. Essayer de nouveau ?" + +#~ msgid "In-Game" +#~ msgstr "Dans le jeu" + #~ msgid "Last Overwritten State" #~ msgstr "Dernier état écrasé" #~ msgid "Last Saved State" #~ msgstr "Dernier état sauvegardé" +#~ msgid "Local" +#~ msgstr "Local" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Reconnecter la Wiimote lors du chargement d'un état" @@ -6255,3 +6355,6 @@ msgstr "| OR" #~ "spécifications d'OpenGL et peut provoquer de gros bugs graphiques.\n" #~ "\n" #~ "Dans le doute, décochez cette case." + +#~ msgid "Wii Save Import" +#~ msgstr "Importer une sauvegarde Wii" diff --git a/Languages/po/he.po b/Languages/po/he.po index 3206b17564..dbc66e9b49 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: delroth \n" "Language-Team: LANGUAGE \n" @@ -22,9 +22,9 @@ msgstr "" msgid " (too many to display)" msgstr "(ארוך מידי)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "משחק:" @@ -39,7 +39,7 @@ msgid "" " Create a new 16MB Memcard?" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -64,8 +64,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "" @@ -96,12 +96,17 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, c-format +msgid "%s failed: kr=%x" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "" @@ -111,7 +116,7 @@ msgstr "" msgid "%s is already compressed! Cannot compress it further." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "" @@ -140,7 +145,7 @@ msgstr "" msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&אודות" @@ -148,7 +153,7 @@ msgstr "&אודות" msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "" @@ -156,7 +161,7 @@ msgstr "" msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "" @@ -180,11 +185,11 @@ msgstr "" msgid "&File" msgstr "&קובץ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&מסך מלא" @@ -192,7 +197,7 @@ msgstr "&מסך מלא" msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&עזרה" @@ -200,7 +205,7 @@ msgstr "&עזרה" msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "" @@ -212,11 +217,11 @@ msgstr "" msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "" @@ -224,11 +229,11 @@ msgstr "" msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&שחק" @@ -236,39 +241,39 @@ msgstr "&שחק" msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&קול" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&עצור" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "" @@ -356,7 +361,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -364,7 +369,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -372,8 +377,8 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "" @@ -397,8 +402,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -407,13 +410,13 @@ msgid "" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "" @@ -525,11 +528,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "" @@ -537,9 +540,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "" @@ -577,36 +580,36 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "" @@ -634,7 +637,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "" @@ -649,7 +652,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -658,21 +661,21 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "" @@ -681,12 +684,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "" @@ -694,7 +697,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "" @@ -730,7 +733,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "" @@ -748,7 +751,7 @@ msgstr "" msgid "Backward" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "" @@ -761,11 +764,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "" @@ -777,7 +780,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "" @@ -806,7 +809,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "" @@ -815,11 +818,11 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "" @@ -827,15 +830,15 @@ msgstr "" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "" @@ -845,7 +848,7 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -867,7 +870,7 @@ msgstr "" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "" @@ -884,7 +887,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -899,9 +902,9 @@ msgstr "" msgid "Cancel" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "" @@ -910,7 +913,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -918,7 +921,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -928,7 +931,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -936,11 +939,11 @@ msgstr "" msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "" @@ -948,11 +951,11 @@ msgstr "" msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -966,11 +969,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "" @@ -986,39 +989,39 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "" @@ -1026,14 +1029,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "" @@ -1052,7 +1055,7 @@ msgstr "" msgid "Clear" msgstr "" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1060,7 +1063,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "" @@ -1085,7 +1088,7 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "" @@ -1097,12 +1100,12 @@ msgstr "" msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "" @@ -1116,22 +1119,22 @@ msgstr "" msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "" @@ -1140,16 +1143,16 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Connect Balance Board" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1170,7 +1173,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "" @@ -1190,7 +1193,7 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "" @@ -1199,7 +1202,7 @@ msgstr "" msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "" @@ -1213,7 +1216,7 @@ msgstr "" msgid "Could not initialize backend %s." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1221,22 +1224,16 @@ msgid "" "most PC DVD drives." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1250,11 +1247,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1265,7 +1262,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "" @@ -1302,12 +1299,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "" @@ -1315,11 +1312,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" @@ -1331,36 +1328,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "" @@ -1372,7 +1369,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1380,7 +1377,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "" @@ -1417,8 +1414,8 @@ msgstr "" msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "" @@ -1430,7 +1427,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "" @@ -1472,8 +1469,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "" @@ -1485,7 +1482,7 @@ msgstr "" msgid "Direct3D11" msgstr "" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "" @@ -1535,7 +1532,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "" @@ -1559,24 +1556,60 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "" @@ -1592,12 +1625,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1605,7 +1638,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "" @@ -1621,12 +1654,12 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" @@ -1650,11 +1683,11 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "" @@ -1691,9 +1724,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1722,7 +1755,7 @@ msgstr "" msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "" @@ -1734,16 +1767,20 @@ msgstr "" msgid "Edit Config" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "" @@ -1755,7 +1792,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "" @@ -1782,7 +1819,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "" @@ -1804,11 +1841,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1816,27 +1853,27 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "" @@ -1844,7 +1881,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "" @@ -1852,7 +1889,7 @@ msgstr "" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "" @@ -1869,7 +1906,7 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1895,33 +1932,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -1930,7 +1961,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -1947,9 +1978,9 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1978,11 +2009,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2009,7 +2040,6 @@ msgid "Euphoria" msgstr "" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2018,16 +2048,20 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +msgid "Export All Wii Saves" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "" @@ -2035,7 +2069,7 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "" @@ -2051,8 +2085,8 @@ msgstr "" msgid "Export all saves" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +msgid "Export failed" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 @@ -2075,44 +2109,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "" @@ -2128,11 +2162,11 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "" @@ -2140,7 +2174,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2172,16 +2206,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2205,12 +2239,12 @@ msgid "" "(0x6000-0x7FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2227,7 +2261,7 @@ msgid "" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2237,29 +2271,34 @@ msgid "" "(0x0000-0x1FFF)" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, c-format +msgid "Failed to read header for file %d" +msgstr "" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, c-format +msgid "Failed to write data to file: %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "" @@ -2271,17 +2310,17 @@ msgstr "" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "" @@ -2318,16 +2357,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2355,7 +2394,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "" @@ -2379,7 +2418,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2396,7 +2435,7 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2405,6 +2444,11 @@ msgstr "" msgid "Found %d results for '" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, c-format +msgid "Found %x save files" +msgstr "" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2434,7 +2478,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "" @@ -2446,9 +2490,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "" @@ -2461,7 +2505,7 @@ msgstr "" msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "" @@ -2473,7 +2517,7 @@ msgstr "" msgid "GCI File(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "" @@ -2481,27 +2525,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "" @@ -2509,7 +2553,7 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "" @@ -2518,16 +2562,16 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "" @@ -2541,7 +2585,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "" @@ -2550,9 +2594,9 @@ msgstr "" msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "" @@ -2561,11 +2605,11 @@ msgstr "" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "" @@ -2584,7 +2628,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "" @@ -2612,7 +2656,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "" @@ -2624,7 +2668,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2636,7 +2680,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2666,7 +2710,7 @@ msgid "Home" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "" @@ -2675,11 +2719,11 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "" @@ -2687,12 +2731,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2701,11 +2745,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "" @@ -2721,11 +2765,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "" @@ -2737,7 +2781,7 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2769,8 +2813,12 @@ msgstr "" msgid "Import Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +msgid "Import Wii Save" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +msgid "Import failed" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 @@ -2789,20 +2837,16 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 msgid "Increase Frame limit" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "" @@ -2822,7 +2866,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "" @@ -2830,7 +2874,7 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "" @@ -2838,39 +2882,40 @@ msgstr "" msgid "Install to Wii Menu" msgstr "" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "" @@ -2893,15 +2938,15 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" @@ -2931,7 +2976,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "" @@ -2947,13 +2992,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "" @@ -2961,16 +3006,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "" @@ -2993,8 +3038,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "" @@ -3012,16 +3057,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3057,7 +3102,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "" @@ -3145,15 +3190,15 @@ msgstr "" msgid "Load State Slot 9" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3169,10 +3214,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "" @@ -3202,11 +3243,11 @@ msgid "Logger Outputs" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "" @@ -3214,14 +3255,14 @@ msgstr "" msgid "M Button" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "" @@ -3235,11 +3276,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "" @@ -3270,7 +3311,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "" @@ -3280,7 +3321,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3299,7 +3340,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "" @@ -3312,7 +3353,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "" @@ -3449,7 +3490,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3496,7 +3537,7 @@ msgstr "" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "" @@ -3522,7 +3563,7 @@ msgstr "" msgid "No recorded file" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "" @@ -3531,11 +3572,11 @@ msgstr "" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "" @@ -3543,17 +3584,17 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "" @@ -3599,7 +3640,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "" @@ -3607,16 +3648,20 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "" @@ -3629,7 +3674,7 @@ msgstr "" msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "" @@ -3655,6 +3700,16 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3676,7 +3731,7 @@ msgstr "" msgid "Other" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3686,7 +3741,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "" @@ -3694,7 +3749,7 @@ msgstr "" msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "" @@ -3723,21 +3778,21 @@ msgstr "" msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "" @@ -3750,7 +3805,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "" @@ -3760,9 +3815,9 @@ msgid "Perspective %d" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "" @@ -3774,7 +3829,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "" @@ -3782,11 +3837,11 @@ msgstr "" msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "" @@ -3798,36 +3853,36 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "" @@ -3835,17 +3890,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3878,7 +3933,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "" @@ -3886,8 +3941,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "" @@ -3948,6 +4003,10 @@ msgstr "" msgid "Record" msgstr "" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +msgid "Record input" +msgstr "" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "" @@ -3978,7 +4037,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "" @@ -3987,14 +4046,14 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "" @@ -4022,7 +4081,7 @@ msgstr "" msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4040,13 +4099,12 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "" @@ -4059,7 +4117,7 @@ msgid "Safe" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "" @@ -4116,28 +4174,28 @@ msgstr "" msgid "Save State Slot 9" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4159,7 +4217,7 @@ msgstr "" msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "" @@ -4175,7 +4233,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "" @@ -4198,12 +4256,12 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "" @@ -4222,19 +4280,19 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "" @@ -4287,7 +4345,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "" @@ -4299,11 +4357,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4322,25 +4380,25 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +msgid "SetupWiiMem: Cant create setting file" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "" @@ -4348,23 +4406,27 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +msgid "Show Defaults" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "" @@ -4376,11 +4438,11 @@ msgstr "" msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "" @@ -4388,35 +4450,35 @@ msgstr "" msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "" @@ -4424,27 +4486,27 @@ msgstr "" msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4459,7 +4521,7 @@ msgstr "" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4490,7 +4552,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "" @@ -4505,7 +4567,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" @@ -4513,11 +4575,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4535,17 +4597,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "" @@ -4553,7 +4615,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "" @@ -4565,7 +4627,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "" @@ -4583,9 +4645,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "" @@ -4605,37 +4667,29 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "" @@ -4651,7 +4705,7 @@ msgstr "" msgid "State Saves" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "" @@ -4660,7 +4714,7 @@ msgid "Stick" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "" @@ -4686,16 +4740,16 @@ msgstr "" msgid "Subtract" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4703,18 +4757,18 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "" @@ -4743,13 +4797,13 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "" @@ -4769,7 +4823,7 @@ msgstr "" msgid "Texture Format Overlay" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "" @@ -4781,13 +4835,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -4835,29 +4889,29 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "" @@ -4866,17 +4920,17 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4888,7 +4942,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4904,7 +4958,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -4912,7 +4966,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4959,7 +5013,7 @@ msgstr "" msgid "Toggle Fog" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "" @@ -4969,11 +5023,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -4995,7 +5049,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "" @@ -5043,7 +5097,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "" @@ -5079,12 +5133,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5103,7 +5157,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5115,7 +5169,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "" @@ -5135,6 +5189,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5152,7 +5215,7 @@ msgstr "" msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "VBeam Speed Hack" msgstr "" @@ -5176,7 +5239,7 @@ msgstr "" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "" @@ -5184,17 +5247,17 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" @@ -5224,7 +5287,7 @@ msgstr "" msgid "Warning - starting ISO in wrong console mode!" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5241,7 +5304,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5249,7 +5312,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5257,7 +5320,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5293,23 +5356,19 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5318,7 +5377,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "" @@ -5327,7 +5386,7 @@ msgstr "" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "" @@ -5335,7 +5394,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "" @@ -5359,14 +5418,14 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5426,7 +5485,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "" @@ -5442,7 +5501,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5453,7 +5512,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5467,7 +5526,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "" @@ -5517,7 +5576,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "" @@ -5530,7 +5589,16 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +msgid "unknown message received" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 3c65c5be09..f1c21fedb7 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: Delirious \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr " (túl sok kijelző)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Játék:" @@ -43,7 +43,7 @@ msgstr "" "Nincs \"%s\".\n" " Létrehozol egy új 16 MB-os memóriakártyát?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." @@ -68,8 +68,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s már van, felülírod?" @@ -107,12 +107,17 @@ msgstr "" "a fájl nem elég nagy ahhoz, hogy megfelelő memóriakártya fájl lehessen (0x%x " "bájt)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s megnyitása sikertelen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s megnyitása sikertelen" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s egy 0 bájt méretű fájl" @@ -122,7 +127,7 @@ msgstr "%s egy 0 bájt méretű fájl" msgid "%s is already compressed! Cannot compress it further." msgstr "%s már tömörítve van! Nem tömöríthető tovább." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s túl hossz fájlnévnek, maximum 45 karakter" @@ -151,7 +156,7 @@ msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" msgid "&& AND" msgstr "&& ÉS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Névjegy..." @@ -159,7 +164,7 @@ msgstr "&Névjegy..." msgid "&Boot from DVD Drive..." msgstr "&Bootolás DVD meghajtóról..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Töréspontok" @@ -167,7 +172,7 @@ msgstr "&Töréspontok" msgid "&Browse for ISOs..." msgstr "&ISO fájlok tallózása..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Csalás kezelő" @@ -191,11 +196,11 @@ msgstr "&Emuláció" msgid "&File" msgstr "&Fájl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Képkocka léptetés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Teljes nézet" @@ -203,7 +208,7 @@ msgstr "&Teljes nézet" msgid "&Graphics Settings" msgstr "&Grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Súgó" @@ -211,7 +216,7 @@ msgstr "&Súgó" msgid "&Hotkey Settings" msgstr "&Gyorsbillentyű beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -223,11 +228,11 @@ msgstr "&Állás betöltése" msgid "&Memcard Manager (GC)" msgstr "&Memóriakártya kezelő (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Megnyitás..." @@ -235,11 +240,11 @@ msgstr "&Megnyitás..." msgid "&Options" msgstr "&Beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Szünet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Indítás" @@ -247,39 +252,39 @@ msgstr "&Indítás" msgid "&Properties" msgstr "&Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Írásvédett mód" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Regiszterek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Alapra állítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Hang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Leállítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Eszközök" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Kép" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Nézet" @@ -368,7 +373,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -376,7 +381,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -384,8 +389,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Már egy NetPlay ablak nyitva van!" @@ -412,8 +417,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -438,13 +441,13 @@ msgstr "" "\n" "Továbbítani kell a TCP portot a host számára!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM alaplap" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR kódok" @@ -576,11 +579,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -588,9 +591,9 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mező hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Hozzáadás..." @@ -644,36 +647,36 @@ msgstr "" msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Haladó beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Minden tömörített GC/Wii ISO fájl (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" @@ -702,7 +705,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "A betöltő program nem képes fájlból betölteni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Betöltő program:" @@ -720,7 +723,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arab" @@ -729,7 +732,7 @@ msgstr "Arab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Biztos törlöd ezt: \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -737,15 +740,15 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -754,12 +757,12 @@ msgstr "Képarány:" msgid "At least one pane must remain open." msgstr "Legalább egy mezőnek megnyitva kell maradnia." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Hang feldolgozó:" @@ -767,7 +770,7 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Automatikus" @@ -806,7 +809,7 @@ msgstr "BP regiszter " msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Feldolgozó beállításai" @@ -824,7 +827,7 @@ msgstr "Háttér bemenet" msgid "Backward" msgstr "Vissza" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Rossz fájl fejléc" @@ -837,11 +840,11 @@ msgstr "" msgid "Banner" msgstr "Játék kép" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Játék kép részletek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Játék kép:" @@ -853,7 +856,7 @@ msgstr "Vevő" msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Alap beállítások" @@ -882,7 +885,7 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Gomb" @@ -891,11 +894,11 @@ msgstr "Gomb" msgid "Bound Controls: %lu" msgstr "Összekötött irányítások: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Hibás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Tallózás" @@ -903,15 +906,15 @@ msgstr "Tallózás" msgid "Browse for a directory to add" msgstr "Hozzáadandó könyvtár tallózása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Egy ISO könyvtár tallózása..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Puffer:" @@ -921,7 +924,7 @@ msgstr "Puffer:" msgid "Buttons" msgstr "Gombok" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -945,7 +948,7 @@ msgstr "C-kar" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" @@ -968,7 +971,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -983,9 +986,9 @@ msgstr "" msgid "Cancel" msgstr "Mégse" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "%s nem nyitható meg" @@ -994,7 +997,7 @@ msgstr "%s nem nyitható meg" msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függőben lévő eseményekkel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1005,7 +1008,7 @@ msgstr "" "%s\n" "fájl nem megfelelő GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1017,7 +1020,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalán" @@ -1025,11 +1028,11 @@ msgstr "Katalán" msgid "Center" msgstr "Közép" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Váltás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Lemez &váltás..." @@ -1037,11 +1040,11 @@ msgstr "Lemez &váltás..." msgid "Change Disc" msgstr "Lemez váltás" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Játék váltás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1057,11 +1060,11 @@ msgstr "Megváltoztatja a zFar paraméterhez tartozó jegyet (javítás után)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Megváltoztatja a zNear paraméterhez tartozó jegyet (javítás után)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "A változtatások nem érvényesülnek ameddig fut az emulátor!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Csevegés" @@ -1077,39 +1080,39 @@ msgstr "Csalás keresés" msgid "Cheats Manager" msgstr "Csalás kezelő" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Partíció integritás ellenőrzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Integritás ellenőrzés..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1117,7 +1120,7 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1125,8 +1128,8 @@ msgstr "" "Válassz betöltő programnak használandó fájlt: (csak könyvtárakból " "létrehozott lemezekre érvényesíthető)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Válassz mappát a kitömörítéshez" @@ -1145,7 +1148,7 @@ msgstr "Klasszikus" msgid "Clear" msgstr "Törlés" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1155,7 +1158,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Bezárás" @@ -1180,7 +1183,7 @@ msgstr "Parancs" msgid "Comment" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Megjegyzés:" @@ -1192,12 +1195,12 @@ msgstr "ISO tömörítése..." msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "ISO tömörítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Beállítások" @@ -1211,22 +1214,22 @@ msgstr "Beállítások" msgid "Configure Control" msgstr "Irányítás beállítás" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Irányítók beállítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Kilépéskor megerősítés" @@ -1235,17 +1238,17 @@ msgstr "Kilépéskor megerősítés" msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "USB billentyűzet csatlakoztatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "%i Wiimote csatlakoztatása" @@ -1266,7 +1269,7 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Csatlakozás..." @@ -1286,7 +1289,7 @@ msgstr "Irányítás" msgid "Convert to GCI" msgstr "Konvertálás: GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Másolás sikertelen" @@ -1295,7 +1298,7 @@ msgstr "Másolás sikertelen" msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Mag" @@ -1309,7 +1312,7 @@ msgstr "%s nem hozható létre" msgid "Could not initialize backend %s." msgstr "%s hang feldolgozó iniciálása sikertelen." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1320,24 +1323,16 @@ msgstr "" "biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii " "lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "%s ISO fájl nem ismerhető fel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "%s nem menthető el" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Irányítók beállítása nem sikerült. A játékos kilépett vagy a játék épp fut!\n" -"(irányítók beállítása még nem támogatott miközben a játék fut)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1351,11 +1346,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1368,7 +1363,7 @@ msgstr "" msgid "Count:" msgstr "Számláló:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Ország:" @@ -1408,12 +1403,12 @@ msgstr "" msgid "Crossfade" msgstr "Kereszthalkítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Egyedi megjelenítési hack" @@ -1421,11 +1416,11 @@ msgstr "Egyedi megjelenítési hack" msgid "Custom Projection Hack Settings" msgstr "Egyedi megjelenítési hack beállítások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Néhány ortografikus megjelenítési paraméter egyedi beállítása." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Cseh" @@ -1437,36 +1432,36 @@ msgstr "D" msgid "D-Pad" msgstr "Digitális irányok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" @@ -1478,7 +1473,7 @@ msgstr "DVDLowRead - Végzetes hiba: kötetből kiolvasás sikertelen" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Végzetes hiba: kötetből kiolvasás sikertelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1486,7 +1481,7 @@ msgstr "" msgid "Data Size" msgstr "Adatok mérete" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Dátum:" @@ -1523,8 +1518,8 @@ msgstr "ISO kitömörítése..." msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "ISO kitömörítés" @@ -1537,7 +1532,7 @@ msgstr "Játéklista frissítése" msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" @@ -1581,8 +1576,8 @@ msgstr "" msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1594,7 +1589,7 @@ msgstr "Tárcsa" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1664,7 +1659,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Lemez" @@ -1691,24 +1686,60 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működő emulációt?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II dekóder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin &weblap" @@ -1724,12 +1755,12 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1737,7 +1768,7 @@ msgstr "Dolphin TAS videók (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" @@ -1757,12 +1788,12 @@ msgstr "" "A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla " "kattintás ide a játékok megjelenítéséhez..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "A Dolphin nem tudta elvégezni a kívánt műveletet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1789,11 +1820,11 @@ msgstr "Letöltve %lu kód. (hozzáadva %lu)" msgid "Drums" msgstr "Dobok" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Hang mentése" @@ -1840,9 +1871,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holland" @@ -1875,7 +1906,7 @@ msgstr "EURÓPA" msgid "Early Memory Updates" msgstr "Korai memória frissítés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Szerkesztés" @@ -1887,16 +1918,20 @@ msgstr "ActionReplay kód szerkesztése" msgid "Edit Config" msgstr "Beállítások szerkesztése" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Patch szerkesztése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Szerkesztés..." @@ -1908,7 +1943,7 @@ msgstr "Effektus" msgid "Embedded Frame Buffer" msgstr "Beágyazott képkocka puffer" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Az emuláció már fut" @@ -1946,7 +1981,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulált Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Emuláció állapota:" @@ -1974,11 +2009,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" @@ -1986,27 +2021,27 @@ msgstr "Bounding Box kalkuláció használata" msgid "Enable Cache" msgstr "Gyorsítótár használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Csalások használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Kétmagos mód használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Kétmagos mód használata (gyorsítás)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellőzése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellőzése (gyorsítás)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "MMU használata" @@ -2014,7 +2049,7 @@ msgstr "MMU használata" msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Képernyővédő bekapcsolása" @@ -2022,7 +2057,7 @@ msgstr "Képernyővédő bekapcsolása" msgid "Enable Speaker Data" msgstr "Hangszóró adatok bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Széleskijelző bekapcsolása" @@ -2044,7 +2079,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2080,7 +2115,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2088,11 +2123,11 @@ msgstr "" "Használatával The Legend of Zelda: Twilight Princess játék sebessége " "növekedik. A TÖBBI játéknál legyen kikapcsolva." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2100,22 +2135,13 @@ msgstr "" "Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Nem működik " "OSX alatt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Csak OpenAl " "feldolgozó esetén." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Csak OpenAl " -"feldolgozó esetén. Működéshez szükség lehet a soft_oal.dll átnevezésére " -"OpenAL32.dll névre." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2129,7 +2155,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2151,9 +2177,9 @@ msgstr "" msgid "End" msgstr "Vége" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Angol" @@ -2182,11 +2208,11 @@ msgstr "Egyenlő" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Hiba" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " @@ -2220,7 +2246,6 @@ msgid "Euphoria" msgstr "Eufória" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Kivétel kezelő - memória terület alatti hozzáférés. %08llx%08llx" @@ -2229,16 +2254,21 @@ msgstr "Kivétel kezelő - memória terület alatti hozzáférés. %08llx%08llx" msgid "Execute" msgstr "Végrehajtás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Minden mentés exportálása" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Exportálás sikertelen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Fájl exportálása" @@ -2246,7 +2276,7 @@ msgstr "Fájl exportálása" msgid "Export Recording" msgstr "Felvétel exportálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Felvétel exportálása..." @@ -2262,9 +2292,10 @@ msgstr "Wii mentés exportálása (kísérleti)" msgid "Export all saves" msgstr "Minden mentés exportálása" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Exportálás sikertelen. Újra megpróbálod?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Exportálás sikertelen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2286,44 +2317,44 @@ msgstr "Extra paraméter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Az extra paraméter csak a ''Metroid: Other M'' játékban hasznos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Minden fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Betöltő program kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "DOL kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Könyvtár kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Kitömörítés..." @@ -2339,11 +2370,11 @@ msgstr "FIFO lejátszó" msgid "FRANCE" msgstr "FRANCIAORSZÁG" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST méret:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Csatlakozás sikertelen!" @@ -2351,7 +2382,7 @@ msgstr "Csatlakozás sikertelen!" msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Kitömörítés nem sikerült ide: %s!" @@ -2391,16 +2422,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "%s olvasása sikertelen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "A banner.bin beolvasása sikertelen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2432,12 +2463,12 @@ msgstr "" "A blokk kiosztási tábla pontos kiolvasása sikertelen\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "%d fájlból történő adatok kiolvasása nem sikerült" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2458,7 +2489,7 @@ msgstr "" "A könyvtár pontos kiolvasása nem sikerült\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2470,29 +2501,34 @@ msgstr "" "A fejléc pontos kiolvasása nem sikerült\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Fejléc írása sikertelen a(z) %d fájl számára" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "A lemezképfájl egyedi azonosítójának kiolvasása sikertelen" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "A BT.DINF írása a SYSCONF fájlba sikertelen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "A bkhdr írása sikertelen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "%d fájlból történő adatok kiolvasása nem sikerült" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Fejléc írása sikertelen a(z) %s számára" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Fejléc írása sikertelen a(z) %d fájl számára" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Farsi" @@ -2504,11 +2540,11 @@ msgstr "Gyors" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU gyors verziója. Nem működik minden játéknál." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2516,7 +2552,7 @@ msgstr "" "Végzetes deszinkronizáció. Visszajátszás leállítása. (PlayWiimote hiba: %u !" "= %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo lejátszó" @@ -2557,16 +2593,16 @@ msgstr "A fájl nem ismerhető fel memóriakártyaként" msgid "File not compressed" msgstr "A fájl nincs tömörítve" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" @@ -2594,7 +2630,7 @@ msgstr "Kényszerített 16:9" msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" @@ -2627,7 +2663,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2649,7 +2685,7 @@ msgstr "" msgid "Forward" msgstr "Előre" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2658,6 +2694,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Találat: %d eredmény ehhez: '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "%s nem menthető el" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2687,7 +2728,7 @@ msgstr "Képkocka rendezés" msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Képkocka korlát:" @@ -2699,9 +2740,9 @@ msgstr "Rögzítendő képkockák" msgid "Free Look" msgstr "Szabad nézet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francia" @@ -2714,7 +2755,7 @@ msgstr "Frets" msgid "From" msgstr "Ettől:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Teljes méret" @@ -2726,7 +2767,7 @@ msgstr "Teljes kijelzős felbontás:" msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC irányító" @@ -2734,27 +2775,27 @@ msgstr "GC irányító" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "Játék azonosító:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "A játék már fut!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "A játék nem fut!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "A játék nem található!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "A játék sajátos beállításai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Játék konfig" @@ -2762,7 +2803,7 @@ msgstr "Játék konfig" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube állásmentés fájlok (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2771,16 +2812,16 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Gamecube irányító beállítások" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko kódok" @@ -2798,7 +2839,7 @@ msgstr "" "könyvtárban és újraindítod a Dolphin emulátort.) " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Általános" @@ -2807,9 +2848,9 @@ msgstr "Általános" msgid "General Settings" msgstr "Általános beállítások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Német" @@ -2818,11 +2859,11 @@ msgstr "Német" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: A jelzőszám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Grafikai beállítások" @@ -2848,7 +2889,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Görög" @@ -2876,7 +2917,7 @@ msgstr "Hackek" msgid "Header checksum failed" msgstr "A fejléc ellenőrző összege hibás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Héber" @@ -2888,7 +2929,7 @@ msgstr "Magasság" msgid "Help" msgstr "Súgó" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2900,7 +2941,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2940,7 +2981,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2949,11 +2990,11 @@ msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Magyar" @@ -2961,14 +3002,14 @@ msgstr "Magyar" msgid "Hybrid Wiimote" msgstr "Hibrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Adatok kinyerése megkísérelve egy ismeretlen jegyből: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2977,11 +3018,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL beállítások" @@ -2997,11 +3038,11 @@ msgstr "IR mutató" msgid "IR Sensitivity:" msgstr "IR érzékenysége:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "ISO könyvtárak" @@ -3013,7 +3054,7 @@ msgstr "OLASZORSZÁG" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3058,9 +3099,15 @@ msgstr "" msgid "Import Save" msgstr "Mentés importálása" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importálás sikertelen, megpróbálod újra?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Mentés importálása" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Exportálás sikertelen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3082,21 +3129,17 @@ msgstr "" "Az importált fájl sav kiterjesztésű\n" "de nem rendelkezik megfelelő fejléccel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Elindul" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "Elindul" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Képkocka korlát:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Infó" @@ -3116,7 +3159,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3124,7 +3167,7 @@ msgstr "SD kártya behelyezése" msgid "Insert name here.." msgstr "Írj be ide nevet..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "WAD telepítése" @@ -3132,29 +3175,30 @@ msgstr "WAD telepítése" msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Integritás ellenőrzési hiba" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Integritás ellenőrzés befejeződött" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Integritás ellenőrzés befejeződött. Nem találhatóak hibák." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3163,11 +3207,11 @@ msgstr "" "%d partíció integritás ellenőrzése sikertelen. A mentés valószínűleg sérült " "vagy helytelen hibajavítás történt rajta." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Felület beállítások" @@ -3192,15 +3236,15 @@ msgstr "Belső LZO hiba - lzo_init() sikertelen" msgid "Internal Resolution:" msgstr "Belső felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intró" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Érvénytelen méret(%x) vagy mágikus szó (%x)" @@ -3233,7 +3277,7 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Nem megfelelő rögzített fájl" @@ -3252,13 +3296,13 @@ msgstr "" "Érvénytelen keresési karakterlánc (még csak a karakterlánc hosszúsága " "támogatott)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Nem megfelelő mentés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Olasz" @@ -3266,16 +3310,16 @@ msgstr "Olasz" msgid "JAPAN" msgstr "JAPÁN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL kísérleti recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japán" @@ -3301,8 +3345,8 @@ msgstr "Ablak legfelül tartása" msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Koreai" @@ -3320,16 +3364,16 @@ msgstr "L gomb" msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Nyelv:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Késleltetés:" @@ -3372,7 +3416,7 @@ msgstr "" msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" @@ -3471,15 +3515,15 @@ msgstr "Állás betöltése a 8. helyről" msgid "Load State Slot 9" msgstr "Állás betöltése az 1. helyről" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Állás betöltése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3498,10 +3542,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Gombkiosztási értékek betöltése a hack mintákból rendelkezésre áll." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Helyi" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Napló" @@ -3536,11 +3576,11 @@ msgid "Logger Outputs" msgstr "Napló kimenetek" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Naplózás" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Kapcsolat elveszett a szerverrel!" @@ -3548,7 +3588,7 @@ msgstr "Kapcsolat elveszett a szerverrel!" msgid "M Button" msgstr "M gomb" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3557,7 +3597,7 @@ msgstr "" "MD5 eltérés\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU sebesség növelő hack" @@ -3571,11 +3611,11 @@ msgstr "MadCatz Gameshark fájlok (*.gcs)" msgid "Main Stick" msgstr "Főkar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "Gyártó azonosító:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Gyártó:" @@ -3612,7 +3652,7 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Memóriakártya" @@ -3624,7 +3664,7 @@ msgstr "" "Memóriakártya kezelő FIGYELMEZTETÉS - Készíts biztonsági mentést a " "használata előtt, helyreállítható de a meglévő adatok sérülhetnek!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3649,7 +3689,7 @@ msgstr "A memóriakártya fájlmérete nem egyezik a fejléc méretével" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mikrofon" @@ -3662,7 +3702,7 @@ msgstr "Min" msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3811,7 +3851,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3858,7 +3898,7 @@ msgstr "Nem találhatók sem ISO sem WAD fájlok" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Nem található játék kép fájl a(z) %s játékhoz" @@ -3884,7 +3924,7 @@ msgstr "Nincs üres könyvtári jelzőszám bejegyzés" msgid "No recorded file" msgstr "Nincs rögzített fájl" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "%s játékhoz nem található mentési mappa" @@ -3893,11 +3933,11 @@ msgstr "%s játékhoz nem található mentési mappa" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norvég" @@ -3905,17 +3945,17 @@ msgstr "Norvég" msgid "Not Equal" msgstr "Nem egyenlő" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Nincs beállítva" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3961,7 +4001,7 @@ msgstr "Elem" msgid "Object Range" msgstr "Elem hatótáv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Ki" @@ -3969,16 +4009,20 @@ msgstr "Ki" msgid "Offset:" msgstr "Eltolás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Képernyőn megjelenő üzenetek" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Csak %d blokk szabad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Megnyitás" @@ -3991,7 +4035,7 @@ msgstr "A játékot &tartalmazó mappa megnyitása" msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Fájl megnyitása..." @@ -4017,6 +4061,16 @@ msgstr "OpenCL textúra dekódoló" msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4042,7 +4096,7 @@ msgstr "" msgid "Other" msgstr "Egyéb" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4054,7 +4108,7 @@ msgstr "" msgid "Output" msgstr "Kimenet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "F&elvétel visszajátszása..." @@ -4062,7 +4116,7 @@ msgstr "F&elvétel visszajátszása..." msgid "Pad" msgstr "Irányító" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Irányító" @@ -4091,21 +4145,21 @@ msgstr "Paraméterek" msgid "Partition %i" msgstr "%i partíció" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Mappák" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Szünet" @@ -4118,7 +4172,7 @@ msgstr "Szünet a videó végén" msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Tökéletes" @@ -4128,9 +4182,9 @@ msgid "Perspective %d" msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Indítás" @@ -4142,7 +4196,7 @@ msgstr "Felvétel visszajátszása" msgid "Play/Pause" msgstr "Indítás/Szünet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Játszható" @@ -4150,11 +4204,11 @@ msgstr "Játszható" msgid "Playback Options" msgstr "Visszajátszási lehetőségek" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Játékosok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4166,36 +4220,36 @@ msgstr "Hozz először létre egy perspektívát mielőtt mentenél" msgid "Plus-Minus" msgstr "Plusz - minusz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "4. port" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazil)" @@ -4203,17 +4257,17 @@ msgstr "Portugál (brazil)" msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" @@ -4246,7 +4300,7 @@ msgstr "Profil" msgid "Properties" msgstr "Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Gyorsítótár ürítése" @@ -4254,8 +4308,8 @@ msgstr "Gyorsítótár ürítése" msgid "Question" msgstr "Kérdés" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Kilépés" @@ -4316,6 +4370,11 @@ msgstr "Valódi Wiimote-ok" msgid "Record" msgstr "Rögzítés" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Rögzítési beállítások" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Rögzítési infó" @@ -4351,7 +4410,7 @@ msgstr "" "Ha bizonytalan vagy, válaszd ezt: Nincs. " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Frissítés" @@ -4360,14 +4419,14 @@ msgstr "Frissítés" msgid "Refresh List" msgstr "A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Játéklista frissítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Törlés" @@ -4398,7 +4457,7 @@ msgstr "Eredmények" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4416,13 +4475,12 @@ msgstr "Jobb kar" msgid "Rumble" msgstr "Rumble funkció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Orosz" @@ -4435,7 +4493,7 @@ msgid "Safe" msgstr "Biztonságos" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Mentés" @@ -4496,28 +4554,28 @@ msgstr "Állás mentés a 8. helyre" msgid "Save State Slot 9" msgstr "Állás mentés az 1. helyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Állás mentése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." @@ -4539,7 +4597,7 @@ msgstr "ISO fájlok keresése" msgid "Scanning..." msgstr "Keresés..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Pillanatkép" @@ -4555,7 +4613,7 @@ msgstr "Keresés" msgid "Search Filter" msgstr "Keresési szűrő" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Keresés az almappákban" @@ -4578,12 +4636,12 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Válassz rögzítendő fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendő Wii WAD fájlt" @@ -4605,19 +4663,19 @@ msgstr "Válassz importálandó mentési fájlt" msgid "Select floating windows" msgstr "Válassz lebegő ablakokat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Betöltendő fájl kiválasztása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Válassz betöltendő állásmentést" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Válassz mentendő állást" @@ -4695,7 +4753,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, legyen az OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Küldés" @@ -4707,11 +4765,11 @@ msgstr "Érzékelő helyzete:" msgid "Separator" msgstr "Elválasztó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Szerb" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4732,7 +4790,7 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: A jelzőszám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4740,19 +4798,20 @@ msgstr "" "Késleltetés beállítása (ms). Magasabb értékek csökkenthetik a hang " "recsegést. Csak OpenAL feldolgozó estén." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Beállítások..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Nem található a beállítási fájl" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Rázás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Rövid cím:" @@ -4760,23 +4819,28 @@ msgstr "Rövid cím:" msgid "Shoulder Buttons" msgstr "Oldalsó gombok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Konzol &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Napló &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Állapotsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Eszközsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Alap" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Meghajtók mutatása" @@ -4788,11 +4852,11 @@ msgstr "EFB másolat régiók megjelenítése" msgid "Show FPS" msgstr "FPS kijelzése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Franciaország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "GameCube mutatása" @@ -4800,35 +4864,35 @@ msgstr "GameCube mutatása" msgid "Show Input Display" msgstr "Bemeneti kijelző megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Olaszország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "JAP mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Korea mutatása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "A játék nyelve:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Napló &beállítások megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "PAL mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Platformok mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Régiók mutatása" @@ -4836,27 +4900,27 @@ msgstr "Régiók mutatása" msgid "Show Statistics" msgstr "Statisztikák megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Tajvan mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "USA mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Wad mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Wii mutatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "A játék leállítása előtt megjelenik egy megerősítő ablak." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4874,7 +4938,7 @@ msgstr "Az első blokk megjelenítése" msgid "Show lag counter" msgstr "Késési idő számláló megjelenítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4912,7 +4976,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Ismeretlen mutatása" @@ -4930,7 +4994,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" @@ -4938,11 +5002,11 @@ msgstr "Egyszerűsített kínai" msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "DCBZ törlés kihagyása" @@ -4966,17 +5030,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "B hely" @@ -4984,7 +5048,7 @@ msgstr "B hely" msgid "Snapshot" msgstr "Pillanatkép" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Szoftveres képalkotó" @@ -5001,7 +5065,7 @@ msgstr "" "Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, " "válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Hang beállítások" @@ -5019,9 +5083,9 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spanyol" @@ -5049,37 +5113,29 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "A lemez adatátviteli arány gyorsítása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Négyzetes kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Normál irányító" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Indítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "&NetPlay indítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Felvétel in&dítása" @@ -5095,7 +5151,7 @@ msgstr "Állap." msgid "State Saves" msgstr "Állás mentések" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Kormánykerék" @@ -5104,7 +5160,7 @@ msgid "Stick" msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Leállítás" @@ -5136,16 +5192,16 @@ msgstr "Strum" msgid "Subtract" msgstr "Kivonás" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Fájl sikeresen exportálva a(z) %s helyre" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Mentés fájlok sikeresen importálva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5153,11 +5209,11 @@ msgstr "" msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "VGA szál szinkronizálása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5166,8 +5222,8 @@ msgstr "" "véletlenszerű kifagyásokat kétmagos mód esetén. (BE = Kompatibilis, KI = " "Gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Rendszer nyelv:" @@ -5196,13 +5252,13 @@ msgstr "Tábla balra" msgid "Table Right" msgstr "Tábla jobbra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Pillanatkép készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5222,7 +5278,7 @@ msgstr "Textúra gyorsítótár" msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "A WAD sikeresen telepítve" @@ -5234,13 +5290,13 @@ msgstr "A cím érvénytelen" msgid "The checksum was successfully fixed" msgstr "Az ellenőrző összeg sikeresen javítva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "A választott könyvtár már szerepel a listán" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5296,7 +5352,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "A másolni kívánt mentés érvénytelen méretű" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5304,23 +5360,23 @@ msgstr "" "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a " "rendszer alapértelmezettre." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "A szerver és kliens NetPlay verziói nem kompatibilisek!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "A szerver megtelt!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "A szerver válasza: a játék már fut!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "A szerver ismeretlen hibaüzenetet küldött!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "A megadott \"%s\" fájl nem létezik" @@ -5329,11 +5385,11 @@ msgstr "A megadott \"%s\" fájl nem létezik" msgid "The value is invalid" msgstr "Az érték érvénytelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Kinézet:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5341,7 +5397,7 @@ msgstr "" "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " "befejezetlen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5357,7 +5413,7 @@ msgstr "" "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " "magát az Action Replay-t." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." @@ -5382,7 +5438,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5395,7 +5451,7 @@ msgstr "" "használatával (javíthatja a hang kattogást, de ugyanakkor folyamatos zajt is " "okozhat játékfüggően). " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5449,7 +5505,7 @@ msgstr "EFB másolatok" msgid "Toggle Fog" msgstr "Minden napló típus kijelölése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" @@ -5459,11 +5515,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Hagyományos kínai" @@ -5487,7 +5543,7 @@ msgstr "" "Olvasási próbálkozás az érvénytelen SYSCONF fájlból\n" "Nem találhatóak Wiimote bt azonosítók " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Török" @@ -5540,7 +5596,7 @@ msgstr "" "történő elemzése nem lehetséges. Győződj meg róla, hogy helyesen írtad be.\n" "Szeretnéd átugrani ezt a sort és folytatni az elemzést?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Meghatározatlan %i" @@ -5577,12 +5633,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Ismeretlen bejegyzés típus %i a SYSCONF fájlban (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5603,7 +5659,7 @@ msgstr "Frissítés" msgid "Upright Wiimote" msgstr "Előre tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" @@ -5615,7 +5671,7 @@ msgstr "Teljes nézet használata" msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Hibakezelők használata" @@ -5640,6 +5696,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5663,7 +5728,7 @@ msgstr "Kellékek" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU sebesség növelő hack" @@ -5688,7 +5753,7 @@ msgstr "Verbosity" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Kép" @@ -5696,17 +5761,17 @@ msgstr "Kép" msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Hangerő" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "WAD telepítési hiba: hiba a cimke létrehozásakor" @@ -5740,7 +5805,7 @@ msgstr "Figyelem - ELF indítása nem megfelelő konzol módban!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Figyelem - ISO indítása nem megfelelő konzol módban!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5764,7 +5829,7 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévőkkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5776,7 +5841,7 @@ msgstr "" "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5788,7 +5853,7 @@ msgstr "" "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. Ellenkező " "esetben szinkronizációs hibák jelentkezhetnek." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5839,23 +5904,19 @@ msgstr "Szélesvásznú hack" msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Wii mentés importálása" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5864,7 +5925,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Fájlból olvasás nem sikerült" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5873,7 +5934,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5881,7 +5942,7 @@ msgstr "Wiimote csatlakoztatva" msgid "Wiimote Motor" msgstr "Wiimote motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wiimote beállítások" @@ -5905,14 +5966,14 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Folyamatban..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5979,7 +6040,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nem zárhatod be a lapokat tartalmazó táblákat." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Választanod kell egy játékot!" @@ -5996,7 +6057,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." @@ -6011,7 +6072,7 @@ msgstr "" "Le kívánod állítani a probléma javítást most?\n" "Ha a választásod \"Nem\", akkor a hang torz lehet." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6030,7 +6091,7 @@ msgstr "" "0x%04x méretűnek kellene lennie (azonban 0x%04llx méretű)\n" "Akarsz újat létrehozni?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -6097,7 +6158,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "betöltő program (.img)" @@ -6110,7 +6171,17 @@ msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -6141,9 +6212,28 @@ msgstr "| VAGY" #~ "\n" #~ "Ha bizonytalan vagy, hagyd kijelöletlenül." +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Irányítók beállítása nem sikerült. A játékos kilépett vagy a játék épp " +#~ "fut!\n" +#~ "(irányítók beállítása még nem támogatott miközben a játék fut)" + #~ msgid "Enable Hotkeys" #~ msgstr "Gyorsbillentyűk használata" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Csak " +#~ "OpenAl feldolgozó esetén. Működéshez szükség lehet a soft_oal.dll " +#~ "átnevezésére OpenAL32.dll névre." + +#~ msgid "Export failed, try again?" +#~ msgstr "Exportálás sikertelen. Újra megpróbálod?" + #~ msgid "Failed to Listen!!" #~ msgstr "Meghallgatás sikertelen!" @@ -6168,12 +6258,21 @@ msgstr "| VAGY" #~ "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = " #~ "kompatibilis, KI = gyors)" +#~ msgid "Import failed, try again?" +#~ msgstr "Importálás sikertelen, megpróbálod újra?" + +#~ msgid "In-Game" +#~ msgstr "Elindul" + #~ msgid "Last Overwritten State" #~ msgstr "Az utolsó felülírt mentés" #~ msgid "Last Saved State" #~ msgstr "Utolsó mentett állás" +#~ msgid "Local" +#~ msgstr "Helyi" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Wiimote újracsatlakoztatása állás betöltéskor" @@ -6195,3 +6294,6 @@ msgstr "| VAGY" #~ "komoly hibákat okozhat.\n" #~ "\n" #~ "Ha bizonytalan vagy, hagyd kijelöletlenül." + +#~ msgid "Wii Save Import" +#~ msgstr "Wii mentés importálása" diff --git a/Languages/po/it.po b/Languages/po/it.po index afde69e1b1..aa9c9dbade 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-16 08:31+0000\n" "Last-Translator: Mewster \n" "Language-Team: Italian (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr " (troppi per la visualizzazione)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " Gioco : " @@ -43,7 +43,7 @@ msgstr "" "\"%s\" non esiste.\n" " Creare una nuova Memory Card da 16MB?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è un ISO GC/Wii." @@ -68,8 +68,8 @@ msgstr "%d stadi" msgid "%d samples (quality level %d)" msgstr "%d stadi (livello di qualità %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s esiste già, vuoi sovrascrivere?" @@ -108,12 +108,17 @@ msgstr "" "Il file non è abbastanza largo per essere un valido file memory card (0x%x " "bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "Fallito il tentativo di aprire %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "Fallito il tentativo di aprire %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "Il file %s possiede una dimensione di 0 bytes" @@ -123,7 +128,7 @@ msgstr "Il file %s possiede una dimensione di 0 bytes" msgid "%s is already compressed! Cannot compress it further." msgstr "%s è già compresso! Impossibile comprimere ulteriormente." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s è un nome troppo lungo per il file; massimo 45 caratteri" @@ -152,7 +157,7 @@ msgstr "%u Blocchi Liberi; %u Voci Directory Libere" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&A proposito di..." @@ -160,7 +165,7 @@ msgstr "&A proposito di..." msgid "&Boot from DVD Drive..." msgstr "Avvia da &Unità DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Punti di interruzione" @@ -168,7 +173,7 @@ msgstr "&Punti di interruzione" msgid "&Browse for ISOs..." msgstr "&Sfoglia ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Gestore &Trucchi" @@ -192,11 +197,11 @@ msgstr "&Emulazione" msgid "&File" msgstr "&File" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Schermo Intero" @@ -204,7 +209,7 @@ msgstr "&Schermo Intero" msgid "&Graphics Settings" msgstr "Impostazioni &Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Aiuto" @@ -212,7 +217,7 @@ msgstr "&Aiuto" msgid "&Hotkey Settings" msgstr "Impostazioni &Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -224,11 +229,11 @@ msgstr "&Carica Stato di Gioco" msgid "&Memcard Manager (GC)" msgstr "Gestore &Memory Card (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Apri..." @@ -236,11 +241,11 @@ msgstr "&Apri..." msgid "&Options" msgstr "&Opzioni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Gioca" @@ -248,39 +253,39 @@ msgstr "&Gioca" msgid "&Properties" msgstr "&Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "Modalità in &Sola-lettura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Resetta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Suono" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Arresta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Strumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Visualizza" @@ -369,7 +374,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -377,7 +382,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -385,8 +390,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Una finestra di NetPlay risulta già aperta!!" @@ -413,8 +418,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -439,13 +442,13 @@ msgstr "" "\n" "E' necessario inoltrare la porta TCP all'host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "Baseboard AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Codici AR" @@ -579,11 +582,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Aggiungi Codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -591,9 +594,9 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Aggiungi..." @@ -649,36 +652,36 @@ msgstr "" msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tutti i file immagine GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tutti i Salvataggi di Stati di Gioco (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file GC/Wii ISO compressi (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" @@ -706,7 +709,7 @@ msgstr "L'apploader possiede dimensioni errate... è davvero un apploader?" msgid "Apploader unable to load from file" msgstr "L'Apploader non riesce a caricare dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -724,7 +727,7 @@ msgstr "" "\n" "Nel dubbio, seleziona (nessuno)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabo" @@ -733,7 +736,7 @@ msgstr "Arabo" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sei sicuro di voler eliminare \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -741,16 +744,16 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (sperimentale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Rapporto d'Aspetto:" @@ -759,12 +762,12 @@ msgstr "Rapporto d'Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Motore Audio:" @@ -772,7 +775,7 @@ msgstr "Motore Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Errore nell'apertura della periferica AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -812,7 +815,7 @@ msgstr "Registro BP" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Impostazioni Motore" @@ -830,7 +833,7 @@ msgstr "Input in Background" msgid "Backward" msgstr "all'Indietro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "File Header corrotto" @@ -843,11 +846,11 @@ msgstr "" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Dettagli Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Banner:" @@ -859,7 +862,7 @@ msgstr "Leva" msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -888,7 +891,7 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Sotto" @@ -897,11 +900,11 @@ msgstr "Sotto" msgid "Bound Controls: %lu" msgstr "Controlli Associati: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Corrotto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Sfoglia" @@ -909,15 +912,15 @@ msgstr "Sfoglia" msgid "Browse for a directory to add" msgstr "Cerca una directory da aggiungere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Seleziona una directory per le ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Seleziona la directory di destinazione" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -927,7 +930,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Pulsanti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -951,7 +954,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" @@ -975,7 +978,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Impossibile trovare il WiiMote sull'handler di connessione %02x" @@ -990,9 +993,9 @@ msgstr "Impossibile leggere da DVD_Plugin - DVD-Interface: Errore Fatale" msgid "Cancel" msgstr "Annulla" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Impossibile aprire %s" @@ -1001,7 +1004,7 @@ msgstr "Impossibile aprire %s" msgid "Cannot unregister events with events pending" msgstr "Impossibile annullare con eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1012,7 +1015,7 @@ msgstr "" "%s\n" "non è un file memory card per gamecube valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1024,7 +1027,7 @@ msgstr "" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalano" @@ -1032,11 +1035,11 @@ msgstr "Catalano" msgid "Center" msgstr "Area Centrale" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Cambia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Cambia &Disco..." @@ -1044,11 +1047,11 @@ msgstr "Cambia &Disco..." msgid "Change Disc" msgstr "Cambia Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Cambia Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1064,13 +1067,13 @@ msgstr "Cambia segno al Parametro zFar (dopo la correzione)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia segno al Parametro zNear (dopo la correzione)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "La modifica di quest'opzione non avrà alcun effetto finché l'emulatore è in " "esecuzione!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1086,39 +1089,39 @@ msgstr "Cerca Trucco" msgid "Cheats Manager" msgstr "Gestore Trucchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Verifica l'Integrità della Partizione" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Sto verificando l'integrità..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Imposta la directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Imposta la directory principale della NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1126,7 +1129,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una memory card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1134,8 +1137,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale solo per i dischi " "costituiti da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Scegli la cartella in cui estrarre" @@ -1154,7 +1157,7 @@ msgstr "Classic Controller" msgid "Clear" msgstr "Pulisci" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1164,7 +1167,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Chiudi" @@ -1189,7 +1192,7 @@ msgstr "Comando" msgid "Comment" msgstr "Note" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Note:" @@ -1201,12 +1204,12 @@ msgstr "Comprimi ISO..." msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Compressione ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Configurazione" @@ -1220,22 +1223,22 @@ msgstr "Configura" msgid "Configure Control" msgstr "Configura Controllo" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Configura i Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Arresto su Conferma" @@ -1244,17 +1247,17 @@ msgstr "Arresto su Conferma" msgid "Connect" msgstr "Collega" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Collega Tastiera USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Collega Wiimote %i" @@ -1275,7 +1278,7 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Connessione in corso..." @@ -1295,7 +1298,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Converti in GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Copia non riuscita" @@ -1304,7 +1307,7 @@ msgstr "Copia non riuscita" msgid "Copy to Memcard %c" msgstr "Copia nella Memory Card %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Core" @@ -1318,7 +1321,7 @@ msgstr "Impossibile creare %s" msgid "Could not initialize backend %s." msgstr "Impossibile inizializzare il motore %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1329,26 +1332,16 @@ msgstr "" "backup GC/Wii. Tieni presente che la maggior parte delle unità DVD nei PC " "non riesce a leggere i dischi originali GameCube/Wii." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Impossibile riconoscere il file ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Impossibile salvare %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Impossibile impostare i pad. Il giocatore è uscito oppure il gioco è " -"attualmente in esecuzione!\n" -"(l'impostazione dei pads durante l'esecuzione del gioco è una funzione al " -"momento non supportata)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1370,11 +1363,11 @@ msgstr "" "Se è così, allora potresti dover reimpostare la posizione della memory card " "nelle opzioni." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1387,7 +1380,7 @@ msgstr "" msgid "Count:" msgstr "Conteggio:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Paese:" @@ -1427,12 +1420,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Directory attuale cambiata da %s a %s dopo wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Projection Hack Personalizzato" @@ -1440,11 +1433,11 @@ msgstr "Projection Hack Personalizzato" msgid "Custom Projection Hack Settings" msgstr "Impostazioni Personalizzate Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Ceco" @@ -1456,36 +1449,37 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP su Thread Dedicato" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP su Thread Dedicato" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD Root:" @@ -1497,7 +1491,7 @@ msgstr "DVDLowRead - Errore Fatale: fallita lettura dal volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Errore Fatale: fallita lettura dal volume" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1505,7 +1499,7 @@ msgstr "" msgid "Data Size" msgstr "Dimensione Dati" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Data:" @@ -1542,8 +1536,8 @@ msgstr "Decomprimi ISO..." msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Decompressione ISO" @@ -1556,7 +1550,7 @@ msgstr "Aggiorna l'elenco dei giochi" msgid "Default" msgstr "Default" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "ISO Predefinita:" @@ -1600,8 +1594,8 @@ msgstr "" msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1613,7 +1607,7 @@ msgstr "Manopola" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1681,7 +1675,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disco" @@ -1708,24 +1702,60 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Decoder Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin - Configurazione Video %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Sito &Web Dolphin" @@ -1741,12 +1771,12 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controller GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1754,7 +1784,7 @@ msgstr "Filmati TAS Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin - Configurazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin in &Google Code" @@ -1773,12 +1803,12 @@ msgstr "" "Dolphin è attualmente impostato per nascondere tutti i giochi. Doppioclicca " "qui per mostrare tutti i giochi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin è impossibilitato a completare l'azione richiesta." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1805,11 +1835,11 @@ msgstr "Scaricati codici %lu. (%lu aggiunti)" msgid "Drums" msgstr "Percussioni/Batteria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Fittizio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Salva l'Audio" @@ -1855,9 +1885,9 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Olandese" @@ -1890,7 +1920,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Aggiornamenti di Memoria Preliminari" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Modifica" @@ -1902,16 +1932,20 @@ msgstr "Modifica Codice ActionReplay" msgid "Edit Config" msgstr "Modifica Configurazione" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Modifica Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Modifica..." @@ -1923,7 +1957,7 @@ msgstr "Effetto" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Thread dell'Emulatore già in esecuzione" @@ -1962,7 +1996,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Stato dell'Emulazione: " @@ -1990,11 +2024,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Abilita Logging AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Abilita Calcolo delle Bounding Box" @@ -2002,27 +2036,27 @@ msgstr "Abilita Calcolo delle Bounding Box" msgid "Enable Cache" msgstr "Abilita Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Abilita Trucchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Abilita Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Abilita Dual Core (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Abilita Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Abilita Idle Skipping (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Abilita MMU" @@ -2030,7 +2064,7 @@ msgstr "Abilita MMU" msgid "Enable Progressive Scan" msgstr "Abilita Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Abilita Screen Saver" @@ -2038,7 +2072,7 @@ msgstr "Abilita Screen Saver" msgid "Enable Speaker Data" msgstr "Abilita Dati Altoparlante" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Abilita WideScreen" @@ -2061,7 +2095,7 @@ msgstr "" "\n" "Nel dubbio, seleziona 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2098,7 +2132,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2106,11 +2140,11 @@ msgstr "" "Se attivato, velocizza The Legend of Zelda: Twilight Princess. Da " "disattivare per qualsiasi altro gioco." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Abilita Projection Hack Personalizzato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2118,22 +2152,13 @@ msgstr "" "Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Non " "disponibile su OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Solo " "con motore OpenAL." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Solo " -"con motore OpenAL. Potrebbe essere necessario rinominare soft_oal.dll in " -"OpenAL32.dll perché funzioni." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2146,7 +2171,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2168,9 +2193,9 @@ msgstr "" msgid "End" msgstr "Fine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglese" @@ -2199,11 +2224,11 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Errore/i" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore nel caricamento della lingua selezionata. Ritorno alla lingua di " @@ -2236,7 +2261,6 @@ msgid "Euphoria" msgstr "Euforia" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2247,16 +2271,21 @@ msgstr "" msgid "Execute" msgstr "Esegui" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Esporta tutti i salvataggi" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Esportazione non Riuscita" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Esporta File" @@ -2264,7 +2293,7 @@ msgstr "Esporta File" msgid "Export Recording" msgstr "Esporta Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Esporta Registrazione..." @@ -2280,9 +2309,10 @@ msgstr "Esporta salvataggio Wii (Sperimentale)" msgid "Export all saves" msgstr "Esporta tutti i salvataggi" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Esportazione non riuscita, riprovare?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Esportazione non Riuscita" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2304,44 +2334,44 @@ msgstr "Parametro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Il Parametro Extra è utile solo in ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Estrai Tutti i File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Estrai Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Estrai DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Estrai Directory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Estrai File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Estrazione..." @@ -2357,11 +2387,11 @@ msgstr "Lettore FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Dimensione FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Connessione non riuscita!" @@ -2369,7 +2399,7 @@ msgstr "Connessione non riuscita!" msgid "Failed to download codes." msgstr "Download dei codici non riuscito." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2411,16 +2441,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Fallita lettura di %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Accesso a banner.bin non riuscito" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Fallita lettura dell'header bk" @@ -2451,12 +2481,12 @@ msgstr "" "Fallita lettura della tabella di allocazione blocchi\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Fallita la lettura del file %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Fallita lettura dei dati dal file: %s" @@ -2477,7 +2507,7 @@ msgstr "" "Accesso alla directory non riuscito\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Fallita lettura dell'header" @@ -2489,29 +2519,34 @@ msgstr "" "Fallita lettura dell'header\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Fallita la scrittura dell'intestazione del file %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Lettura dell'ID univoco dall'immagine del disco non riuscita" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Scrittura di BT.DINF su SYSCONF non riuscita" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Scrittura bkhdr non riuscita" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Fallita lettura dei dati dal file: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Fallita la scrittura dell'intestazione di %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Fallita la scrittura dell'intestazione del file %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Farsi" @@ -2523,11 +2558,11 @@ msgstr "Rapida" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione velocizzata della MMU. Non funziona per tutti i giochi." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2535,7 +2570,7 @@ msgstr "" "Desincronizzazione fatale. Interruzione della riproduzione. (Errore in " "PlayWiimote: %u != %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Lettore Fifo" @@ -2576,16 +2611,16 @@ msgstr "Il file non è riconosciuto come una memory card" msgid "File not compressed" msgstr "File non compresso" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modalità di apertura sconosciuta : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" @@ -2613,7 +2648,7 @@ msgstr "Forza 16:9" msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Forza Console a NTSC-J" @@ -2647,7 +2682,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2670,7 +2705,7 @@ msgstr "" msgid "Forward" msgstr "in Avanti" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2679,6 +2714,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Trovati %d risultati per '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Impossibile salvare %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2708,7 +2748,7 @@ msgstr "Intervallo Fotogramma" msgid "Frame S&kipping" msgstr "Salta &Fotogrammi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Framelimiter:" @@ -2720,9 +2760,9 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francese" @@ -2735,7 +2775,7 @@ msgstr "Tasti" msgid "From" msgstr "Da" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Schermo Intero" @@ -2747,7 +2787,7 @@ msgstr "Risoluzione a Schermo Intero" msgid "GCI File(*.gci)" msgstr "File GCI(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "Pad GC" @@ -2755,27 +2795,27 @@ msgstr "Pad GC" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID Gioco:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Il Gioco è già in esecuzione!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Il Gioco non è in esecuzione!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Gioco non trovato!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Impostazioni Specifiche del Gioco" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Configurazione di Gioco" @@ -2783,7 +2823,7 @@ msgstr "Configurazione di Gioco" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "File Salvataggio GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "GameCube" @@ -2792,16 +2832,16 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Impostazioni Controlli GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Codici Gecko" @@ -2819,7 +2859,7 @@ msgstr "" "cartella Sys e riavviando Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Generale" @@ -2828,9 +2868,9 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Generali" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Tedesco" @@ -2841,11 +2881,11 @@ msgstr "" "GetARCode: Indice troppo grande rispetto alla dimensione dell'elenco dei " "codici AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Impostazioni Grafiche" @@ -2872,7 +2912,7 @@ msgstr "" "\n" "Nel dubbio, lascia selezionato." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Greco" @@ -2900,7 +2940,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Ebreaico" @@ -2912,7 +2952,7 @@ msgstr "Altezza" msgid "Help" msgstr "Aiuto" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2933,7 +2973,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2973,7 +3013,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2982,11 +3022,11 @@ msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Ungherese" @@ -2994,14 +3034,14 @@ msgstr "Ungherese" msgid "Hybrid Wiimote" msgstr "Wiimote Ibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Tentativo di ottenere dati da un ticket sconosciuto: %08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -3014,11 +3054,11 @@ msgstr "" "TitleID %016llx.\n" "Ora Dolphin probabilmente si bloccherà." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destinazione invalida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Impostazioni IPL" @@ -3034,11 +3074,11 @@ msgstr "Puntatore a infrarossi (IR)" msgid "IR Sensitivity:" msgstr "Sensibilità IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Directory ISO" @@ -3050,7 +3090,7 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3095,9 +3135,15 @@ msgstr "" msgid "Import Save" msgstr "Importa Salvataggio" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importazione non riuscita, riprovare?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importa Salvataggio" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Esportazione non Riuscita" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3119,21 +3165,17 @@ msgstr "" "Il file importato ha estensione .sav\n" "ma non ha un'intestazione corretta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "In Game" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "In-Game" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Framelimiter:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3153,7 +3195,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci qui il codice Criptato o Decriptato..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3161,7 +3203,7 @@ msgstr "Inserisci SD Card" msgid "Insert name here.." msgstr "Inserire qui il nome..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Installa WAD" @@ -3169,30 +3211,31 @@ msgstr "Installa WAD" msgid "Install to Wii Menu" msgstr "Installa nel Menu Wii" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "Chiamata di InstallExceptionHandler avvenuta, tuttavia questa piattaforma " "non la supporta ancora." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Errore di Controllo d'Integrità" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Controllo d'integrità completato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Controllo d'integrità completato. Non sono stati trovati errori." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3201,11 +3244,11 @@ msgstr "" "Fallito il controllo d'integrità per la partizione %d. Il tuo dump è " "probabilmente corrotto o è stata applicata scorrettamente una patch." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" @@ -3230,15 +3273,15 @@ msgstr "Errore Interno LZO - lzo_init() fallito" msgid "Internal Resolution:" msgstr "Risoluzione Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interprete (MOLTO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Dimensione (%x) o Magic word (%x) non valida" @@ -3271,7 +3314,7 @@ msgstr "" "%s\n" "È possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "File di registrazione non valido" @@ -3289,13 +3332,13 @@ msgstr "" "Stringa di ricerca non valida (solo stringhe di lunghezza pari sono " "supportate)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Stato non valido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italiano" @@ -3303,16 +3346,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "Ricompilatore sperimentale JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Giapponese" @@ -3338,8 +3381,8 @@ msgstr "Finestra sempre in cima" msgid "Key" msgstr "Combinazione Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Coreano" @@ -3357,16 +3400,16 @@ msgstr "Pulsante L" msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Latenza:" @@ -3409,7 +3452,7 @@ msgstr "" msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Limita per FPS" @@ -3508,15 +3551,15 @@ msgstr "Carica Stato di Gioco da Slot 8" msgid "Load State Slot 9" msgstr "Carica Stato di Gioco da Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Carica Stato di Gioco..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Carica Menu di Sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3535,10 +3578,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carica valori preimpostati dai modelli hack disponibili." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Locale" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Log" @@ -3572,11 +3611,11 @@ msgid "Logger Outputs" msgstr "Destinazione Logger" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Registrazione Eventi" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Persa connessione al server!" @@ -3584,7 +3623,7 @@ msgstr "Persa connessione al server!" msgid "M Button" msgstr "Pulsante M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3593,7 +3632,7 @@ msgstr "" "L'MD5 non corrisponde\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" @@ -3607,11 +3646,11 @@ msgstr "File Gameshark MadCatz(*.gcs)" msgid "Main Stick" msgstr "Levetta Principale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID Produttore:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Produttore:" @@ -3648,7 +3687,7 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3660,7 +3699,7 @@ msgstr "" "Gestore Scheda di Memoria - AVVISO: Eseguire una copia di sicurezza prima " "dell'uso!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3687,7 +3726,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mic" @@ -3700,7 +3739,7 @@ msgstr "Min" msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3849,7 +3888,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3896,7 +3935,7 @@ msgstr "Nessun ISO o WAD trovati" msgid "No audio output" msgstr "Nessun output audio" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Nessun file banner trovato per il titolo %s" @@ -3922,7 +3961,7 @@ msgstr "Nessuna voce di directory libera" msgid "No recorded file" msgstr "Nessun file registrato" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" @@ -3931,11 +3970,11 @@ msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Nessuno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norvegese" @@ -3943,19 +3982,19 @@ msgstr "Norvegese" msgid "Not Equal" msgstr "Diverso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Non Impostato" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" "Non è un file di salvataggio Wii o fallita lettura a causa della dimensione " "%x dell'intestazione del file" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Non collegato" @@ -4001,7 +4040,7 @@ msgstr "Oggetto" msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Off" @@ -4009,16 +4048,20 @@ msgstr "Off" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Mostra Messaggi su Schermo" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Solo %d blocchi disponibili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Apri" @@ -4031,7 +4074,7 @@ msgstr "Apri &percorso file" msgid "Open Wii &save folder" msgstr "Apri cartella dei &salvataggi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Apri file..." @@ -4057,6 +4100,16 @@ msgstr "Decoder Texture OpenCL" msgid "OpenMP Texture Decoder" msgstr "Decoder Texture OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4084,7 +4137,7 @@ msgstr "" msgid "Other" msgstr "Altro" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4096,7 +4149,7 @@ msgstr "" msgid "Output" msgstr "Output" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "&Riproduci Registrazione..." @@ -4104,7 +4157,7 @@ msgstr "&Riproduci Registrazione..." msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Pad " @@ -4133,21 +4186,21 @@ msgstr "Parametri" msgid "Partition %i" msgstr "Partizione %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Percorsi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pausa" @@ -4160,7 +4213,7 @@ msgstr "Pausa al termine del filmato" msgid "Per-Pixel Lighting" msgstr "Illuminazione Per-Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfetto" @@ -4170,9 +4223,9 @@ msgid "Perspective %d" msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Gioca" @@ -4184,7 +4237,7 @@ msgstr "Riproduci Registrazione" msgid "Play/Pause" msgstr "Gioca/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Giocabile" @@ -4192,11 +4245,11 @@ msgstr "Giocabile" msgid "Playback Options" msgstr "Opzioni di Riproduzione" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Giocatori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4208,36 +4261,36 @@ msgstr "Si prega di creare un prospettiva prima di salvare" msgid "Plus-Minus" msgstr "Più-Meno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Porta 4:" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" @@ -4245,17 +4298,17 @@ msgstr "Portoghese (Brasiliano)" msgid "Post-Processing Effect:" msgstr "Effetto di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Termine prematuro del filmato in PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Termine prematuro del filmato in PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Termine prematuro del filmato in PlayWiimote. %u > %u" @@ -4288,7 +4341,7 @@ msgstr "Profilo" msgid "Properties" msgstr "Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Ripulisci Cache" @@ -4296,8 +4349,8 @@ msgstr "Ripulisci Cache" msgid "Question" msgstr "Conferma" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Esci" @@ -4358,6 +4411,11 @@ msgstr "Wiimote Reali" msgid "Record" msgstr "Registra" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Opzioni di Registrazione" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Info di Registrazione" @@ -4393,7 +4451,7 @@ msgstr "" "Nel dubbio, seleziona Nessuno." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Aggiorna" @@ -4402,14 +4460,14 @@ msgstr "Aggiorna" msgid "Refresh List" msgstr "Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Aggiorna l'elenco dei giochi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Rimuovi" @@ -4440,7 +4498,7 @@ msgstr "Risultati" msgid "Return" msgstr "Invio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4458,15 +4516,15 @@ msgstr "Levetta Destra" msgid "Rumble" msgstr "Vibrazione" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Avvia DSP HLE e LLE su un thread dedicato (non consigliato: potrebbe causare " "glitch al sonoro con HLE e bloccarsi con LLE)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russo" @@ -4479,7 +4537,7 @@ msgid "Safe" msgstr "Sicura" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Salva" @@ -4540,28 +4598,28 @@ msgstr "Salva Stato di Gioco nello Slot 8" msgid "Save State Slot 9" msgstr "Salva Stato di Gioco nello Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Salva Stato di Gioco..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressa" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." @@ -4583,7 +4641,7 @@ msgstr "Ricerca ISO" msgid "Scanning..." msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Screenshot" @@ -4599,7 +4657,7 @@ msgstr "Cerca" msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" @@ -4622,12 +4680,12 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Seleziona la Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4649,19 +4707,19 @@ msgstr "Seleziona un file di salvataggio da importare" msgid "Select floating windows" msgstr "Seleziona finestre libere/mobili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Seleziona il file da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4740,7 +4798,7 @@ msgstr "" "\n" "Nel dubbio, usa Direct3D 11." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Invia" @@ -4752,11 +4810,11 @@ msgstr "Posizione della Sensor Bar: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4779,7 +4837,7 @@ msgstr "" "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione " "dell'elenco dei codici AR %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4787,19 +4845,20 @@ msgstr "" "Imposta la latenza (in ms). Valori maggiori possono ridurre la scattosità " "dell'audio. Solo con motore OpenAL." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Impostazioni..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Impossible trovare il file di configurazione" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Scuoti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Nome breve:" @@ -4807,23 +4866,28 @@ msgstr "Nome breve:" msgid "Shoulder Buttons" msgstr "Tasti Dorsali" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Mostra &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Mostra Finestra di &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Mostra Barra di &Stato" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Mostra Barra degli St&rumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Default" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Mostra Unità a Disco" @@ -4835,11 +4899,11 @@ msgstr "Mostra le Regioni di Copia dell'EFB" msgid "Show FPS" msgstr "Mostra FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Mostra Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Mostra GameCube" @@ -4847,35 +4911,35 @@ msgstr "Mostra GameCube" msgid "Show Input Display" msgstr "Mostra Tasti di Input" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Mostra Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Mostra JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Mostra Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Mostra Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Mostra &Configurazione Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Mostra PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Mostra Piattaforme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Mostra Regioni" @@ -4883,27 +4947,27 @@ msgstr "Mostra Regioni" msgid "Show Statistics" msgstr "Mostra Informazioni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Mostra Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Mostra USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Mostra Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Mostra Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Mostra una messaggio di conferma prima di arrestare un gioco." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4922,7 +4986,7 @@ msgstr "Mostra primo blocco" msgid "Show lag counter" msgstr "Mostra contatore lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4960,7 +5024,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Mostra sconosciuto" @@ -4978,7 +5042,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Cinese Semplificato" @@ -4986,11 +5050,11 @@ msgstr "Cinese Semplificato" msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Salta BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Salta ripulitura DCBZ" @@ -5014,17 +5078,17 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Ingresso B" @@ -5032,7 +5096,7 @@ msgstr "Ingresso B" msgid "Snapshot" msgstr "Stamp" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Renderer Software" @@ -5048,7 +5112,7 @@ msgstr "" "È utile solamente ai fini di debugging.\n" "Vuoi davvero abilitare il rendering software? Nel dubbio, seleziona 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Impostazioni Audio" @@ -5066,9 +5130,9 @@ msgstr "Creazione del buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spagnolo" @@ -5096,37 +5160,29 @@ msgstr "" "\n" "Nel dubbio, seleziona 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Aumenta la velocità di trasferimento del Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Squadratura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Controller Standard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Avvia &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Avvia Re&gistrazione" @@ -5142,7 +5198,7 @@ msgstr "Stato" msgid "State Saves" msgstr "Stati di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Volante" @@ -5151,7 +5207,7 @@ msgid "Stick" msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Arresta" @@ -5182,16 +5238,16 @@ msgstr "Strimpellata" msgid "Subtract" msgstr "-" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Il file è stato esportato in %s con successo" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "I file di salvataggio sono stati importati con successo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5199,11 +5255,11 @@ msgstr "" msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Sincronizza thread GPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5211,8 +5267,8 @@ msgstr "" "Sincronizza i thread della GPU e della CPU per prevenire alcuni blocchi " "casuali in modalità Dual Core. (ON = Compatibilità, OFF = Velocità)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Lingua di Sistema:" @@ -5241,13 +5297,13 @@ msgstr "Semipiano sinistro" msgid "Table Right" msgstr "Semipiano destro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Cattura uno Screenshot" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongo)" @@ -5267,7 +5323,7 @@ msgstr "Cache Texture" msgid "Texture Format Overlay" msgstr "Overlay Formato Texture" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "Il WAD è stato installato con successo" @@ -5279,13 +5335,13 @@ msgstr "L'indirizzo non è valido" msgid "The checksum was successfully fixed" msgstr "Il checksum è stato corretto con successo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5341,7 +5397,7 @@ msgstr "" "Il file di salvataggio che si sta provando a copiare ha una dimensione non " "valida" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5349,23 +5405,23 @@ msgstr "" "La lingua selezionata non è supportata dal tuo sistema. Ritorno alla " "predefinita di sistema." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Le versioni di NetPlay del server e del client non sono compatibili!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Il server è pieno!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Il server ha risposto: il gioco è correntemente in esecuzione!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Il server invia un messaggio d'errore sconosciuto!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "il file specificato \"%s\" non esiste" @@ -5374,11 +5430,11 @@ msgstr "il file specificato \"%s\" non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Tema:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5386,7 +5442,7 @@ msgstr "" "Deve esistere un ticket per 00000001/00000002. Il dump della tua NAND è " "probabilmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5402,7 +5458,7 @@ msgid "" msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Ciò potrebbe causare rallentamenti all'interno del Menu Wii e in alcuni " @@ -5428,7 +5484,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5439,7 +5495,7 @@ msgstr "" "Imposta un limite ai frame disegnati ogni secondo diverso dal valore " "standard (NTSC:60, PAL:50)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5496,7 +5552,7 @@ msgstr "Copie EFB" msgid "Toggle Fog" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Visualizza a Schermo Intero" @@ -5506,11 +5562,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" @@ -5534,7 +5590,7 @@ msgstr "" "Tentativo di lettura da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turco" @@ -5587,7 +5643,7 @@ msgstr "" "%lu del codice AR inserito. Assicurati di averlo inserito correttamente.\n" "Vuoi ignorare questa riga e continuare l'analisi?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "%i non definito" @@ -5624,12 +5680,12 @@ msgstr "Comando 0x%08x sconosciuto" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Voce %i sconosciuta in SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Messaggio ricevuto sconosciuto avente id : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5650,7 +5706,7 @@ msgstr "Aggiorna" msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" @@ -5662,7 +5718,7 @@ msgstr "Usa Schermo Intero" msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" @@ -5687,6 +5743,15 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5710,7 +5775,7 @@ msgstr "Utilità" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "Hack Velocità MMU" @@ -5735,7 +5800,7 @@ msgstr "Verboso" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Video" @@ -5743,17 +5808,17 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Installazione WAD non riuscita: errore nella creazione di %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Fallita installazione del WAD: errore durante la creazione del ticket" @@ -5787,7 +5852,7 @@ msgstr "Attenzione - avvio ELF in modalità console errata!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Attenzione - avvio ISO in modalità console errata!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5813,7 +5878,7 @@ msgstr "" "dal nome uguale a quello dei file sulla tua memory card\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5825,7 +5890,7 @@ msgstr "" "salvataggio prima di continuare, o caricare questo stesso stato con modalità " "sola-lettura off." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5837,7 +5902,7 @@ msgstr "" "caricare questo stato in modalità sola-lettura off. Altrimenti probabilmente " "riscontrerai una desincronizzazione." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5888,23 +5953,19 @@ msgstr "Hack Widescreen" msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Root NAND Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importa Salvataggi Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "File di Salvataggio Wii (*.bin)|*.bin" @@ -5913,7 +5974,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Impossibile leggere dal file" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5922,7 +5983,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5930,7 +5991,7 @@ msgstr "Wiimote Collegato" msgid "Wiimote Motor" msgstr "Vibrazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Impostazioni Wiimote" @@ -5954,14 +6015,14 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Attività in corso..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -6027,7 +6088,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Non è possibile chiudere riquadri che hanno pagine al loro interno" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "È necessario selezionare un gioco!!" @@ -6043,7 +6104,7 @@ msgstr "È necessario inserire un valore decimale, esadecimale o ottale." msgid "You must enter a valid profile name." msgstr "Devi inserire un nome valido per il profilo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "È necessario riavviare Dolphin affinché le modifiche abbiano effetto." @@ -6057,7 +6118,7 @@ msgstr "" "Vuoi interrompere ora l'emulazione per correggere il problema?\n" "Se scegli \"No\", l'audio potrebbe essere disturbato." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6076,7 +6137,7 @@ msgstr "" "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n" "Desideri generarne uno nuovo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "Hack ZTP" @@ -6143,7 +6204,7 @@ msgstr "" "\n" "Nel dubbio, lascia deselezionato." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6156,7 +6217,17 @@ msgstr "iCacheJIT: Lettura Opcode da %x. Si prega di segnalarlo." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Messaggio ricevuto sconosciuto avente id : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -6191,9 +6262,29 @@ msgstr "| OR" #~ msgstr "" #~ "Impossibile trovare il WiiMote sul bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Impossibile impostare i pad. Il giocatore è uscito oppure il gioco è " +#~ "attualmente in esecuzione!\n" +#~ "(l'impostazione dei pads durante l'esecuzione del gioco è una funzione al " +#~ "momento non supportata)" + #~ msgid "Enable Hotkeys" #~ msgstr "Abilita Tasti di Scelta Rapida" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Solo " +#~ "con motore OpenAL. Potrebbe essere necessario rinominare soft_oal.dll in " +#~ "OpenAL32.dll perché funzioni." + +#~ msgid "Export failed, try again?" +#~ msgstr "Esportazione non riuscita, riprovare?" + #~ msgid "Failed to Listen!!" #~ msgstr "Fallita operazione di Ascolto!!" @@ -6218,12 +6309,21 @@ msgstr "| OR" #~ "Se il framerate risulta incoerente o incostante, questa opzione potrebbe " #~ "porvi rimedio. (ON = Compatibilità, OFF = Velocità)" +#~ msgid "Import failed, try again?" +#~ msgstr "Importazione non riuscita, riprovare?" + +#~ msgid "In-Game" +#~ msgstr "In-Game" + #~ msgid "Last Overwritten State" #~ msgstr "Ultimo Stato di Gioco Sovrascritto" #~ msgid "Last Saved State" #~ msgstr "Ultimo Stato di Gioco Salvato" +#~ msgid "Local" +#~ msgstr "Locale" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Riconnetti il Wiimote al Caricamento di uno Stato di Gioco" @@ -6245,3 +6345,6 @@ msgstr "| OR" #~ "potrebbe causare pesanti artefatti.\n" #~ "\n" #~ "Nel dubbio, lascia deselezionato." + +#~ msgid "Wii Save Import" +#~ msgstr "Importa Salvataggi Wii" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 5f7362c007..a8a4a22684 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-16 23:40+0000\n" "Last-Translator: DanbSky \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr "(該当数が多すぎます)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "タイトル:" @@ -43,7 +43,7 @@ msgstr "" "メモリーカードファイル \"%s\" は存在しません。\n" " 容量16MBで新たに作成しますか ?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" は無効なファイル、またはゲームキューブ/Wii のISOではありません" @@ -68,8 +68,8 @@ msgstr "%d x" msgid "%d samples (quality level %d)" msgstr "%d x (品質 %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s はすでに存在します。上書きしますか?" @@ -107,12 +107,17 @@ msgstr "" "このファイルのサイズは小さすぎます。正しいファイルではありません (0x%x バイ" "ト)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s を開くのに失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s を開くのに失敗" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s は0バイトのファイルです" @@ -122,7 +127,7 @@ msgstr "%s は0バイトのファイルです" msgid "%s is already compressed! Cannot compress it further." msgstr "%s は圧縮済みです!これ以上圧縮することはできません。" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s はファイル名が長すぎます、45文字までに収めてください" @@ -151,7 +156,7 @@ msgstr "%u ブロック空き | %u エントリ空き" msgid "&& AND" msgstr "&& (...と...)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "Dolphinについて(&A)" @@ -159,7 +164,7 @@ msgstr "Dolphinについて(&A)" msgid "&Boot from DVD Drive..." msgstr "DVDドライブから起動(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "ブレークポイント(&B)" @@ -167,7 +172,7 @@ msgstr "ブレークポイント(&B)" msgid "&Browse for ISOs..." msgstr "ISOファイルのあるフォルダを選択(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "チートコード編集ツール(&C)" @@ -191,11 +196,11 @@ msgstr "エミュレーション(&E)" msgid "&File" msgstr "ファイル(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "Frame Advance(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "全画面表示(&F)" @@ -203,7 +208,7 @@ msgstr "全画面表示(&F)" msgid "&Graphics Settings" msgstr "グラフィック設定(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "ヘルプ(&H)" @@ -211,7 +216,7 @@ msgstr "ヘルプ(&H)" msgid "&Hotkey Settings" msgstr "ホットキーのカスタマイズ(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -223,11 +228,11 @@ msgstr "ステートロード(&L)" msgid "&Memcard Manager (GC)" msgstr "GCメモリーカードマネージャ(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memory" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "開く(&O)" @@ -235,11 +240,11 @@ msgstr "開く(&O)" msgid "&Options" msgstr "設定(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "一時停止(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "開始(&P)" @@ -247,39 +252,39 @@ msgstr "開始(&P)" msgid "&Properties" msgstr "プロパティ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "読み込み専用 (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "ゲームリストを再更新(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "レジスタ(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "リセット(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "サウンド(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "停止(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "ツール(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "描画(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "表示(&V)" @@ -368,7 +373,7 @@ msgstr "コード名を入力してください" msgid "" msgstr "<対応できる解像度が見つかりません>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "なし" @@ -376,7 +381,7 @@ msgstr "なし" msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<システムの言語>" @@ -384,8 +389,8 @@ msgstr "<システムの言語>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "ネットプレイウィンドウはすでに開かれています!" @@ -412,8 +417,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -436,13 +439,13 @@ msgstr "" "\n" "TCPポートの開放を忘れずに!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "Triforce基板" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "アクションリプレイコード" @@ -573,11 +576,11 @@ msgstr "ビデオカード:" msgid "Add" msgstr "追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "パッチを追加" @@ -585,9 +588,9 @@ msgstr "パッチを追加" msgid "Add new pane" msgstr "Add new pane" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "追加" @@ -637,36 +640,36 @@ msgstr "ボタンが反応する感度を調整します" msgid "Advanced" msgstr "高度な設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "高度な設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "全ての GC/Wii ファイル (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "全ての GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "全てのステートセーブファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮されたGC/Wii ISOファイル (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "全てのファイル (*.*)|*.*" @@ -695,7 +698,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルから読み込むことができません" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader" @@ -713,7 +716,7 @@ msgstr "" "\n" "よく分からなければ、【オフ】を選択してください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "アラビア語" @@ -722,7 +725,7 @@ msgstr "アラビア語" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" このプロファイルを削除しますか?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -730,15 +733,15 @@ msgstr "" "これら複数のタイトルの実体ファイルを削除しますか?\n" "元に戻すことはできません!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "このタイトルの実体ファイルを削除しますか?元に戻すことはできません!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "アスペクト比:" @@ -747,12 +750,12 @@ msgstr "アスペクト比:" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" @@ -760,7 +763,7 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "自動" @@ -799,7 +802,7 @@ msgstr "BP register " msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "出力設定" @@ -817,7 +820,7 @@ msgstr "バックグラウンド入力を許可" msgid "Backward" msgstr "後方" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "ファイルヘッダの不良" @@ -830,11 +833,11 @@ msgstr "" msgid "Banner" msgstr "バナー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "バナーの詳細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "バナー表示" @@ -846,7 +849,7 @@ msgstr "バー" msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "基本設定" @@ -875,7 +878,7 @@ msgid "Blue Right" msgstr "青 - 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "下部" @@ -884,11 +887,11 @@ msgstr "下部" msgid "Bound Controls: %lu" msgstr "コマンド数: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "ダメダメ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "選択" @@ -896,15 +899,15 @@ msgstr "選択" msgid "Browse for a directory to add" msgstr "ゲームリストに追加するフォルダを選択してください" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "ISOのあるフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "出力先を選択" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "バッファ:" @@ -914,7 +917,7 @@ msgstr "バッファ:" msgid "Buttons" msgstr "ボタン" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -939,7 +942,7 @@ msgstr "C-スティック" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方式" @@ -961,7 +964,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Can't find WiiMote by connection handle %02x" @@ -976,9 +979,9 @@ msgstr "Can't read from DVD_Plugin - DVD-Interface: Fatal Error" msgid "Cancel" msgstr "キャンセル" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "%s を開くことができません" @@ -987,7 +990,7 @@ msgstr "%s を開くことができません" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -998,7 +1001,7 @@ msgstr "" "%s\n" "これは不正なメモリーカードデータです" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1010,7 +1013,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "カタルーニャ語" @@ -1018,11 +1021,11 @@ msgstr "カタルーニャ語" msgid "Center" msgstr "Center" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "変更" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "ディスクの入れ替え(&D)" @@ -1030,11 +1033,11 @@ msgstr "ディスクの入れ替え(&D)" msgid "Change Disc" msgstr "ディスクの入れ替え" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "ゲームを変更" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1050,11 +1053,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "この設定は次回のゲーム開始時に反映されます!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "チャット欄" @@ -1070,39 +1073,39 @@ msgstr "コードサーチ" msgid "Cheats Manager" msgstr "チートコード編集ツール" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "パーティションの整合性をチェック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "チェックしています..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "繁体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダを選択してください" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "NANDのあるルートフォルダを選択してください" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "ディスクチャンネルに表示するタイトルを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "追加したいフォルダを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "メモリーカードを選択" @@ -1110,7 +1113,7 @@ msgstr "メモリーカードを選択" msgid "Choose a memory card:" msgstr "メモリーカードを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1118,8 +1121,8 @@ msgstr "" "apploaderとして使用するファイルを選択:(フォルダからのみ構築されたディスクに" "適用されます)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "保存先のフォルダを選択してください" @@ -1138,7 +1141,7 @@ msgstr "クラシックコントローラ" msgid "Clear" msgstr "全消去" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1148,7 +1151,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "閉じる" @@ -1173,7 +1176,7 @@ msgstr "Command" msgid "Comment" msgstr "コメント" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "ゲーム紹介" @@ -1185,12 +1188,12 @@ msgstr "このタイトルを圧縮" msgid "Compress selected ISOs..." msgstr "選択したISOファイルを全て圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "圧縮しています..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "本体設定" @@ -1204,22 +1207,22 @@ msgstr "設定" msgid "Configure Control" msgstr "コントロールの設定" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "パッド設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Dolphin本体の設定を行います" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "ファイルの上書きを確認" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "動作停止時に確認" @@ -1228,17 +1231,17 @@ msgstr "動作停止時に確認" msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "USBキーボードの接続をエミュレート" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "USBキーボードの接続をエミュレート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "%iPのWii リモコンを接続" @@ -1259,7 +1262,7 @@ msgstr "3PのWii リモコンを接続" msgid "Connect Wiimote 4" msgstr "4PのWii リモコンを接続" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "接続中..." @@ -1279,7 +1282,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "GCIファイルに変換" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "コピーに失敗" @@ -1288,7 +1291,7 @@ msgstr "コピーに失敗" msgid "Copy to Memcard %c" msgstr "メモリーカード%cにコピー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "コア" @@ -1302,7 +1305,7 @@ msgstr "%s を作成することができませんでした" msgid "Could not initialize backend %s." msgstr "Could not initialize backend %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1313,24 +1316,16 @@ msgstr "" "プディスクではありません。オリジナルのGC/Wii のディスクはほとんどのPC用DVDド" "ライブでは読み込めない点に留意してください" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "ISOファイル %s を認識できませんでした" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "%s をセーブできませんでした" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"現在パッド設定を行えません。 プレーヤーが残っているかゲームが起動中です!\n" -"(ゲーム中の設定変更は現在サポートされていません)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1351,11 +1346,11 @@ msgstr "" "メモリーカードファイルをデフォルトの場所から移動した場合は、本体設定よりその" "場所を再指定してください" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "拡張子'ini'に対して関連付けられているプログラムが見つかりません!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1368,7 +1363,7 @@ msgstr "" msgid "Count:" msgstr "該当:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "発売国" @@ -1409,12 +1404,12 @@ msgstr "" msgid "Crossfade" msgstr "クロスフェーダー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Current directory changed from %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1422,11 +1417,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Custom Projection Hackの設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "設定画面に入ります" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "チェコ語" @@ -1438,36 +1433,37 @@ msgstr "D" msgid "D-Pad" msgstr "十字キー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方式" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP on Dedicated Thread" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "サウンドに関する設定を行います" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP on Dedicated Thread" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVDルート" @@ -1479,7 +1475,7 @@ msgstr "DVDLowRead - Fatal Error: failed to read from volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1487,7 +1483,7 @@ msgstr "" msgid "Data Size" msgstr "データサイズ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "発売日" @@ -1524,8 +1520,8 @@ msgstr "ISOファイルへ復元" msgid "Decompress selected ISOs..." msgstr "選択したファイルを全てISOファイルへ復元" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "復元中..." @@ -1538,7 +1534,7 @@ msgstr "ゲームリストを再更新します" msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "デフォルトISO" @@ -1582,8 +1578,8 @@ msgstr "" msgid "Device" msgstr "デバイス" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "デバイス設定" @@ -1595,7 +1591,7 @@ msgstr "ダイアル" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1662,7 +1658,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "ディスク" @@ -1689,24 +1685,60 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "動作中のゲームを停止しますか?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II decoder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s グラフィック設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin Webサイト(&W)" @@ -1722,12 +1754,12 @@ msgstr "Wii リモコンのエミュレーション設定" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1735,7 +1767,7 @@ msgstr "Dolphin TAS ムービー (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Wiiリモコンの設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin 開発状況(&G)" @@ -1755,12 +1787,12 @@ msgstr "" "リスト中の全てのゲームが設定により表示されていません。この文章をダブルクリッ" "クすると表示されるようになります" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "要求された操作を完了することができませんでした。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1787,11 +1819,11 @@ msgstr "%lu個のコードが見つかりました。( 新規追加: %lu個 )" msgid "Drums" msgstr "ドラムコントローラ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "ダミーデバイス" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "サウンドのダンプ" @@ -1838,9 +1870,9 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "オランダ語" @@ -1872,7 +1904,7 @@ msgstr "欧州" msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "編集" @@ -1884,16 +1916,20 @@ msgstr "コードを編集" msgid "Edit Config" msgstr "iniを編集" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "パッチを編集" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Edit current perspective" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "編集" @@ -1905,7 +1941,7 @@ msgstr "エフェクト" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (内蔵フレームバッファ)" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "エミュレーションスレッドはすでに稼働中です" @@ -1944,7 +1980,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wii リモコンをエミュレート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "動作状況:" @@ -1972,11 +2008,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "アクションリプレイコードのログを取得する" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Enable Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Enable Bounding Box Calculation" @@ -1984,27 +2020,27 @@ msgstr "Enable Bounding Box Calculation" msgid "Enable Cache" msgstr "Enable Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "チートコードを有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行う (速度向上)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処理を行う (速度向上)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Enable MMU" @@ -2012,7 +2048,7 @@ msgstr "Enable MMU" msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "スクリーンセーバーを有効化" @@ -2020,7 +2056,7 @@ msgstr "スクリーンセーバーを有効化" msgid "Enable Speaker Data" msgstr "スピーカー出力の有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Enable WideScreen" @@ -2042,7 +2078,7 @@ msgstr "" "\n" "よく分からなければ、【1x】を選択してください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2077,7 +2113,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2085,11 +2121,11 @@ msgstr "" "トワイライトプリンセスにおいて、広大なエリアで発生するFPS低下を抑えます。他の" "タイトルでは無効にしてください" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2097,22 +2133,13 @@ msgstr "" "Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。OSX " "には現在未対応です" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。" "OpenALのみ対応" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。" -"OpenALのみ対応。『soft_oal.dll』を『OenAL32.dll』にリネームすることで動作しま" -"す" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2125,7 +2152,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2147,9 +2174,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "英語" @@ -2178,11 +2205,11 @@ msgstr "に一致する" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "エラー" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "選択した言語の読み込みに失敗しました。<システムの言語>に設定を戻します" @@ -2212,7 +2239,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Exception handler - access below memory space. %08llx%08llx" @@ -2221,16 +2247,21 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "Execute" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "全てのセーブデータをエクスポート" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "エクスポートに失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "ファイルを抽出" @@ -2238,7 +2269,7 @@ msgstr "ファイルを抽出" msgid "Export Recording" msgstr "録画ファイルのエクスポート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "録画ファイルのエクスポート" @@ -2254,9 +2285,10 @@ msgstr "セーブデータをエクスポート (実験的)" msgid "Export all saves" msgstr "全てのセーブデータをエクスポート" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "エクスポートに失敗しました。リトライしますか?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "エクスポートに失敗" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2278,44 +2310,44 @@ msgstr "特殊パラメータ" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "『メトロイド Other M』のみに有用な設定です" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "全てのファイルを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Apploaderを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "DOLを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "このフォルダを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "このファイルを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "このパーティションを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "全てのファイルをエクスポート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "フォルダをエクスポート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "抽出しています..." @@ -2331,11 +2363,11 @@ msgstr "FIFO プレーヤー" msgid "FRANCE" msgstr "フランス" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FSTサイズ" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "接続に失敗!" @@ -2343,7 +2375,7 @@ msgstr "接続に失敗!" msgid "Failed to download codes." msgstr "コードの取得に失敗しました" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "%s への抽出に失敗" @@ -2383,16 +2415,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Failed to read banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Failed to read bk header" @@ -2423,12 +2455,12 @@ msgstr "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Failed to read data from file %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Failed to read data from file: %s" @@ -2449,7 +2481,7 @@ msgstr "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Failed to read header" @@ -2461,29 +2493,34 @@ msgstr "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Failed to write header for file %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Failed to read unique ID from disc image" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Failed to write BT.DINF to SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Failed to write bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Failed to read data from file: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Failed to write header for %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Failed to write header for file %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "ペルシア語" @@ -2495,11 +2532,11 @@ msgstr "Fast" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速なMMUを使用します。全てのゲームでうまく動くわけではありません" -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2507,7 +2544,7 @@ msgstr "" "致命的なdesyncが発生したため再生を中止します。 (Error in PlayWiimote: %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "FIFO プレーヤー" @@ -2548,16 +2585,16 @@ msgstr "このファイルはメモリーカードとして認識されません msgid "File not compressed" msgstr "圧縮されていないファイル" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unknown open mode : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' は不明な拡張子です。開くことができません!" @@ -2585,7 +2622,7 @@ msgstr "強制的に 16:9 にする" msgid "Force 4:3" msgstr "強制的に 4:3 にする" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "コンソールを日本向け (NTSC-J) に設定" @@ -2619,7 +2656,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2642,7 +2679,7 @@ msgstr "" msgid "Forward" msgstr "前方" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2651,6 +2688,11 @@ msgstr "" msgid "Found %d results for '" msgstr "検索結果:%d 件 '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "%s をセーブできませんでした" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2680,7 +2722,7 @@ msgstr "フレームの範囲" msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "フレームリミット:" @@ -2692,9 +2734,9 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "フランス語" @@ -2707,7 +2749,7 @@ msgstr "フレットボタン" msgid "From" msgstr "開始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "全画面" @@ -2719,7 +2761,7 @@ msgstr "全画面表示時の解像度:" msgid "GCI File(*.gci)" msgstr "GCI ファイル (*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "入力(GC)" @@ -2727,27 +2769,27 @@ msgstr "入力(GC)" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ゲームID" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "すでに起動しています!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "ゲームが起動していません!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "ゲームが見つかりません!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "固有設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "ゲーム設定" @@ -2755,7 +2797,7 @@ msgstr "ゲーム設定" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GCセーブファイル(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "ゲームキューブ" @@ -2764,16 +2806,16 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "ゲームキューブの入力設定を行います" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Geckoコード" @@ -2791,7 +2833,7 @@ msgstr "" "を置き、Dolphinを再起動することで利用できます)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "一般" @@ -2800,9 +2842,9 @@ msgstr "一般" msgid "General Settings" msgstr "一般" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "ドイツ語" @@ -2812,11 +2854,11 @@ msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: インデックスのサイズがコードリストのサイズを上回っています %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "ビデオ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "描画に関する設定を行います" @@ -2840,7 +2882,7 @@ msgstr "" "動作速度は少々低下し、まれに描画バグの原因にもなることもあります。\n" "よく分からなければ、チェックを外さないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "ギリシア語" @@ -2868,7 +2910,7 @@ msgstr "高速化(Hacks)" msgid "Header checksum failed" msgstr "Header checksum failed" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "ヘブライ語" @@ -2880,7 +2922,7 @@ msgstr "範囲(縦)" msgid "Help" msgstr "ヘルプ" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2901,7 +2943,7 @@ msgstr "" "\n" "さよなら!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2942,7 +2984,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "ホスト" @@ -2951,11 +2993,11 @@ msgid "Hotkey Configuration" msgstr "ホットキーの設定" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "ハンガリー語" @@ -2963,12 +3005,12 @@ msgstr "ハンガリー語" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2981,11 +3023,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin を停止します" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL設定" @@ -3001,11 +3043,11 @@ msgstr "IR ポインタ" msgid "IR Sensitivity:" msgstr "感度" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ゲームの詳細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "フォルダ一覧" @@ -3017,7 +3059,7 @@ msgstr "イタリア" msgid "Icon" msgstr "アイコン" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3060,9 +3102,15 @@ msgstr "" msgid "Import Save" msgstr "セーブデータをインポート" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "インポートに失敗しました。リトライしますか?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "セーブデータをインポート" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "エクスポートに失敗" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3084,21 +3132,17 @@ msgstr "" "インポートされたのは'sav'ファイルのようです\n" "しかし正しいヘッダではありません" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "ソコソコ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "ゲーム内" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "フレームリミット:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "情報" @@ -3118,7 +3162,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ここに暗号化or復号化されたコードを貼り付けてください" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "SDカードの挿入をエミュレート" @@ -3126,7 +3170,7 @@ msgstr "SDカードの挿入をエミュレート" msgid "Insert name here.." msgstr "コード名を入力してください" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "WiiメニューにWADファイルを追加" @@ -3134,30 +3178,31 @@ msgstr "WiiメニューにWADファイルを追加" msgid "Install to Wii Menu" msgstr "Wiiメニューへインストール" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ" "ポートされていません" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "追加しています..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "エラーが確認されました!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "完了" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "チェック終了。整合性に問題はありませんでした。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3166,11 +3211,11 @@ msgstr "" "パーティション %d に問題が見つかりました。 データが破損しているか、正しくパッ" "チが当てられていない可能性があります。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Dolphinの表示に関する設定" @@ -3195,15 +3240,15 @@ msgstr "Internal LZO Error - lzo_init() failed" msgid "Internal Resolution:" msgstr "内部解像度の変更:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreter (非常に低速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "イントロ" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Invalid Size(%x) or Magic word (%x)" @@ -3236,7 +3281,7 @@ msgstr "" "%s\n" " このゲームをダンプしなおしてください" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "不正な録画ファイル" @@ -3252,13 +3297,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "不正なステートファイル" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "イタリア語" @@ -3266,16 +3311,16 @@ msgstr "イタリア語" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL experimental recompiler (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "日本語" @@ -3302,8 +3347,8 @@ msgstr "最前面に表示" msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "韓国語" @@ -3321,16 +3366,16 @@ msgstr "Lボタン" msgid "L-Analog" msgstr "L (アナログ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "GUI言語:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "レイテンシー:" @@ -3373,7 +3418,7 @@ msgstr "" msgid "Less Than" msgstr "より小さい" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "FPSによる制限を有効化" @@ -3472,15 +3517,15 @@ msgstr "ステートロード - スロット 8" msgid "Load State Slot 9" msgstr "ステートロード - スロット 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "ファイルからロード" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( バージョン:%d %c )" @@ -3500,10 +3545,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "特定のゲーム向けの設定値を読み込みます" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "ローカル" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "ログ" @@ -3536,11 +3577,11 @@ msgid "Logger Outputs" msgstr "ログ出力先" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "ログ" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "サーバーとの接続が切断されました!" @@ -3548,7 +3589,7 @@ msgstr "サーバーとの接続が切断されました!" msgid "M Button" msgstr "M Button" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3557,7 +3598,7 @@ msgstr "" "MD5の不整合\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3571,11 +3612,11 @@ msgstr "MadCatz Gameshark セーブファイル(*.gcs)" msgid "Main Stick" msgstr "コントロールスティック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "メーカーID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "メーカー" @@ -3611,7 +3652,7 @@ msgid "Memory Byte" msgstr "メモリバイト" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "メモリーカード" @@ -3621,7 +3662,7 @@ msgid "" "could mangle stuff!" msgstr "メモリーカードマネージャ ~使用前にはバックアップを!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3646,7 +3687,7 @@ msgstr "メモリカードのファイルサイズが、ヘッダのサイズに msgid "Menu" msgstr "メニュー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "マイク" @@ -3659,7 +3700,7 @@ msgstr "最小" msgid "Misc" msgstr "その他" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "その他の設定" @@ -3807,7 +3848,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3854,7 +3895,7 @@ msgstr "リストに項目がありません!" msgid "No audio output" msgstr "出力しない" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "%s のバナーファイルはありません" @@ -3880,7 +3921,7 @@ msgstr "空きエントリがありません" msgid "No recorded file" msgstr "録画ファイルなし" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "%s のセーブフォルダがありません" @@ -3889,11 +3930,11 @@ msgstr "%s のセーブフォルダがありません" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "なし" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" @@ -3901,17 +3942,17 @@ msgstr "ノルウェー語" msgid "Not Equal" msgstr "に一致しない" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "未確認" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "Not a Wii save or read failure for file header size %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "未接続" @@ -3957,7 +3998,7 @@ msgstr "オブジェクト" msgid "Object Range" msgstr "オブジェクトの範囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "オフ" @@ -3965,16 +4006,20 @@ msgstr "オフ" msgid "Offset:" msgstr "オフセット値:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "オンスクリーンメッセージを表示" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "残り %d ブロックしかありません!" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "開く" @@ -3987,7 +4032,7 @@ msgstr "実体のあるフォルダを開く(&C)" msgid "Open Wii &save folder" msgstr "セーブデータのあるフォルダを開く(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "起動するファイルを選択" @@ -4013,6 +4058,16 @@ msgstr "OpenCL Texture Decoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4038,7 +4093,7 @@ msgstr "" msgid "Other" msgstr "その他" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4050,7 +4105,7 @@ msgstr "" msgid "Output" msgstr "出力" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "録画ファイルを再生(&L)" @@ -4058,7 +4113,7 @@ msgstr "録画ファイルを再生(&L)" msgid "Pad" msgstr "パッド" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Pad " @@ -4087,21 +4142,21 @@ msgstr "パラメータ" msgid "Partition %i" msgstr "パーティション %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "パッチ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "フォルダ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "一時停止" @@ -4114,7 +4169,7 @@ msgstr "再生終了時に一時停止" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "カンペキ!" @@ -4124,9 +4179,9 @@ msgid "Perspective %d" msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "開始" @@ -4138,7 +4193,7 @@ msgstr "録画ファイルを再生" msgid "Play/Pause" msgstr "開始/一時停止" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "サクサク" @@ -4146,11 +4201,11 @@ msgstr "サクサク" msgid "Playback Options" msgstr "再生オプション" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "プレイヤー一覧" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "確認" @@ -4162,36 +4217,36 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "ポーランド語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "ポート 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "ポート 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "ポート 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "ポート 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "ポート:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "ポルトガル語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" @@ -4199,17 +4254,17 @@ msgstr "ブラジル語" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4242,7 +4297,7 @@ msgstr "プロファイル" msgid "Properties" msgstr "プロパティ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "キャッシュの整頓を実行" @@ -4250,8 +4305,8 @@ msgstr "キャッシュの整頓を実行" msgid "Question" msgstr "確認" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "終了" @@ -4312,6 +4367,11 @@ msgstr "実機Wii リモコンの設定" msgid "Record" msgstr "録画" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "録画オプション" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "録画情報" @@ -4348,7 +4408,7 @@ msgstr "" "よく分からなければ、【なし】のままにしておいてください。" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "再更新" @@ -4357,14 +4417,14 @@ msgstr "再更新" msgid "Refresh List" msgstr "ゲームリストを再更新" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "ゲームリストを再更新します" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "削除" @@ -4395,7 +4455,7 @@ msgstr "結果表示欄" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4413,15 +4473,15 @@ msgstr "右スティック" msgid "Rumble" msgstr "振動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "DSPの処理を別スレッドに分離して行います (非推奨:音の問題やフリーズ等のリスク" "有)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "ロシア語" @@ -4434,7 +4494,7 @@ msgid "Safe" msgstr "Safe" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "保存" @@ -4495,28 +4555,28 @@ msgstr "ステートセーブ - スロット 8" msgid "Save State Slot 9" msgstr "ステートセーブ - スロット 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "ファイルとして保存" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "ファイルとして保存" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "圧縮するタイトルの保存先を選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Save current perspective" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "復元するタイトルの保存先を選択" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s の破損を確認しました。録画を中止しています..." @@ -4538,7 +4598,7 @@ msgstr "確認中..." msgid "Scanning..." msgstr "確認中..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "画面撮影" @@ -4554,7 +4614,7 @@ msgstr "検索" msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "サブフォルダも検索" @@ -4577,12 +4637,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "録画ファイルを選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "追加するWADファイルを選択" @@ -4604,19 +4664,19 @@ msgstr "インポートするセーブファイルを選択" msgid "Select floating windows" msgstr "Select floating windows" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "ロードするファイルを選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "セーブファイルを選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "ロードするステートセーブファイルを選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "ステートセーブの保存先を選択" @@ -4692,7 +4752,7 @@ msgstr "" "\n" "よく分からなければ、【OpenGL】を選択してください。" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "送信" @@ -4704,11 +4764,11 @@ msgstr "センサーバーの位置" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルポート:ブロードバンドアダプタなどのデバイスが接続できます" @@ -4729,7 +4789,7 @@ msgstr "" "SetARCode_IsActive: インデックスのサイズがコードリストのサイズを上回っていま" "す %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4737,19 +4797,20 @@ msgstr "" "レイテンシーを調整します(単位:ms)。高くすることで音の問題を軽減できます。" "OpenALのみ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "設定" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Cant find setting file" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "シェイク" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "通称" @@ -4757,23 +4818,28 @@ msgstr "通称" msgid "Shoulder Buttons" msgstr "LRトリガー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "コンソール(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "ログを表示(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "ステータスバー(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "ツールバー(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "既定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "DVDドライブ内のソフトを表示" @@ -4785,11 +4851,11 @@ msgstr "Show EFB Copy Regions" msgid "Show FPS" msgstr "FPSを表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "フランス" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "ゲームキューブ" @@ -4797,35 +4863,35 @@ msgstr "ゲームキューブ" msgid "Show Input Display" msgstr "キー入力を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "イタリア" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "韓国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "次の言語で表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "ログの設定を表示(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "PAL規格" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "特定機種のソフトだけを表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "特定リージョンのソフトだけを表示" @@ -4833,27 +4899,27 @@ msgstr "特定リージョンのソフトだけを表示" msgid "Show Statistics" msgstr "統計情報を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "台湾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "アメリカ合衆国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "WAD(Wiiウェア/VC/チャンネル)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "ゲーム停止前に確認ウィンドウが表示されるようになります" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4871,7 +4937,7 @@ msgstr "ブロック開始位置を表示" msgid "Show lag counter" msgstr "ラグカウンターを表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4909,7 +4975,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "不明" @@ -4927,7 +4993,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "横持ち(Sideways)で使用" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "簡体字中国語" @@ -4935,11 +5001,11 @@ msgstr "簡体字中国語" msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Skip DCBZ clearing" @@ -4964,17 +5030,17 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "スロットB" @@ -4982,7 +5048,7 @@ msgstr "スロットB" msgid "Snapshot" msgstr "スクリーンショット" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Software Renderer" @@ -4997,7 +5063,7 @@ msgstr "" "デバッグ用途としてのみ有用なものです。\n" "それでも使用しますか?よく分からなければ、選択しないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "サウンド設定" @@ -5015,9 +5081,9 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "スペイン語" @@ -5045,37 +5111,29 @@ msgstr "" "\n" "よく分からなければ、【1x Native】を選択してください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Speed up Disc Transfer Rate" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "丸み" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "標準コントローラ" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "スタート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "ネットプレイを開始(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "録画を開始(&C)" @@ -5091,7 +5149,7 @@ msgstr "動作率" msgid "State Saves" msgstr "ステートセーブ/ロード" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "SPEED FORCE" @@ -5100,7 +5158,7 @@ msgid "Stick" msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "停止" @@ -5131,16 +5189,16 @@ msgstr "ストラム" msgid "Subtract" msgstr "Subtract" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "%s へのエクスポートに成功しました" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "セーブファイルのインポートに成功" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5148,11 +5206,11 @@ msgstr "" msgid "Swing" msgstr "動き" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Synchronize GPU thread" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5160,8 +5218,8 @@ msgstr "" "CPU/GPUスレッドを同期させることでデュアルコア動作時のフリーズを抑制します " "[有効=互換性・安定性重視/無効=動作速度向上]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "システムの言語:" @@ -5190,13 +5248,13 @@ msgstr "左テーブル" msgid "Table Right" msgstr "右テーブル" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "画面撮影" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "タルコンガ" @@ -5216,7 +5274,7 @@ msgstr "Texture Cache" msgid "Texture Format Overlay" msgstr "テクスチャフォーマット情報表示" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WADファイルの追加に成功" @@ -5228,13 +5286,13 @@ msgstr "無効なアドレスです" msgid "The checksum was successfully fixed" msgstr "チェックサムの修正に成功しました" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "選択したフォルダはすでにリストに存在します!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5291,7 +5349,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "コピーしようとしているセーブファイルのサイズが正しくありません" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5299,23 +5357,23 @@ msgstr "" "選択した言語はこのシステムではサポートされていません。デフォルト設定を使用し" "ます" -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "サーバーとクライアントでネットプレイのバージョンに互換性がありません!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "このサーバーは満員です!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "サーバーより:このゲームは、現在実行中です!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "サーバーは、不明なエラーメッセージを送信しました!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "指定されたファイル \"%s\" は存在しません" @@ -5324,18 +5382,18 @@ msgstr "指定されたファイル \"%s\" は存在しません" msgid "The value is invalid" msgstr "無効な値です" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "テーマ:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "00000001/00000002のチケットが必要です。おそらく不完全なNANDダンプです。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5353,7 +5411,7 @@ msgstr "" "このアクションリプレイシミュレータは、アクションリプレイそのものを変更する" "コードはサポートしていません。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効にしているとWiiメニューやいくつかのタイトルで動作速度が低下する場合があり" @@ -5379,7 +5437,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -5387,7 +5445,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5440,7 +5498,7 @@ msgstr "EFB Copies" msgid "Toggle Fog" msgstr "全てのログ情報を選択/解除" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替え" @@ -5450,11 +5508,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "繁体字中国語" @@ -5478,7 +5536,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "トルコ語" @@ -5531,7 +5589,7 @@ msgstr "" "認して下さい。\n" "この行を無視して解析を続けますか?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "未定義 %i" @@ -5568,12 +5626,12 @@ msgstr "Unknown command 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Unknown entry type %i in SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "次のIDから不明なメッセージを受信 : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5592,7 +5650,7 @@ msgstr "再取得" msgid "Upright Wiimote" msgstr "直立状態(Upright)で使用" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" @@ -5604,7 +5662,7 @@ msgstr "フルスクリーンで表示" msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "パニックハンドラを使用" @@ -5628,6 +5686,15 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5651,7 +5718,7 @@ msgstr "ユーティリティ" msgid "V-Sync" msgstr "垂直同期 (V-Sync)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Speed Hack" @@ -5676,7 +5743,7 @@ msgstr "Verbosityモード" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "描画" @@ -5684,17 +5751,17 @@ msgstr "描画" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "音量" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installation failed: error creating %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "WAD installation failed: error creating ticket" @@ -5728,7 +5795,7 @@ msgstr "Warning - starting ELF in wrong console mode!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Warning - starting ISO in wrong console mode!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5753,7 +5820,7 @@ msgstr "" "\n" "続けますか?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5761,7 +5828,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5769,7 +5836,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5805,23 +5872,19 @@ msgstr "疑似ワイドスクリーン化" msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NANDルート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Wiiのセーブデータをインポート" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5830,7 +5893,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ファイルからの読み込みができませんでした" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "入力(Wii)" @@ -5839,7 +5902,7 @@ msgstr "入力(Wii)" msgid "Wiimote %i" msgstr "Wii リモコン %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5847,7 +5910,7 @@ msgstr "Wii リモコン接続中" msgid "Wiimote Motor" msgstr "Wii リモコンの振動を有効化" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wii リモコンの設定を行います" @@ -5871,14 +5934,14 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "動作中..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5944,7 +6007,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "You can't close panes that have pages in them." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "ソフトが選ばれていません" @@ -5960,7 +6023,7 @@ msgstr "10進数・16進数・8進数いずれかの有効な値を入力して msgid "You must enter a valid profile name." msgstr "有効なプロファイル名を入力してください" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効にするにはDolphinを再起動してください" @@ -5974,7 +6037,7 @@ msgstr "" "この問題を修正するために動作を停止しますか?\n" "\"いいえ\"を選択した場合、歪んだ音のままゲームが始まるでしょう" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5993,7 +6056,7 @@ msgstr "" "正しくは 0x%04x (このファイルは 0x%04llx)\n" "新しく作成しますか?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -6059,7 +6122,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6072,7 +6135,17 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." msgid "s" msgstr " " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "次のIDから不明なメッセージを受信 : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6110,9 +6183,28 @@ msgstr "| (...もしくは)" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "現在パッド設定を行えません。 プレーヤーが残っているかゲームが起動中で" +#~ "す!\n" +#~ "(ゲーム中の設定変更は現在サポートされていません)" + #~ msgid "Enable Hotkeys" #~ msgstr "ホットキーを使用" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。" +#~ "OpenALのみ対応。『soft_oal.dll』を『OenAL32.dll』にリネームすることで動作" +#~ "します" + +#~ msgid "Export failed, try again?" +#~ msgstr "エクスポートに失敗しました。リトライしますか?" + #~ msgid "Failed to Listen!!" #~ msgstr "Listenに失敗!" @@ -6137,12 +6229,21 @@ msgstr "| (...もしくは)" #~ "FPSが安定しないゲームで効果があります [有効=互換性向上/無効=動作速度向" #~ "上]" +#~ msgid "Import failed, try again?" +#~ msgstr "インポートに失敗しました。リトライしますか?" + +#~ msgid "In-Game" +#~ msgstr "ゲーム内" + #~ msgid "Last Overwritten State" #~ msgstr "最後に上書きしたステートセーブ" #~ msgid "Last Saved State" #~ msgstr "最新のステートセーブ" +#~ msgid "Local" +#~ msgstr "ローカル" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "ステートロード時にWii リモコンを再接続" @@ -6164,3 +6265,6 @@ msgstr "| (...もしくは)" #~ "ます。\n" #~ "\n" #~ "よく分からなければ、チェックを入れないでください。" + +#~ msgid "Wii Save Import" +#~ msgstr "Wiiのセーブデータをインポート" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 9c58749f07..b21e1d780f 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-11 01:47+0000\n" "Last-Translator: Siegfried \n" "Language-Team: Korean (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr " (표시하기에 너무 많은)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "게임 :" @@ -43,7 +43,7 @@ msgstr "" "\"%s\"가 존재하지 않습니다.\n" " 새로운 16MB 메모리카드를 생성해요?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"는 비적합 GCM/ISO 파일임, 혹은 GC/Wii ISO가 아님." @@ -68,8 +68,8 @@ msgstr "%d 샘플들" msgid "%d samples (quality level %d)" msgstr "%d 샘플들 (품질 수준 %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s가 이미 존재함, 덮어씁니까?" @@ -106,12 +106,17 @@ msgstr "" "%s 는 메모리카드로써 불러오기에 실패했습니다 \n" "파일이 유효한 메모리 카드 파일이 될 만큼 충분히 크지 않습니다. (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s가 열기에 실패했습니다" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s가 열기에 실패했습니다" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s 는 0 바이트 파일임" @@ -121,7 +126,7 @@ msgstr "%s 는 0 바이트 파일임" msgid "%s is already compressed! Cannot compress it further." msgstr "%s 는 이미 압축됨! 그것을 더이상 압축할 수 없습니다." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s 는 너무 긴 파일이름 입니다, 최대 글자수는 45 입니다." @@ -150,7 +155,7 @@ msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "돌핀에 대해(&A)..." @@ -158,7 +163,7 @@ msgstr "돌핀에 대해(&A)..." msgid "&Boot from DVD Drive..." msgstr "DVD 드라이브에서 부트(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "브레이크포인트(&B)" @@ -166,7 +171,7 @@ msgstr "브레이크포인트(&B)" msgid "&Browse for ISOs..." msgstr "ISO 폴더탐색(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "치트 매니저(&C)" @@ -190,11 +195,11 @@ msgstr "에뮬레이션(&E)" msgid "&File" msgstr "파일(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "프레임 진행(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "전체화면(&F)" @@ -202,7 +207,7 @@ msgstr "전체화면(&F)" msgid "&Graphics Settings" msgstr "그래픽 설정(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "도움(&H)" @@ -210,7 +215,7 @@ msgstr "도움(&H)" msgid "&Hotkey Settings" msgstr "단축키 설정(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -222,11 +227,11 @@ msgstr "상태 로드(&L)" msgid "&Memcard Manager (GC)" msgstr "메모리 카드 매니저(GC) (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "메모리(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "열기(&O)..." @@ -234,11 +239,11 @@ msgstr "열기(&O)..." msgid "&Options" msgstr "옵션(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "일시정지(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "실행(&P)" @@ -246,39 +251,39 @@ msgstr "실행(&P)" msgid "&Properties" msgstr "속성(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "읽기-전용 모드(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "게임목록 새로 고침(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "레지스터들(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "리셋(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "사운드(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "중지(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "도구(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "비디오(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "보기(&V)" @@ -367,7 +372,7 @@ msgstr "<여기에 이름을 넣으세요>" msgid "" msgstr "<발견된 해상도가 없음>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "<없음>" @@ -375,7 +380,7 @@ msgstr "<없음>" msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<시스템>" @@ -383,8 +388,8 @@ msgstr "<시스템>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "넷플레이 윈도우가 이미 열려있습니다!!" @@ -411,8 +416,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -436,13 +439,13 @@ msgstr "" "\n" "TCP 포트를 호스트에 전달해야합니다!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-기반보드" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR 코드" @@ -572,11 +575,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "액션리플레이 코드 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "패치 추가" @@ -584,9 +587,9 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 창 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "추가..." @@ -638,36 +641,36 @@ msgstr "버튼들 활성화에 필요한 아날로그 컨트롤 압력을 조정 msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "고급 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "모든 GC/Wii 파일들 (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "모든 GC/Wii 이미지들 (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임큐브 GCM 파일들 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "모든 상태들 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파일들 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 압축된 GC/Wii ISO 파일들 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "모든 파일 (*.*)|*.*" @@ -695,7 +698,7 @@ msgstr "앱로더가 잘못된 크기임... 정말 앱로더입니까?" msgid "Apploader unable to load from file" msgstr "앱로더가 파일로 부터 로드할 수 없음" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "앱로더:" @@ -713,7 +716,7 @@ msgstr "" "\n" "모르겠으면, (끄기)를 선택하세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "아랍어" @@ -722,7 +725,7 @@ msgstr "아랍어" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 정말로 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -730,15 +733,15 @@ msgstr "" "이 파일들을 정말로 지우고 싶습니까?\n" "그것들은 영원히 사라집니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (실험적)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -747,12 +750,12 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "적어도 하나의 창이 열려 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "오디오 백엔드:" @@ -760,7 +763,7 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 에러.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "자동" @@ -799,7 +802,7 @@ msgstr "BP 레지스터" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "백엔드 설정" @@ -817,7 +820,7 @@ msgstr "백그라운드 입력" msgid "Backward" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "배드 파일 헤더" @@ -830,11 +833,11 @@ msgstr "" msgid "Banner" msgstr " 배너" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "배너 세부사항" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "배너:" @@ -846,7 +849,7 @@ msgstr "바" msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "기본 설정" @@ -875,7 +878,7 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "아래" @@ -884,11 +887,11 @@ msgstr "아래" msgid "Bound Controls: %lu" msgstr "바운드 컨트롤들: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "고장남" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "폴더탐색" @@ -896,15 +899,15 @@ msgstr "폴더탐색" msgid "Browse for a directory to add" msgstr "추가할 디렉토리 둘러보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "버퍼:" @@ -914,7 +917,7 @@ msgstr "버퍼:" msgid "Buttons" msgstr "버튼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -937,7 +940,7 @@ msgstr "C-스틱" msgid "CP reg" msgstr "CP 레지" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU 에뮬레이터 엔진" @@ -959,7 +962,7 @@ msgstr "" "\n" "모르겠으면, 언체크 상태로 두세요." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "%02x 연결핸들에 의해 위모트를 찾을 수 없음" @@ -974,9 +977,9 @@ msgstr "DVD_플러그인 - DVD-인터페이스에서 읽을 수 없음: 치명 msgid "Cancel" msgstr "취소" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "%s를 열수 없음" @@ -985,7 +988,7 @@ msgstr "%s를 열수 없음" msgid "Cannot unregister events with events pending" msgstr "이벤트들 미해결을 지닌 이벤트들을 등록하지 않을 수 없음" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -996,7 +999,7 @@ msgstr "" "%s\n" "는 유효한 게임큐브 메모리 카드 파일이 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1008,7 +1011,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "카탈로니아어" @@ -1016,11 +1019,11 @@ msgstr "카탈로니아어" msgid "Center" msgstr "중앙" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "변경" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "디스크 변경(&D)..." @@ -1028,11 +1031,11 @@ msgstr "디스크 변경(&D)..." msgid "Change Disc" msgstr "디스크 변경" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "게임 변경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1048,11 +1051,11 @@ msgstr "표시를 z원거리 파라미터로 변경 (정정 후에)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "표시를 z근거리 파라미터로 변경 (정정 후에)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "에뮬레이터가 작동하고 있는 동안에 이 변경은 효과가 없을 겁니다!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "채팅" @@ -1068,39 +1071,39 @@ msgstr "치트 찾기" msgid "Cheats Manager" msgstr "치트들 관리자" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "파티션 완전성 체크" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "파티션 완전성 체크중..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "디폴트 ISO 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "추가할 디렉토리 선택" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "열려는 파일 선택" @@ -1108,15 +1111,15 @@ msgstr "열려는 파일 선택" msgid "Choose a memory card:" msgstr "메모리 카드 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "앱로더로 사용할 파일을 선택: (디렉토리들로만 구성된 디스크들에게만 적용됨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "압축해제할 폴더를 선택" @@ -1135,7 +1138,7 @@ msgstr "클래식" msgid "Clear" msgstr "깨끗이" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1145,7 +1148,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "닫기" @@ -1170,7 +1173,7 @@ msgstr "명령" msgid "Comment" msgstr "주석" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "주석:" @@ -1182,12 +1185,12 @@ msgstr "ISO 압축..." msgid "Compress selected ISOs..." msgstr "선택된 ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "ISO 압축하기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr " 환경 " @@ -1201,22 +1204,22 @@ msgstr "환경설정" msgid "Configure Control" msgstr "컨트롤 설정" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "패드들 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "파일 덮어쓰기 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "중지시 확인" @@ -1225,17 +1228,17 @@ msgstr "중지시 확인" msgid "Connect" msgstr "연결" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "USB 키보드 연결" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "USB 키보드 연결" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "위모트 %i 연결" @@ -1256,7 +1259,7 @@ msgstr "위모트 3 연결" msgid "Connect Wiimote 4" msgstr "위모트 4 연결" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "연결중..." @@ -1276,7 +1279,7 @@ msgstr "컨트롤" msgid "Convert to GCI" msgstr "GCI 로 변환" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "복사 실패했습니다" @@ -1285,7 +1288,7 @@ msgstr "복사 실패했습니다" msgid "Copy to Memcard %c" msgstr "메모리카드 %c 에 복사" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "코어" @@ -1299,7 +1302,7 @@ msgstr "%s 를 생성할 수 없었습니다" msgid "Could not initialize backend %s." msgstr "백엔드 %s 를 초기화할 수 없었습니다" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1310,24 +1313,16 @@ msgstr "" "백업이 아님. 본래의 게임큐브와 Wii 디스크들은 대부분의 PC DVD 드라이브들에서 " "읽어질 수 없음을 아세요." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "%s ISO 파일을 인식할 수 없었습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "%s 를 저장할 수 없었습니다" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"패드들을 설정할 수 없었습니다. 플레이어가 떠났거나 게임이 현재 구동중!\n" -"(게임이 구동중일 때 패드들을 설정하기는 아직 지원되지 않습니다)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1347,11 +1342,11 @@ msgstr "" "에뮬레이터 디렉토리를 이동한 후에 이 메시지를 받고 있나요?\n" "그렇다면, 옵션에서 메모리카드 위치를 재지정해야 할겁니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "확장자 'ini'에 대한 열린 명령을 발견할 수 없었습니다!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1364,7 +1359,7 @@ msgstr "" msgid "Count:" msgstr "카운트:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "국가:" @@ -1404,12 +1399,12 @@ msgstr "" msgid "Crossfade" msgstr "크로스페이드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "wxFileSelector후에 현재 디렉토리가 %s에서 %s로 변경됨!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "사용자 지정 프로젝션 핵:" @@ -1417,11 +1412,11 @@ msgstr "사용자 지정 프로젝션 핵:" msgid "Custom Projection Hack Settings" msgstr "사용자 지정 프로젝션 핵 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "일부 정 투영 파라미터들을 커스터마이즈." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "체코" @@ -1433,36 +1428,37 @@ msgstr "D" msgid "D-Pad" msgstr "D-패드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP 에뮬레이터 엔진" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 에뮬레이션 (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 인터프리터 (느림)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파일러" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "전용 쓰레드상에 DSP" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "전용 쓰레드상에 DSP" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD 루트:" @@ -1474,7 +1470,7 @@ msgstr "DVD저수준읽기 - 치명적 에러: 볼륨에서 읽기를 실패했 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVD저수준비암호화읽기 - 치명적 에러: 볼륨에서 읽기를 실패했습니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1482,7 +1478,7 @@ msgstr "" msgid "Data Size" msgstr "데이터 크기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "날짜:" @@ -1519,8 +1515,8 @@ msgstr "ISO 압축해제..." msgid "Decompress selected ISOs..." msgstr "선택된 ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" @@ -1533,7 +1529,7 @@ msgstr "게임 목록 새로 고침" msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "기본 ISO:" @@ -1577,8 +1573,8 @@ msgstr "" msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "장비 설정" @@ -1590,7 +1586,7 @@ msgstr "다이얼" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1656,7 +1652,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "디스크" @@ -1683,24 +1679,60 @@ msgstr "" msgid "Divide" msgstr "나누기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "현재 에뮬레이션을 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "돌비 프로 로직 II 디코더" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "돌핀" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "돌핀 %s 그래픽 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "돌핀 웹 사이트(&W)" @@ -1716,12 +1748,12 @@ msgstr "돌핀 에뮬된 위모트 환경설정" msgid "Dolphin FIFO" msgstr "돌핀 FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "돌핀 GC패드 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "돌핀 TAS 동영상 (*.dtm)" @@ -1729,7 +1761,7 @@ msgstr "돌핀 TAS 동영상 (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "돌핀 위모트 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "돌핀 구글 코드(&G)" @@ -1749,12 +1781,12 @@ msgstr "" "돌핀이 현재 모든 게임들을 숨기게 설정됨. 모든 게임들을 보려면 여기를 더블클" "릭..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "돌핀이 요청된 액션을 완수할 수 없었습니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1780,11 +1812,11 @@ msgstr "%lu 코드들이 다운로드됨. (추가된 %lu)" msgid "Drums" msgstr "드럼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "더미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "오디오 덤프" @@ -1830,9 +1862,9 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "네덜란드어" @@ -1864,7 +1896,7 @@ msgstr "유럽" msgid "Early Memory Updates" msgstr "빠른 메모리 업데이트" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "편집" @@ -1876,16 +1908,20 @@ msgstr "액션리플레이 코드 편집" msgid "Edit Config" msgstr "환경 편집" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "패치 편집" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "현재 관점 편집" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "편집..." @@ -1897,7 +1933,7 @@ msgstr "효과" msgid "Embedded Frame Buffer" msgstr "내장형 프레임 버퍼" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "에뮬 쓰레드가 이미 구동중임" @@ -1935,7 +1971,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "에뮬된 위모트" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "에뮬레이션 상태:" @@ -1963,11 +1999,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "블록 합치기 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" @@ -1975,27 +2011,27 @@ msgstr "바운딩 박스 계산 켜기" msgid "Enable Cache" msgstr "캐쉬 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "치트 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (속도상승)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "아이들 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "아이들 스킵 활성 (속도상승)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "MMU 활성" @@ -2003,7 +2039,7 @@ msgstr "MMU 활성" msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "스크린 세이버 활성" @@ -2011,7 +2047,7 @@ msgstr "스크린 세이버 활성" msgid "Enable Speaker Data" msgstr "스피커 데이터를 켭니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "와이드스크린 활성" @@ -2033,7 +2069,7 @@ msgstr "" "\n" "모르겠으면, 1x를 선택하세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2068,7 +2104,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2076,32 +2112,24 @@ msgstr "" "The Legend of Zelda: Twilight Princess를 속도를 올리려면 켬. 다른 게임을 위해" "서는 끔." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "사용자 지정 프로젝션 핵 활성화" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" "5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OSX에서는 않됨." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OpenAL 백엔드 전" "용." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OpenAL 백엔드 전" -"용. 작동시키려면 soft_oal.dll 을 OpenAL32.dll 로 이름바꾸기가 필요할 지도." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2114,7 +2142,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2134,9 +2162,9 @@ msgstr "" msgid "End" msgstr "끝" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "영어" @@ -2165,11 +2193,11 @@ msgstr "같음" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "에러" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다." @@ -2200,7 +2228,6 @@ msgid "Euphoria" msgstr "유포리아" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "예외 핸들러 - 메모리 공간 아래를 접근. %08llx%08llx" @@ -2209,16 +2236,21 @@ msgstr "예외 핸들러 - 메모리 공간 아래를 접근. %08llx%08llx" msgid "Execute" msgstr "실행" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "모든 저장들을 내보내기" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "내보내기 실패했습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "파일 내보내기" @@ -2226,7 +2258,7 @@ msgstr "파일 내보내기" msgid "Export Recording" msgstr "(입력) 기록 내보내기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "(입력) 기록 내보내기..." @@ -2242,9 +2274,10 @@ msgstr "Wii 저장 내보내기 (실험적)" msgid "Export all saves" msgstr "모든 저장들을 내보내기" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "내보내기 실패했습니다, 다시 시도?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "내보내기 실패했습니다" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2266,44 +2299,44 @@ msgstr "추가 매개변수" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "추가 매개변수는 ''Metroid: Other M''에서만 유용합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "모든 파일들 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "앱로더 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "DOL 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "디렉토리 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "파일 압축 풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "모든 파일들 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "압축풀기..." @@ -2319,11 +2352,11 @@ msgstr "FIFO 플레이어" msgid "FRANCE" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST 크기:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "연결에 실패했습니다!" @@ -2331,7 +2364,7 @@ msgstr "연결에 실패했습니다!" msgid "Failed to download codes." msgstr "코드들 다운로드에 실패했습니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "%s로 압축풀기 실패했습니다!" @@ -2371,16 +2404,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "%s 읽기에 실패" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "banner.bin 읽기에 실패했습니다" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "bk 헤더 읽기에 실패했습니다" @@ -2411,12 +2444,12 @@ msgstr "" "블럭 할당 테이블을 올바르게 읽기에 실패했습니다\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "%d 파일로 부터 데이터 읽기 실패" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "파일: %s 에서 데이터 읽기에 실패했습니다" @@ -2437,7 +2470,7 @@ msgstr "" "디렉토리를 올바르게 읽기에 실패했습니다\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "헤더 읽기에 실패했습니다" @@ -2449,29 +2482,34 @@ msgstr "" "해더를 올바르게 읽기에 실패했습니다\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "%d 파일에 대한 헤더 쓰기에 실패했습니다" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "디스크 이미지로 부터 유일한 ID를 읽기에 실패했습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "BT.DINF를 SYSCONF로 쓰기에 실패했습니다" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "bkhdr를 쓰기에 실패" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "파일: %s 에서 데이터 읽기에 실패했습니다" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "%s 에 대한 헤더 쓰기에 실패" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "%d 파일에 대한 헤더 쓰기에 실패했습니다" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "페르시아어" @@ -2483,11 +2521,11 @@ msgstr "빠름" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU의 빠른 버전. 모든 게임에 대해 작동하지는 않는다." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2495,7 +2533,7 @@ msgstr "" "치명적 비동기. 재생을 중단합니다. (PlayWiimote에서 에러: %u != %u, byte " "%u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "FIFO 플레이어" @@ -2536,16 +2574,16 @@ msgstr "파일이 메모리카드로 인식되지 않는다" msgid "File not compressed" msgstr "파일이 압축되지 않었습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 알려지지 않은 열기 모드: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "파일시스템" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파일타입은 알려지지 않음! 열지 않겠습니다!" @@ -2573,7 +2611,7 @@ msgstr "강제 16:9" msgid "Force 4:3" msgstr "강제 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "콘솔을 NTSC-J로 강제시킴" @@ -2605,7 +2643,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2627,7 +2665,7 @@ msgstr "" msgid "Forward" msgstr "앞으로" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2636,6 +2674,11 @@ msgstr "" msgid "Found %d results for '" msgstr "%d 개 찾았습니다 '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "%s 를 저장할 수 없었습니다" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2665,7 +2708,7 @@ msgstr "프레임 범위" msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "프레임제한:" @@ -2677,9 +2720,9 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "자유로운 보기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "프랑스어" @@ -2692,7 +2735,7 @@ msgstr "프렛들" msgid "From" msgstr "From" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "전체화면" @@ -2704,7 +2747,7 @@ msgstr "전체화면 해상도:" msgid "GCI File(*.gci)" msgstr "GCI 파일(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC패드" @@ -2712,27 +2755,27 @@ msgstr "GC패드" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "게임 ID:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "게임이 이미 구동중입니다!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "게임이 구동중이지 않습니다!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "게임이 없습니다!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "게임-상세 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "게임환경" @@ -2740,7 +2783,7 @@ msgstr "게임환경" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "게임큐브 게임저장 파일(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "게임큐브" @@ -2749,16 +2792,16 @@ msgid "Gamecube &Pad Settings" msgstr "게임큐브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "게임큐브 패드 설정" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko 코드" @@ -2775,7 +2818,7 @@ msgstr "" "을 Sys 폴더에 위치시키고 돌핀을 재시작해서 원본 코드 핸들러를 사용해보세요.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "일반" @@ -2784,9 +2827,9 @@ msgstr "일반" msgid "General Settings" msgstr "일반 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "독일어" @@ -2795,11 +2838,11 @@ msgstr "독일어" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: 인덱스가 ar 코드 리스트 크기 %lu 보다 더 큽니다 " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "그래픽" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "그래픽 설정" @@ -2824,7 +2867,7 @@ msgstr "" "\n" "모르겠으면, 이것을 체크로 두세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "그리스어" @@ -2852,7 +2895,7 @@ msgstr "핵" msgid "Header checksum failed" msgstr "헤더 체크섬 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "히브리어" @@ -2864,7 +2907,7 @@ msgstr "높이" msgid "Help" msgstr "도움" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2884,7 +2927,7 @@ msgstr "" "\n" "사요나라!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2924,7 +2967,7 @@ msgid "Home" msgstr "홈" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "호스트" @@ -2933,11 +2976,11 @@ msgid "Hotkey Configuration" msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "헝가리어" @@ -2945,14 +2988,14 @@ msgstr "헝가리어" msgid "Hybrid Wiimote" msgstr "하이브리드 위모트" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: 알려지지 않은 티켓: %08x/%08x 에서 데이터를 얻으려 시도했" "습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2965,11 +3008,11 @@ msgstr "" "TitleID %016llx.\n" "돌핀은 이제 멈추려할 것입니다." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - 잘못된 대상" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL 설정" @@ -2985,11 +3028,11 @@ msgstr "IR 포인터" msgid "IR Sensitivity:" msgstr "IR 감도:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "ISO 디렉토리들" @@ -3001,7 +3044,7 @@ msgstr "이탈리아" msgid "Icon" msgstr "아이콘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3045,9 +3088,15 @@ msgstr "" msgid "Import Save" msgstr "저장을 가져오기" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "가져오기 실패했습니다, 재시도?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "저장을 가져오기" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "내보내기 실패했습니다" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3069,21 +3118,17 @@ msgstr "" "가져온 파일이 sav 확장자를 지닌다\n" "하지만 올바른 해더를 지니지 않는다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "게임안" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "게임-안" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "프레임제한:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "정보" @@ -3103,7 +3148,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화되거나 암호해독된 코드를 여기에 삽입하세요..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "SD 카드 삽입" @@ -3111,7 +3156,7 @@ msgstr "SD 카드 삽입" msgid "Insert name here.." msgstr "이름을 여기에 넣으시오..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "WAD 설치" @@ -3119,30 +3164,31 @@ msgstr "WAD 설치" msgid "Install to Wii Menu" msgstr "Wii 메뉴에 설치" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습" "니다." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "완전성 체크 에러" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "완전성 체크 완료됨" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "완전성 체크가 완료되었습니다. 에러가 발견되지 않었습니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3151,11 +3197,11 @@ msgstr "" "파티션 %d 에 대한 완전성 체크가 실패하였습니다. 당신의 덤프가 오염되었거나 잘" "못 패치된 것 같습니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "인터페이스" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "인터페이스 설정" @@ -3180,15 +3226,15 @@ msgstr "내부 LZO 에러 - lzo_init() 실패했습니다" msgid "Internal Resolution:" msgstr "내부 해상도:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "인터프리터 (매우 느림)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "소개화면" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "비적합 크기(%x) 혹은 마법 낱말 (%x)" @@ -3221,7 +3267,7 @@ msgstr "" "%s\n" " 당신은 이 게임을 리덤프해야할 지도." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "비적합 기록 파일" @@ -3237,13 +3283,13 @@ msgstr "비적합 찾기 스트링 (숫자로 변환될 수 없었습니다)" msgid "Invalid search string (only even string lengths supported)" msgstr "비적합 찾기 스트링 (짝수 길이 스트링만 지원됩니다)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "비적합 상태" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "이탈리아어" @@ -3251,16 +3297,16 @@ msgstr "이탈리아어" msgid "JAPAN" msgstr "일본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파일러 (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL 실험적 리컴파일러" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "일본어" @@ -3286,8 +3332,8 @@ msgstr "윈도우를 맨위로 유지" msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "한국어" @@ -3305,16 +3351,16 @@ msgstr "L 버튼" msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "언어:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "지연:" @@ -3357,7 +3403,7 @@ msgstr "" msgid "Less Than" msgstr "보다 더 적은" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "FPS로 제한" @@ -3456,15 +3502,15 @@ msgstr "슬롯8 상태 로드" msgid "Load State Slot 9" msgstr "슬롯1 상태 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "상태 로드..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3483,10 +3529,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "핵 패턴들로 부터 사용 가능한 사전설정 값을 로드합니다." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "지역" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "로그" @@ -3520,11 +3562,11 @@ msgid "Logger Outputs" msgstr "로거 출력" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "로깅" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "서버에 연결을 잃어버림!" @@ -3532,7 +3574,7 @@ msgstr "서버에 연결을 잃어버림!" msgid "M Button" msgstr "M 버튼" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3541,7 +3583,7 @@ msgstr "" "MD5 미스매치\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" @@ -3555,11 +3597,11 @@ msgstr "MadCatz 게임샤크 파일들(*.gcs)" msgid "Main Stick" msgstr "메인 스틱" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "제작사 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "제작사:" @@ -3596,7 +3638,7 @@ msgid "Memory Byte" msgstr "메모리 바이트" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "메모리 카드" @@ -3608,7 +3650,7 @@ msgstr "" "메모리 카드 메니저 경고-사용하기 전에 백업을 만드세요, 고쳐져야 겠지만 훼손" "될 수 있습니다." -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3633,7 +3675,7 @@ msgstr "메모리카드 파일크기가 헤더 크기와 불일치합니다" msgid "Menu" msgstr "메뉴" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "마이크" @@ -3646,7 +3688,7 @@ msgstr "최소값" msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "기타 설정" @@ -3794,7 +3836,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3841,7 +3883,7 @@ msgstr "ISO나 WADS가 없음" msgid "No audio output" msgstr "오디오 출력이 없습니다" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "%s 타이틀에 대한 배너 파일이 없음" @@ -3867,7 +3909,7 @@ msgstr "빈 디렉토리 목록 엔트리들이 없음" msgid "No recorded file" msgstr "녹화된 파일이 없음" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "%s 타이틀에 대한 저장 폴더가 없음" @@ -3876,11 +3918,11 @@ msgstr "%s 타이틀에 대한 저장 폴더가 없음" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "없음" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "노르웨이 북몰어" @@ -3888,17 +3930,17 @@ msgstr "노르웨이 북몰어" msgid "Not Equal" msgstr "같지 않음" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "설정 안함" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "Wii 저장이 아니거나 파일 헤더 크기 %x 에 대한 읽기 실패 " -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "연결되지 않음" @@ -3944,7 +3986,7 @@ msgstr "오브젝트" msgid "Object Range" msgstr "오브젝트 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "끔" @@ -3952,16 +3994,20 @@ msgstr "끔" msgid "Offset:" msgstr "오프셋:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "온-스크린 메시지 보여주기" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "%d 블럭들만 유용한" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "열기" @@ -3974,7 +4020,7 @@ msgstr "담고 있는 폴더 열기(&c)" msgid "Open Wii &save folder" msgstr "Wii 저장 폴더 열기(&s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "파일 열기..." @@ -4000,6 +4046,16 @@ msgstr "OpenCL 텍스처 디코더" msgid "OpenMP Texture Decoder" msgstr "OpenMP 텍스처 디코더" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4022,7 +4078,7 @@ msgstr "파일 디렉토리안에 파일의 순서가 블럭 순서와 맞지 msgid "Other" msgstr "다른 것들" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4034,7 +4090,7 @@ msgstr "" msgid "Output" msgstr "출력" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "(입력) 기록 재생(&l)..." @@ -4042,7 +4098,7 @@ msgstr "(입력) 기록 재생(&l)..." msgid "Pad" msgstr "패드" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "패드" @@ -4071,21 +4127,21 @@ msgstr "매개변수들" msgid "Partition %i" msgstr "파티션 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "경로" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "일시정지" @@ -4098,7 +4154,7 @@ msgstr "무비의 끝에서 멈추기" msgid "Per-Pixel Lighting" msgstr "픽셀단위 광원" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "완벽한" @@ -4108,9 +4164,9 @@ msgid "Perspective %d" msgstr "관점 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr " 실행 " @@ -4122,7 +4178,7 @@ msgstr "(입력) 기록 재생" msgid "Play/Pause" msgstr "실행/일시정지" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "플레이가능" @@ -4130,11 +4186,11 @@ msgstr "플레이가능" msgid "Playback Options" msgstr "재생 옵션" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "플레이어" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "확인해주세요..." @@ -4146,36 +4202,36 @@ msgstr "저장하기전에 관점을 생성해 주세요." msgid "Plus-Minus" msgstr "플러스-마이너스" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "폴란드어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "포트 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "포트 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "포트 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "포트 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "포트:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "포르투갈어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "포르투갈어 (브라질)" @@ -4183,17 +4239,17 @@ msgstr "포르투갈어 (브라질)" msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayController에 영상마무리가 미완성되었습니다. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u > %u" @@ -4226,7 +4282,7 @@ msgstr "프로파일" msgid "Properties" msgstr "속성" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "캐쉬 제거(Purge)" @@ -4234,8 +4290,8 @@ msgstr "캐쉬 제거(Purge)" msgid "Question" msgstr "질문" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "종료" @@ -4296,6 +4352,11 @@ msgstr "리얼 위모트" msgid "Record" msgstr "녹화" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "녹화 옵션" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "녹화 정보" @@ -4331,7 +4392,7 @@ msgstr "" "모르겠으면, 없음을 선택하세요." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "갱신" @@ -4340,14 +4401,14 @@ msgstr "갱신" msgid "Refresh List" msgstr "목록 새로 고침" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "게임 목록 새로 고침" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "제거" @@ -4378,7 +4439,7 @@ msgstr "결과" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4396,15 +4457,15 @@ msgstr "오른쪽 스틱" msgid "Rumble" msgstr "진동" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "DSP HLE와 LLE를 전용 쓰레드상에서 구동합니다 (권장되지 않습니다: HLE로는 오디" "오 결함들을 유발하고 LLE로는 얼어버릴지 모릅니다)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "러시아어" @@ -4417,7 +4478,7 @@ msgid "Safe" msgstr "안전" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "저장" @@ -4478,28 +4539,28 @@ msgstr "슬롯8 상태 저장" msgid "Save State Slot 9" msgstr "슬롯1 상태 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "상태 저장..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "다른 이름으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "압축된 GCM/ISO를 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "현재 관점을 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지..." @@ -4521,7 +4582,7 @@ msgstr "ISO들을 검사하기" msgid "Scanning..." msgstr "스캐닝..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "스크린샷" @@ -4537,7 +4598,7 @@ msgstr "찾기" msgid "Search Filter" msgstr "필터 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "하위폴더들 찾기" @@ -4560,12 +4621,12 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음" msgid "Select" msgstr "선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "기록 파일 선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD 파일 선택" @@ -4587,19 +4648,19 @@ msgstr "가져올 저장 파일을 선택" msgid "Select floating windows" msgstr "유동적인 윈도우즈 선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "로드할 파일 선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "저장 파일을 선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "로드할 상태 선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "저장할 상태 선택" @@ -4677,7 +4738,7 @@ msgstr "" "\n" "모르겠으면, Direct3D 9을 사용하세요." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "보내기" @@ -4689,11 +4750,11 @@ msgstr "센서 바 위치:" msgid "Separator" msgstr "분리자" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "시리얼 포트 1 - 이것은 넷 어댑터같은 디바이스가 사용하는 포트이다" @@ -4712,7 +4773,7 @@ msgstr "기본 메모리카드 %c 로 설정" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: 목록이 ar 코드 목록 크기 %lu 보다 더 큽니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4720,19 +4781,20 @@ msgstr "" "지연(ms 단위로)을 설정합니다. 더 높은 값은 오디오 튐을 줄일 지도 모릅니다. " "OpenAL 백엔드 전용." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "설정..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: 설정 파일을 찾을 수 없음" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "흔들기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "단축 이름:" @@ -4740,23 +4802,28 @@ msgstr "단축 이름:" msgid "Shoulder Buttons" msgstr "숄더 버튼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "콘솔 보기(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "로그 보기(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "상태바 표시(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "툴바 표시(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "기본" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "드라이브 표시" @@ -4768,11 +4835,11 @@ msgstr "EFB 복사 영역" msgid "Show FPS" msgstr "FPS 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "게임큐브" @@ -4780,35 +4847,35 @@ msgstr "게임큐브" msgid "Show Input Display" msgstr "입력 표시 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "이탈리아" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "JAP (일본 방식)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "한국" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "언어 보기:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "로그 환경설정(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "PAL (유럽 방식)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "플랫폼 표시" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "지역 표시" @@ -4816,27 +4883,27 @@ msgstr "지역 표시" msgid "Show Statistics" msgstr "통계들" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "타이완" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "USA (미국 방식)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "게임을 멈추기 전에 확인 상자 보여주기." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4854,7 +4921,7 @@ msgstr "첫번째 블럭 보기" msgid "Show lag counter" msgstr "랙 계측기 보여주기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4891,7 +4958,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "알려지지 않음" @@ -4909,7 +4976,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "사이드웨이 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "간소화 중국어" @@ -4917,11 +4984,11 @@ msgstr "간소화 중국어" msgid "Size" msgstr "크기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "바이오스 스킵" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "DCBZ 청소 건너뛰기" @@ -4945,17 +5012,17 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "슬롯 B" @@ -4963,7 +5030,7 @@ msgstr "슬롯 B" msgid "Snapshot" msgstr "스냅샷" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "소프트웨어 렌더러" @@ -4978,7 +5045,7 @@ msgstr "" "디버깅 목적으로만 유용합니다.\n" "소프트웨어 렌더링을 활성을 정말 원합니까? 모르겠으면, '아니오'를 선택하세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "사운드 설정" @@ -4996,9 +5063,9 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s" msgid "Space" msgstr "스페이스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "스페인어" @@ -5026,37 +5093,29 @@ msgstr "" "\n" "모르겠으면, 640x528를 선택하세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "디스크 전송율 속도 상승" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "스퀘어 스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "표준 컨트롤러" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "시작" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "넷플레이 시작(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "(입력) 기록 시작(&c)" @@ -5072,7 +5131,7 @@ msgstr "상태" msgid "State Saves" msgstr "상태 저장" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "운전대" @@ -5081,7 +5140,7 @@ msgid "Stick" msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "중지" @@ -5111,16 +5170,16 @@ msgstr "스트럼" msgid "Subtract" msgstr "빼기" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "성공적으로 파일을 %s로 내보냈음" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "세이브 파일들을 성공적으로 가져왔음" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5128,11 +5187,11 @@ msgstr "" msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "GPU 쓰레드 동기화" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5140,8 +5199,8 @@ msgstr "" "듀얼 코어 모드에서 랜덤 프리징들 막기를 돕기위해 GPU와 CPU 쓰레드들을 동기화" "합니다. (켬 = 호환성, 끔 = 빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "시스템 언어:" @@ -5170,13 +5229,13 @@ msgstr "테이블 왼쪽" msgid "Table Right" msgstr "테이블 오른쪽" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "스크린샷 찍기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "타루콩가 (봉고스)" @@ -5196,7 +5255,7 @@ msgstr "텍스처 캐쉬" msgid "Texture Format Overlay" msgstr "텍스처 포멧 오버레이" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD가 성공적으로 설치되었습니다" @@ -5208,13 +5267,13 @@ msgstr "그 주소는 비적합 입니다" msgid "The checksum was successfully fixed" msgstr "체크섬이 성공적으로 고쳐졌습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "선택된 디렉토리는 이미 리스트에 있다" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5269,7 +5328,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "당신이 복사하려는 저장은 비적합 파일 크기입니다." -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5277,23 +5336,23 @@ msgstr "" "선택된 언어는 당신의 시스템에서 지원되지 않습니다. 시스템 디폴트로 돌아갑니" "다." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "서버와 클라이언트의 넷플레이 버전들이 호환되지 않는다!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "서버가 가득참!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "서버가 응답했습니다: 그 게임은 현재 구동중이다!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "서버가 알려지지 않은 에러 메시지를 보냈음!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "기술된 \"%s\" 파일은 존재하지 않는다" @@ -5302,11 +5361,11 @@ msgstr "기술된 \"%s\" 파일은 존재하지 않는다" msgid "The value is invalid" msgstr "값이 비적합 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "테마:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5314,7 +5373,7 @@ msgstr "" "00000001/00000002에 대한 티켓이 있어야한다. 당신의 NAND 덤프는 아마도 미완성" "이다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5330,7 +5389,7 @@ msgstr "" "이 액션 리플레이 시뮬레이터는 액션 리플레이 스스로 수정한 코드를 지원하지 않" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "이것은 Wii 메뉴와 일부 게임들에서 느려짐을 유발할 수 있다." @@ -5354,7 +5413,7 @@ msgstr "" "\\n\n" "모르겠으면. 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5366,7 +5425,7 @@ msgstr "" "이용해 오디오 병목을 사용하세요 (게임에 따라서는 소리 끊김들을 고칠지 모르지" "만 또한 지속적인 잡음을 유발할 수도 있습니다)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5420,7 +5479,7 @@ msgstr "EFB 복사" msgid "Toggle Fog" msgstr "모든 로그 타입 토글" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "전체화면 토글" @@ -5430,11 +5489,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "전통 중국어" @@ -5458,7 +5517,7 @@ msgstr "" "효한 SYSCONF에서 읽기 시도\n" "위모트 bt id들은 유용하지 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "터키어" @@ -5511,7 +5570,7 @@ msgstr "" "니다. 올바로 타이핑했는지 확인하세요\n" "이 라인을 무시하고 분석을 계속하겠습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "정의되지 않은 %i" @@ -5548,12 +5607,12 @@ msgstr "알려지지 않은 명령 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "알려지지 않은 엔트리 타입 %i SYSCONF (%s@%x)안에!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "id : %d의 알려지지 않은 메시지를 받었다" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5573,7 +5632,7 @@ msgstr "업데이트" msgid "Upright Wiimote" msgstr "업라이트 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" @@ -5585,7 +5644,7 @@ msgstr "전체화면 사용" msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" @@ -5609,6 +5668,15 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5631,7 +5699,7 @@ msgstr "유틸리티" msgid "V-Sync" msgstr "수직-동기화" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU 스피드 핵" @@ -5656,7 +5724,7 @@ msgstr "상세설명" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "비디오" @@ -5664,17 +5732,17 @@ msgstr "비디오" msgid "Virtual" msgstr "가상" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "볼륨" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD 설치 실패했습니다: 에러 생성 %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "WAD 설치 실패했습니다: 에러 생성 티켓" @@ -5708,7 +5776,7 @@ msgstr "경고 - 잘못된 콘솔 모드에서 ELF 시작!" msgid "Warning - starting ISO in wrong console mode!" msgstr "경고 - 잘못된 콘솔 모드에서 ISO 시작!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5732,7 +5800,7 @@ msgstr "" "그리고 당신의 메모리카드에 파일로 같은 이름을 가집니다\n" "계속합니까?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5743,7 +5811,7 @@ msgstr "" "%u > %u). You should load another save before continuing, or load this state " "with read-only mode off." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5754,7 +5822,7 @@ msgstr "" "전에 다른 세이브를 로드해야합니다, 혹은 읽기-전용 모드를 끄고 로드하세요. 그" "렇지 않으면 아마도 싱크 어긋남이 생길겁니다." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5804,23 +5872,19 @@ msgstr "와이드스크린 핵" msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Wii 저장 가져오기" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파일들 (*.bin)|*.bin" @@ -5829,7 +5893,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: 파일로 부터 읽을 수 없었습니다" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "위모트" @@ -5838,7 +5902,7 @@ msgstr "위모트" msgid "Wiimote %i" msgstr "위모트 %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "위모트가 연결됨" @@ -5846,7 +5910,7 @@ msgstr "위모트가 연결됨" msgid "Wiimote Motor" msgstr "위모트 모터" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "위모트 설정" @@ -5870,14 +5934,14 @@ msgstr "윈도우즈 오른쪽" msgid "Word Wrap" msgstr "자동 줄바꿈" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "작동중..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5942,7 +6006,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "당신은 페이지들을 가진 창을 닫을 수 없습니다." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "게임을 선택해야 합니다!!" @@ -5958,7 +6022,7 @@ msgstr "적합한 10진수나 16진수나 8진수 값을 넣어야 합니다." msgid "You must enter a valid profile name." msgstr "적합한 프로파일 이름을 넣어야 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "변경이 적용되려면 돌핀을 재시작 해야 합니다." @@ -5972,7 +6036,7 @@ msgstr "" "문제를 고치기위해 지금 중단하시겠습니까?\n" "\"아니오\"를 선택하면, 오디오가 왜곡될 지도 모릅니다." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5991,7 +6055,7 @@ msgstr "" "0x%04x 이어야합니다 (하지만 0x%04llx 임) \n" "새로 생성하시겠습니까?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP 핵" @@ -6057,7 +6121,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "앱로더 (.img)" @@ -6070,7 +6134,17 @@ msgstr "iCacheJIT: %x 에서 옵코드 읽기. 보고해주세요." msgid "s" msgstr "들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "id : %d의 알려지지 않은 메시지를 받었다" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "애플리케이션 구동상에서 wxExecute가 -1을 반환했습니다!" @@ -6103,9 +6177,27 @@ msgstr "| OR" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x 에 의해 위모트를 찾을 수 없음" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "패드들을 설정할 수 없었습니다. 플레이어가 떠났거나 게임이 현재 구동중!\n" +#~ "(게임이 구동중일 때 패드들을 설정하기는 아직 지원되지 않습니다)" + #~ msgid "Enable Hotkeys" #~ msgstr "단축키 활성(그래픽 컨트롤)" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OpenAL 백엔" +#~ "드 전용. 작동시키려면 soft_oal.dll 을 OpenAL32.dll 로 이름바꾸기가 필요할 " +#~ "지도." + +#~ msgid "Export failed, try again?" +#~ msgstr "내보내기 실패했습니다, 다시 시도?" + #~ msgid "Failed to Listen!!" #~ msgstr "듣기에 실패했습니다!!" @@ -6130,12 +6222,21 @@ msgstr "| OR" #~ "FPS가 불규칙적이면, 이 옵션이 도움이 될 수도 있습니다. (켬 = 호환성, 끔 = " #~ "빠름)" +#~ msgid "Import failed, try again?" +#~ msgstr "가져오기 실패했습니다, 재시도?" + +#~ msgid "In-Game" +#~ msgstr "게임-안" + #~ msgid "Last Overwritten State" #~ msgstr "마지막 덮어써진 상태" #~ msgid "Last Saved State" #~ msgstr "마지막 저장된 상태" +#~ msgid "Local" +#~ msgstr "지역" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "상태 로딩시 위모트 재연결" @@ -6157,3 +6258,6 @@ msgstr "| OR" #~ "난 결함들을 유발할지도 모릅니다.\n" #~ "\n" #~ "모르겠으면, 이것을 언체크로 두세요." + +#~ msgid "Wii Save Import" +#~ msgstr "Wii 저장 가져오기" diff --git a/Languages/po/nb.po b/Languages/po/nb.po index b61a31e9ff..255ed1103c 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-18 22:56-0500\n" "Last-Translator: KHRZ \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/dolphin-" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr "(for mange til til å vises)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Spill :" @@ -43,7 +43,7 @@ msgstr "" "\"%s\" eksisterer ikke.\n" " Lag et nytt 16MB Minnekort?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." @@ -68,8 +68,8 @@ msgstr "%d samples" msgid "%d samples (quality level %d)" msgstr "%d samples (kvalitetsnivå %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s eksisterer allerede. Overskriv?" @@ -106,12 +106,17 @@ msgstr "" "%s mislyktes i å laste som et minnekort \n" " Minnekortstørrelse er for liten til å være et gyldig minnekort (0x%x byte)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s kunne ikke åpne" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s kunne ikke åpne" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s er en 0-byte fil" @@ -121,7 +126,7 @@ msgstr "%s er en 0-byte fil" msgid "%s is already compressed! Cannot compress it further." msgstr "%s er allerede komprimert! Kan ikke komprimere videre." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s er for langt for et filnavn, maks antall tegn er 45" @@ -150,7 +155,7 @@ msgstr "%u Ledige Blokker; %u Ledige Dir Entries" msgid "&& AND" msgstr "&& OG" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Om..." @@ -158,7 +163,7 @@ msgstr "&Om..." msgid "&Boot from DVD Drive..." msgstr "&Start fra DVD-stasjon..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Breakpoints" @@ -166,7 +171,7 @@ msgstr "&Breakpoints" msgid "&Browse for ISOs..." msgstr "&Bla etter ISO-filer..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Jukse&kode-manager" @@ -190,11 +195,11 @@ msgstr "&Emulasjon" msgid "&File" msgstr "&Fil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Bilde Forover" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Fullskjerm" @@ -202,7 +207,7 @@ msgstr "&Fullskjerm" msgid "&Graphics Settings" msgstr "&Konfigurer Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Hjelp" @@ -210,7 +215,7 @@ msgstr "&Hjelp" msgid "&Hotkey Settings" msgstr "Innstillinger for &Hot-tast" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -222,11 +227,11 @@ msgstr "Last &inn Save State" msgid "&Memcard Manager (GC)" msgstr "&Minnekort Manager (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Minne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Åpne..." @@ -234,11 +239,11 @@ msgstr "&Åpne..." msgid "&Options" msgstr "&Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Spill" @@ -246,39 +251,39 @@ msgstr "&Spill" msgid "&Properties" msgstr "&Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "Les-kun &modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Restart" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Lyd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "S&topp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Verktøy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "Vi&s" @@ -367,7 +372,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -375,7 +380,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -383,8 +388,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Et NetPlay-vindu er allerede oppe!" @@ -411,8 +416,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -437,13 +440,13 @@ msgstr "" "\n" "Du må fremme TCP-porten til verten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "" @@ -576,11 +579,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Legg til Patch" @@ -588,9 +591,9 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Legg til..." @@ -642,36 +645,36 @@ msgstr "Juster analogkontrolltrykket som kreves for å aktivere knapper." msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GameCube/Wii filer (elf, dol, gcm, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GameCube/Wii avbildningsfiler/rip (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" @@ -701,7 +704,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke å laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Applikasjonslaster:" @@ -719,7 +722,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabisk" @@ -728,7 +731,7 @@ msgstr "Arabisk" msgid "Are you sure you want to delete \"%s\"?" msgstr "Er du sikker på at du vil slette \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,17 +739,17 @@ msgstr "" "Er du sikker på at du vil slette disse filene?\n" "De vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Er du sikker på at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (eksperimentell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -755,12 +758,12 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute må stå åpen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -768,7 +771,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved åpning av AO-device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Automatisk" @@ -807,7 +810,7 @@ msgstr "BP-register" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Backend-innstillinger" @@ -825,7 +828,7 @@ msgstr "Bakgrunnsinndata" msgid "Backward" msgstr "Bakover" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Dårlig Fil-header" @@ -838,11 +841,11 @@ msgstr "" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Banner:" @@ -854,7 +857,7 @@ msgstr "Bar" msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -883,7 +886,7 @@ msgid "Blue Right" msgstr "Blå Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Bunn" @@ -892,11 +895,11 @@ msgstr "Bunn" msgid "Bound Controls: %lu" msgstr "Bundede Kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Ødelagt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Bla i" @@ -904,15 +907,15 @@ msgstr "Bla i" msgid "Browse for a directory to add" msgstr "Bla etter en mappe å legge til" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Bla etter en ISO-mappe..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Bla etter lagringssted" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -922,7 +925,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Knapper" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -946,7 +949,7 @@ msgstr "C-joystick" msgid "CP reg" msgstr "CP-register" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" @@ -968,7 +971,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Kan ikke finne WiiMote fra koblingshandler %02x" @@ -983,9 +986,9 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Cancel" msgstr "Avbryt" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Kan ikke åpne %s" @@ -994,7 +997,7 @@ msgstr "Kan ikke åpne %s" msgid "Cannot unregister events with events pending" msgstr "Kan ikke avregistrere events med events under behandling" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1005,7 +1008,7 @@ msgstr "" " %s\n" " er ikke en gyldig GameCube-minnekortfil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1017,7 +1020,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalansk" @@ -1025,11 +1028,11 @@ msgstr "Katalansk" msgid "Center" msgstr "Senter" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Endre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Endre &Disk..." @@ -1037,11 +1040,11 @@ msgstr "Endre &Disk..." msgid "Change Disc" msgstr "Endre Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Endre Spill" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1057,11 +1060,11 @@ msgstr "Endringer signeres til zFar-parameteren (etter korreksjon)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Endringer signeres til zNear-parameteren (etter korreksjon)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Å endre dette vil ikke ha noen effekt mens emulatoren kjører!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1077,39 +1080,39 @@ msgstr "Juksekodesøk" msgid "Cheats Manager" msgstr "Juksekode Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Sjekk partisjonsintegritet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Sjekker integritet..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Velg en mappe å legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Velg en fil å åpne" @@ -1117,7 +1120,7 @@ msgstr "Velg en fil å åpne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1125,8 +1128,8 @@ msgstr "" "Velg fil til å bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Velg mappen å ekstrahere til" @@ -1145,7 +1148,7 @@ msgstr "Klassisk" msgid "Clear" msgstr "Tøm" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1155,7 +1158,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Lukk" @@ -1180,7 +1183,7 @@ msgstr "Kommando" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Kommentar:" @@ -1192,12 +1195,12 @@ msgstr "Komprimer ISO..." msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Komprimerer ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Konfig" @@ -1211,22 +1214,22 @@ msgstr "Konfigurer" msgid "Configure Control" msgstr "Konfigurer Kontroller" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Konfigurer Kontrollere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" @@ -1235,17 +1238,17 @@ msgstr "Bekreft ved Stans" msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Koble til USB-tastatur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Koble til Wiimote %i" @@ -1266,7 +1269,7 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Kobler til..." @@ -1286,7 +1289,7 @@ msgstr "Kontroll" msgid "Convert to GCI" msgstr "Konverter til GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopi feilet" @@ -1295,7 +1298,7 @@ msgstr "Kopi feilet" msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Kjerne" @@ -1309,7 +1312,7 @@ msgstr "Kunne ikke lage %s" msgid "Could not initialize backend %s." msgstr "Kunne ikke initialisere backend %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1320,25 +1323,16 @@ msgstr "" "ikke en GC/Wii-backup. Vennligst merk at originale GameCube og Wii-disker " "ikke kan leses av de fleste PC-DVD-diskstasjoner." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Kunne ikke gjennkjenne ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Kunne ikke lagre %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Kunne ikke stille inn kontroller. Spilleren har forlatt spillet, eller " -"spillet kjører ikke!\n" -"(Å stille inn kontrollere mens spillet kjøret er foreløpig ikke støttet)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1365,11 +1359,11 @@ msgstr "" "I så tilfelle, må du kanskje re-spesifisere minnekortslokasjonen i " "innstillingene." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne åpningskommandoen for utvidelsen 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1382,7 +1376,7 @@ msgstr "" msgid "Count:" msgstr "Antall:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Land:" @@ -1422,12 +1416,12 @@ msgstr "" msgid "Crossfade" msgstr "Kryssutfase" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Nåværende mappe endret fra %s til %s etter wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Selvdefinert Projeksjons-hack" @@ -1435,11 +1429,11 @@ msgstr "Selvdefinert Projeksjons-hack" msgid "Custom Projection Hack Settings" msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tsjekkisk" @@ -1451,36 +1445,37 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP på Dedikert Tråd" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP på Dedikert Tråd" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD-rot:" @@ -1492,7 +1487,7 @@ msgstr "DVDLowRead - Fatal Feil: Mislyktes i å lese fra volum" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatal Feil: Mislyktes i å lese fra volum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1500,7 +1495,7 @@ msgstr "" msgid "Data Size" msgstr "Datastørrelse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Dato:" @@ -1537,8 +1532,8 @@ msgstr "Dekomprimer ISO..." msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" @@ -1551,7 +1546,7 @@ msgstr "Oppdater spilliste" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Standard-ISO:" @@ -1595,8 +1590,8 @@ msgstr "" msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1608,7 +1603,7 @@ msgstr "Ring" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1676,7 +1671,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disk" @@ -1703,24 +1698,60 @@ msgstr "" msgid "Divide" msgstr "Del" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pågående emulering?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II-dekoder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafikkinstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin &Webside" @@ -1736,12 +1767,12 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1749,7 +1780,7 @@ msgstr "Dolphin TAS-Filmer (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin på &Google Code" @@ -1769,12 +1800,12 @@ msgstr "" "Dolphin er satt til å gjemme alle spill. Dobbeltklikk her for å vise alle " "spill..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin kunne ikke fullføre den forespurte handligen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1801,11 +1832,11 @@ msgstr "Lastet ned %lu koder. (la til %lu)" msgid "Drums" msgstr "Trommer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Dump Audio" @@ -1851,9 +1882,9 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Nederlansk" @@ -1885,7 +1916,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Tidlige Minneoppdateringer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Endre" @@ -1897,16 +1928,20 @@ msgstr "Endre ActionReplay-kode" msgid "Edit Config" msgstr "Endre Konfigurasjon" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Endre Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Endre nåværende perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Endre..." @@ -1918,7 +1953,7 @@ msgstr "Effekt" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (EFB)" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Emulator-CPU-tråden kjører allerede" @@ -1956,7 +1991,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Emulasjonsstatus:" @@ -1984,11 +2019,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Aktiver Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Aktiver Bounding Box-kalkulasjoner" @@ -1996,27 +2031,27 @@ msgstr "Aktiver Bounding Box-kalkulasjoner" msgid "Enable Cache" msgstr "Aktiver cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Aktiver Juksekoder" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Aktiver MMU" @@ -2024,7 +2059,7 @@ msgstr "Aktiver MMU" msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" @@ -2032,7 +2067,7 @@ msgstr "Aktiver Skjermsparer" msgid "Enable Speaker Data" msgstr "Tillat Høytaler Data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Aktiver Widescreen" @@ -2053,7 +2088,7 @@ msgstr "" "\n" "Hvis usikker, velg 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2089,7 +2124,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2097,11 +2132,11 @@ msgstr "" "Aktiver dette for å bedre ytelsen i The Legend Of Zelda: Twillight Princess. " "Deaktiver for andre spill." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2109,22 +2144,13 @@ msgstr "" "Aktiver Dolby Pro Logic II-emulering med 5.1 surround. Ikke tilgjengelig på " "OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Aktiver Dolphin Pro Logic II-emulering med 5.1 surround. Kun for OpenAL " "backend." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Aktiver Dolby Pro Logic II-emulering med 5.1 surround. Kun for OpenAL " -"backend. Det kan hende soft_oal.dll må omdøpes til OpenAL32.dll for at det " -"skal fungere." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2138,7 +2164,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2160,9 +2186,9 @@ msgstr "" msgid "End" msgstr "Slutt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Engelsk" @@ -2191,11 +2217,11 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Feil" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden." @@ -2226,7 +2252,6 @@ msgid "Euphoria" msgstr "Euforia" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Unntakshandler - tilgang under minneområde. %08llx%08llx" @@ -2235,16 +2260,21 @@ msgstr "Unntakshandler - tilgang under minneområde. %08llx%08llx" msgid "Execute" msgstr "Kjør" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Eksporter alle lagringsfiler" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Eksportering mislyktes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Eksporter Fil" @@ -2252,7 +2282,7 @@ msgstr "Eksporter Fil" msgid "Export Recording" msgstr "Eksporter Opptak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Eksporter Opptak..." @@ -2268,9 +2298,10 @@ msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Eksportering mislyktes, prøv igjen?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Eksportering mislyktes" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2292,44 +2323,44 @@ msgstr "Ekstra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Ekstra Parameter nyttig kun i ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Ekstraher Alle Filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Ekstraher Applikasjonslaster..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Ekstraher DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Ekstraher Mappe..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Ekstraher Fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Ekstraherer..." @@ -2345,11 +2376,11 @@ msgstr "FIFO-spiller" msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST-størrelse:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Tilkobling Mislyktes!" @@ -2357,7 +2388,7 @@ msgstr "Tilkobling Mislyktes!" msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2397,16 +2428,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Mislyktes i å lese %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Kunne ikke lese banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Kunne ikke lese bk-header" @@ -2437,12 +2468,12 @@ msgstr "" "Kunne ikke lese blokkallokasjonstabell-backup'en korrekt\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Kunne ikke lese data fra filen %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Kunne ikke lese data fra fil: %s" @@ -2463,7 +2494,7 @@ msgstr "" "Kunne ikke lese mappestien korrekt\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Kunne ikke lese header" @@ -2475,29 +2506,34 @@ msgstr "" "kunne ikke lese headeren korrekt\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Kunne ikke skrive header for filen %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Kunne ikke lese unik ID fra disk-bildet" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Kunne ikke skrive BT.DINF til SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Kunne ikke skrive bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Kunne ikke lese data fra fil: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Kunne ikke skrive header for %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Kunne ikke skrive header for filen %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Persisk" @@ -2509,11 +2545,11 @@ msgstr "Rask" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rask versjon av MMU. Fungerer ikke for alle spill." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2521,7 +2557,7 @@ msgstr "" "Fatal desynkronisering. Avbryter avspilling. (Feil i PlayWiimote: %u != %u, " "byte %u)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo-spiller" @@ -2562,16 +2598,16 @@ msgstr "Filen kjennes ikke igjen som et minnekort" msgid "File not compressed" msgstr "Filen ikke komprimert" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ukjent åpenmodus: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke åpnes!" @@ -2599,7 +2635,7 @@ msgstr "Tving 16:9" msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" @@ -2632,7 +2668,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2654,7 +2690,7 @@ msgstr "" msgid "Forward" msgstr "Send frem" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2663,6 +2699,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Fant %d resultater for '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Kunne ikke lagre %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2692,7 +2733,7 @@ msgstr "Bilderekkevidde" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Framelimit:" @@ -2704,9 +2745,9 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Fransk" @@ -2719,7 +2760,7 @@ msgstr "Frets" msgid "From" msgstr "Fra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "FullSkj" @@ -2731,7 +2772,7 @@ msgstr "Fullskjermsoppløsning:" msgid "GCI File(*.gci)" msgstr "GCI Fil(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC-kontroll" @@ -2739,27 +2780,27 @@ msgstr "GC-kontroll" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "Spill-ID:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Spillet kjører allerede!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Et spill kjører ikke!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Spill ikke funnet!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Spill-spesifikke Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "SpillKonfigurasjon" @@ -2767,7 +2808,7 @@ msgstr "SpillKonfigurasjon" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube-lagringsfiler(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "GameCube" @@ -2776,16 +2817,16 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Innstillinger for GameCube-kontroll" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko-juksekoder" @@ -2803,7 +2844,7 @@ msgstr "" "restart Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Generelt" @@ -2812,9 +2853,9 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Tysk" @@ -2823,11 +2864,11 @@ msgstr "Tysk" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeksen er større enn AR-kodelistens størrelse %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Innstillinger for Grafikk" @@ -2853,7 +2894,7 @@ msgstr "" " \n" " Hvis usikker, la stå deaktivert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Gresk" @@ -2881,7 +2922,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebraisk" @@ -2893,7 +2934,7 @@ msgstr "Høyde" msgid "Help" msgstr "Hjelp" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2920,7 +2961,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2959,7 +3000,7 @@ msgid "Home" msgstr "Hjem" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Vert" @@ -2968,11 +3009,11 @@ msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Ungarsk" @@ -2980,12 +3021,12 @@ msgstr "Ungarsk" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Forsøkte å få data fra en ukjent billett: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -3000,11 +3041,11 @@ msgstr "" "\n" "Dolphin vil sannsynligvis krasje nå." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dårlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Innstillinger for IPL" @@ -3020,11 +3061,11 @@ msgstr "IR-peker" msgid "IR Sensitivity:" msgstr "IR-sensitivitet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "ISO-mapper" @@ -3036,7 +3077,7 @@ msgstr "ITALIA" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3080,9 +3121,15 @@ msgstr "" msgid "Import Save" msgstr "Importer Lagringsfil" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importering mislyktes, prøv igjen?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importer Lagringsfil" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Eksportering mislyktes" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3104,21 +3151,17 @@ msgstr "" "Importert fil har .sav-utvidelse\n" "men har ikke korrekt header" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "I spillet" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "I spillet" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Framelimit:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3138,7 +3181,7 @@ msgstr "Sett Inn" msgid "Insert Encrypted or Decrypted code here..." msgstr "Sett Inn Kryptert eller Dekryptert kode her..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3146,7 +3189,7 @@ msgstr "Sett inn SD-kort" msgid "Insert name here.." msgstr "Sett inn navn her..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Installer WAD" @@ -3154,28 +3197,29 @@ msgstr "Installer WAD" msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Feil i Integritetssjekk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Integritetssjekk fullført" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Integritetssjekk fullført. Ingen feil ble oppdaget." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3184,11 +3228,11 @@ msgstr "" "Integritetssjekk for partisjonen %d feilet. Ditt spill-rip er mest " "sannsynlig korrupt, eller har blitt patchet feil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" @@ -3213,15 +3257,15 @@ msgstr "Intern LZO-feil - lzo_init() mislyktes" msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ugyldig størrelse (%x) eller magisk ord (%x)" @@ -3254,7 +3298,7 @@ msgstr "" "%s\n" " Det kan hende du må re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" @@ -3270,13 +3314,13 @@ msgstr "Ugyldig søkestring (kunne ikke konverte til tall)" msgid "Invalid search string (only even string lengths supported)" msgstr "Ugyldig søkestring (bare strenger av partallslengde støttes)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Ugyldig save state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italiensk" @@ -3284,16 +3328,16 @@ msgstr "Italiensk" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT rekompilator (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentell rekompilator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japansk" @@ -3319,8 +3363,8 @@ msgstr "Hold vindu på toppen" msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Koreansk" @@ -3338,16 +3382,16 @@ msgstr "L-Knappen" msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Språk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Forsinkelse:" @@ -3390,7 +3434,7 @@ msgstr "" msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" @@ -3489,15 +3533,15 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State Slot 9" msgstr "Last Inn Save State Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Last Inn Save State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3516,10 +3560,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Last in pre-satte verdier fra tilgjengelige hack-mønstre." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Lokal" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Logg" @@ -3551,11 +3591,11 @@ msgid "Logger Outputs" msgstr "Logger utdata" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Logging" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Mistet koblingen til server!" @@ -3563,7 +3603,7 @@ msgstr "Mistet koblingen til server!" msgid "M Button" msgstr "M-knappen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3572,7 +3612,7 @@ msgstr "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" @@ -3586,11 +3626,11 @@ msgstr "MadCatz Gameshark-filer(*.gcs)" msgid "Main Stick" msgstr "Hoved-joystick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "Skaper-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Skaper:" @@ -3627,7 +3667,7 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Minnekort" @@ -3639,7 +3679,7 @@ msgstr "" "Minnekort Manager ADVARSEL - Lag backup før du benytter, det skal bli " "fikset, men den kan tukle med lagringsfilene dine!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3664,7 +3704,7 @@ msgstr "Minnekortfilstørrelse matcher ikke header-størrelsen" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mic" @@ -3677,7 +3717,7 @@ msgstr "Minimum" msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3825,7 +3865,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3872,7 +3912,7 @@ msgstr "Ingen ISO- eller WAD-filer funnet" msgid "No audio output" msgstr "Ingen audio-output" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Inngen banner-fil funnet for tittelen %s" @@ -3898,7 +3938,7 @@ msgstr "Ingen ledige mappestiindeks-entries" msgid "No recorded file" msgstr "Ingen opptaksfil" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Ingen lagringsmappe funnet for tittel %s" @@ -3907,11 +3947,11 @@ msgstr "Ingen lagringsmappe funnet for tittel %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norsk Bokmål" @@ -3919,17 +3959,17 @@ msgstr "Norsk Bokmål" msgid "Not Equal" msgstr "Ikke Lik" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Ikke Satt" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "Ikke en Wii-lagringsfil, eller lesefeil for filheaderstørrelse %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3975,7 +4015,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Av" @@ -3983,16 +4023,20 @@ msgstr "Av" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "On-Screen Meldinger" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Kun %d blokker tilgjengelig" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Åpne" @@ -4005,7 +4049,7 @@ msgstr "Åpne &tilholdsmappe" msgid "Open Wii &save folder" msgstr "Åpne Wii-&lagringsfil-mappe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Åpne fil..." @@ -4031,6 +4075,16 @@ msgstr "OpenCL Teksturdekoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4056,7 +4110,7 @@ msgstr "" msgid "Other" msgstr "Annet" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4068,7 +4122,7 @@ msgstr "" msgid "Output" msgstr "Utdata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Spi&llopptak..." @@ -4076,7 +4130,7 @@ msgstr "Spi&llopptak..." msgid "Pad" msgstr "Kontroll" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Kontroll" @@ -4105,21 +4159,21 @@ msgstr "Parametere" msgid "Partition %i" msgstr "Partisjon %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Mappestier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pause" @@ -4132,7 +4186,7 @@ msgstr "Pause på slutten av filmen" msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfekt" @@ -4142,9 +4196,9 @@ msgid "Perspective %d" msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Spill" @@ -4156,7 +4210,7 @@ msgstr "Spill Opptak" msgid "Play/Pause" msgstr "Spill/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Spillbar" @@ -4164,11 +4218,11 @@ msgstr "Spillbar" msgid "Playback Options" msgstr "Avspillingsalterntiver" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Spillere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4180,36 +4234,36 @@ msgstr "Vennligst lag et persektiv før du lagrer" msgid "Plus-Minus" msgstr "Pluss-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" @@ -4217,17 +4271,17 @@ msgstr "Portugisisk (Brasilsk)" msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Prematur filmslutt i PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Prematur filmslutt i PlayWiiote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Prematur filmslutt i PlayWiimote. %u > %u" @@ -4260,7 +4314,7 @@ msgstr "Profil" msgid "Properties" msgstr "Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Tøm Cache" @@ -4268,8 +4322,8 @@ msgstr "Tøm Cache" msgid "Question" msgstr "Spørsmål" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Avslutt" @@ -4330,6 +4384,11 @@ msgstr "Ekte WiiMote" msgid "Record" msgstr "Opptak" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Opptaksinnstillinger" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Opptaksinformasjon" @@ -4366,7 +4425,7 @@ msgstr "" "Hvis usikker, velg ingen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Oppdater" @@ -4375,14 +4434,14 @@ msgstr "Oppdater" msgid "Refresh List" msgstr "Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Oppdater spilliste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Fjern" @@ -4413,7 +4472,7 @@ msgstr "Resultater" msgid "Return" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4431,15 +4490,15 @@ msgstr "Høyre Joystick" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Kjør DSP HLE og LLE på en dedikert tråd (ikke anbefalt: Kan forårsake audio-" "bugs med HLE og krasj med LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russisk" @@ -4452,7 +4511,7 @@ msgid "Safe" msgstr "Sikker" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Lagre" @@ -4513,28 +4572,28 @@ msgstr "Lagre Save State Slot 8" msgid "Save State Slot 9" msgstr "Lagre Save State Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Lagre Save State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Lagre nåværende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." @@ -4556,7 +4615,7 @@ msgstr "Søker etter ISO-filer" msgid "Scanning..." msgstr "Søker..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "SkjDump" @@ -4572,7 +4631,7 @@ msgstr "Søk" msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Søk i Undermapper" @@ -4595,12 +4654,12 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Velg Opptaksfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil å innstallere" @@ -4622,19 +4681,19 @@ msgstr "Velg en lagringsfil å importere" msgid "Select floating windows" msgstr "Velg flytvindu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Velg fil å laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Velg en save state å laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Velg en save state å lagre" @@ -4712,7 +4771,7 @@ msgstr "" " \n" " Hvis usikker, benytt OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Send" @@ -4724,11 +4783,11 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" @@ -4747,7 +4806,7 @@ msgstr "Sett som standard Minnekort %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: indeks er større enn AR-kodelistestørrelsen %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4755,19 +4814,20 @@ msgstr "" "Sett forsinkelsen (i ms). Høyere verdier kan redusere audioknaking. Kun for " "OpenAL backend." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Innstillinger..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Rist" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Kortnavn:" @@ -4775,23 +4835,28 @@ msgstr "Kortnavn:" msgid "Shoulder Buttons" msgstr "Skulderknapper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Vis &Konsoll" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Vis &Logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Vis &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Vis &Verktøylinje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Standard" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Vis DVD-stasjoner" @@ -4803,11 +4868,11 @@ msgstr "Vis Kopieringsregioner for EFB" msgid "Show FPS" msgstr "Vis Bildefrekvens (FPS)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Vis Frankrike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Vis GameCube" @@ -4815,35 +4880,35 @@ msgstr "Vis GameCube" msgid "Show Input Display" msgstr "Vis Inndata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Vis Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Vis JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Vis Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Vis Språk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Vis Loggk&onfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Vis PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Vis Plattformer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Vis Regioner" @@ -4851,27 +4916,27 @@ msgstr "Vis Regioner" msgid "Show Statistics" msgstr "Vis Statistikker" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Vis Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Vis USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Vis WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Vis Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Vis en bekreftelsesboks før spill stoppes." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4890,7 +4955,7 @@ msgstr "Vis første blokk" msgid "Show lag counter" msgstr "Vis lagteller" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4927,7 +4992,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Vis ukjent" @@ -4945,7 +5010,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" @@ -4953,11 +5018,11 @@ msgstr "Simplifisert Kinesisk" msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Hopp over DCBZ-tømming" @@ -4981,17 +5046,17 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -4999,7 +5064,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Stillbilde" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Software-renderer" @@ -5014,7 +5079,7 @@ msgstr "" "Det er kun nyttig for å debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Innstillinger for Audio" @@ -5032,9 +5097,9 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spansk" @@ -5061,37 +5126,29 @@ msgstr "" "\n" "Hvis usikker, velg 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Øk diskoverføringshatighet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Kvadrat-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Standardkontroller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Begynn &Opptak" @@ -5107,7 +5164,7 @@ msgstr "Save State" msgid "State Saves" msgstr "Save State-lagringsfiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Ratt" @@ -5116,7 +5173,7 @@ msgid "Stick" msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Stopp" @@ -5147,16 +5204,16 @@ msgstr "Klimpre" msgid "Subtract" msgstr "Trekk Fra" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Eksportering av fil til %s vellykket" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Importering av lagringsfiler vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5164,11 +5221,11 @@ msgstr "" msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Synkroniser GPU-tråd" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5176,8 +5233,8 @@ msgstr "" "Synkroniserer GPU- og CPU-trådene for å hindre tilfeldige krasj i " "dobbelkjernemodus. (PÅ = kompatibel, AV = raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Systemspråk:" @@ -5206,13 +5263,13 @@ msgstr "Tabell Venstre" msgid "Table Right" msgstr "Tabell Høyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Ta Skjermbilde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongoer)" @@ -5232,7 +5289,7 @@ msgstr "Tekstur-cache" msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "Installasjon av WAD-fil var vellykket" @@ -5244,13 +5301,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5306,30 +5363,30 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Lagringsfilen du forsøker å åpne har en ugyldig filstørrelse" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" "Det valgte språket støttes ikke av ditt system. Faller tilbake til standard." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Serverens og klientens NetPlay-versjoner er ukompitable!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Serveren er full!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Serveren responderte: Spillet kjører!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Serveren sente en ukjent feilmelding!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" @@ -5338,18 +5395,18 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Tema:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "Det må være en billett for 00000001/00000002. Din NAND-dump er ukomplett." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5365,7 +5422,7 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill." @@ -5386,7 +5443,7 @@ msgstr "" "for å flytte raskere og SHIFT + 9 for å flytte saktere). Trykk SHIFT + R for " "å resette kameraet. Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5398,7 +5455,7 @@ msgstr "" "(NTSC:60, PAL:50). Bruk audio for å begrense ved å bruke DSP (kan muligens " "fikse audioklikk, men kan også forårsake støy, avhengig av spillet)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5452,7 +5509,7 @@ msgstr "EFB-kopier" msgid "Toggle Fog" msgstr "Vipp Alle Loggtyper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" @@ -5462,11 +5519,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" @@ -5490,7 +5547,7 @@ msgstr "" "Forsøker å lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Tyrkisk" @@ -5543,7 +5600,7 @@ msgstr "" "kryptert eller dekryptert kode. Sørg for at du tastet den inn korrekt.\n" "Ønsker du å ignorere denne linjen og fortsette parsering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Udefinert %i" @@ -5580,12 +5637,12 @@ msgstr "Ukjent kommando 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Ukjent entry-type %i in SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Ukjent melding mottatt med ID: %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" @@ -5604,7 +5661,7 @@ msgstr "Oppdater" msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" @@ -5616,7 +5673,7 @@ msgstr "Bruk Fullskjerm" msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" @@ -5641,6 +5698,15 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5663,7 +5729,7 @@ msgstr "Verktøyet" msgid "V-Sync" msgstr "Vertikal Synkronisering" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "Ytelses-hack for MMU" @@ -5688,7 +5754,7 @@ msgstr "Verbøsitet" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Video" @@ -5696,17 +5762,17 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-installasjon feilet: Skaper feil %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "WAD-installasjon mislyktes: Feil ved ticket-laging" @@ -5740,7 +5806,7 @@ msgstr "Advarsel - starter ELF i feil konsollmodus!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Advarsel - starter ISO i feil konsollmodus!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5764,7 +5830,7 @@ msgstr "" "og har samme navn som en fil på ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5775,7 +5841,7 @@ msgstr "" "spilles. (Byte %u > %u) (Frame %u > %u). Du burde laste en annen savestate " "før du fortsetter, eller laste denne savestate-en med kun-les modus av." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5787,7 +5853,7 @@ msgstr "" "denne savestate-en med les-kun modus av. Ellers får du sannsynligvis en " "desynkronisering." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5838,23 +5904,19 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importer Wii-lagringsfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5863,7 +5925,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kunne ikke lese fra fil" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5872,7 +5934,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "WiiMote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5880,7 +5942,7 @@ msgstr "Wiimote Tilkoblet" msgid "Wiimote Motor" msgstr "Wiimote-motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Innstillinger for Wiimote" @@ -5904,14 +5966,14 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Arbeider..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5976,7 +6038,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Du kan ikke lukke panelene som har sider/faner i dem." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Du må velge et spill!" @@ -5992,7 +6054,7 @@ msgstr "Du må skrive inn en gyldig desimal, hexadesimal eller octal verdi." msgid "You must enter a valid profile name." msgstr "Du må skrive inn et gyldig profilnavn." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Du må restarte Dolphin for at endringen skal tre i kraft." @@ -6006,7 +6068,7 @@ msgstr "" " Vil du stoppe nå for å fikse problemet=\n" " Hvis du velger \"Nei\", kan audio ha knasing." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6025,7 +6087,7 @@ msgstr "" "Den skal være 0x%04x (men er 0x%04llx)\n" "Ønsker du å generere en ny en?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP-hack" @@ -6091,7 +6153,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -6104,7 +6166,17 @@ msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Ukjent melding mottatt med ID: %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 på applikasjonskjøring!" @@ -6138,9 +6210,28 @@ msgstr "| ELLER" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "Kan ikke finne WiiMote med bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Kunne ikke stille inn kontroller. Spilleren har forlatt spillet, eller " +#~ "spillet kjører ikke!\n" +#~ "(Å stille inn kontrollere mens spillet kjøret er foreløpig ikke støttet)" + #~ msgid "Enable Hotkeys" #~ msgstr "Aktiver Snarveistaster" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Aktiver Dolby Pro Logic II-emulering med 5.1 surround. Kun for OpenAL " +#~ "backend. Det kan hende soft_oal.dll må omdøpes til OpenAL32.dll for at " +#~ "det skal fungere." + +#~ msgid "Export failed, try again?" +#~ msgstr "Eksportering mislyktes, prøv igjen?" + #~ msgid "Failed to Listen!!" #~ msgstr "Lytting Mislyktes!" @@ -6165,12 +6256,21 @@ msgstr "| ELLER" #~ "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÅ = " #~ "Kompitabelt, AV = Raskt)" +#~ msgid "Import failed, try again?" +#~ msgstr "Importering mislyktes, prøv igjen?" + +#~ msgid "In-Game" +#~ msgstr "I spillet" + #~ msgid "Last Overwritten State" #~ msgstr "Siste Overskrevne Save State:" #~ msgid "Last Saved State" #~ msgstr "Siste Save State:" +#~ msgid "Local" +#~ msgstr "Lokal" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Gjenntilkoble Wiimote ved Lasting av Save State" @@ -6192,3 +6292,6 @@ msgstr "| ELLER" #~ "spesifikasjonen og kan forårsake store bugs.\n" #~ " \n" #~ " Hvis usikker, la stå deaktivert." + +#~ msgid "Wii Save Import" +#~ msgstr "Importer Wii-lagringsfil" diff --git a/Languages/po/nl.po b/Languages/po/nl.po index c328901193..de3ab1c89c 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-17 16:38+0000\n" "Last-Translator: Garteal \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/dolphin-emu/" @@ -25,9 +25,9 @@ msgstr "" msgid " (too many to display)" msgstr "(te veel om weer te geven)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " Spel :" @@ -44,7 +44,7 @@ msgstr "" "\"%s\" bestaat niet.\n" "Wilt u een nieuwe 16MB geheugenkaart aanmaken?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." @@ -69,8 +69,8 @@ msgstr "%d samples" msgid "%d samples (quality level %d)" msgstr "%d samples (kwaliteitsniveau %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s bestaat al, wilt u het vervangen?" @@ -109,12 +109,17 @@ msgstr "" "Bestand is niet groot genoeg om een geldige geheugenkaart bestand te zijn (0x" "%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "Kon %s niet openen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "Kon %s niet openen" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s is een 0 byte bestand" @@ -124,7 +129,7 @@ msgstr "%s is een 0 byte bestand" msgid "%s is already compressed! Cannot compress it further." msgstr "%s is al gecomprimeerd! Kan niet nog meer comprimeren." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s is te lang voor de bestandsnaam, maximaal aantal karakters is 45" @@ -153,7 +158,7 @@ msgstr "%u Vrije Blokken; %u Vrije Bestands Invoer" msgid "&& AND" msgstr "&& EN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Over..." @@ -161,7 +166,7 @@ msgstr "&Over..." msgid "&Boot from DVD Drive..." msgstr "&Start van DVD Drive..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Breekpunten" @@ -169,7 +174,7 @@ msgstr "&Breekpunten" msgid "&Browse for ISOs..." msgstr "&Blader voor ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Cheats Manager" @@ -193,11 +198,11 @@ msgstr "&Emulatie" msgid "&File" msgstr "&Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Frame Avanceren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Volledig Scherm" @@ -205,7 +210,7 @@ msgstr "&Volledig Scherm" msgid "&Graphics Settings" msgstr "&Grafische Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Help" @@ -213,7 +218,7 @@ msgstr "&Help" msgid "&Hotkey Settings" msgstr "&Sneltoets Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -225,11 +230,11 @@ msgstr "&Laad staat" msgid "&Memcard Manager (GC)" msgstr "&Geheugenkaart Manager (GC) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Geheugen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Open..." @@ -237,11 +242,11 @@ msgstr "&Open..." msgid "&Options" msgstr "&Opties " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pauze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Speel " @@ -249,39 +254,39 @@ msgstr "&Speel " msgid "&Properties" msgstr "&Eigenschappen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Lijst Vernieuwen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Geluid " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Tools" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Bekijk " @@ -370,7 +375,7 @@ msgstr " " msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -378,7 +383,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -386,8 +391,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Er is al een NetPlay venster geopend!" @@ -414,8 +419,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -441,13 +444,13 @@ msgstr "" "\n" "Je moet de TCP poort forwarden voor het hosten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR Codes" @@ -580,11 +583,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Voeg een ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Voeg een Patch toe" @@ -592,9 +595,9 @@ msgstr "Voeg een Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Voeg toe..." @@ -647,36 +650,36 @@ msgstr "" msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Alle Save Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" @@ -704,7 +707,7 @@ msgstr "Apploader heeft de verkeerde grootte.. is het wel echt een Apploader?" msgid "Apploader unable to load from file" msgstr "Apploader kan het bestand niet laden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader :" @@ -722,7 +725,7 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabisch" @@ -731,7 +734,7 @@ msgstr "Arabisch" msgid "Are you sure you want to delete \"%s\"?" msgstr "Weet je zeker dat je \"%s\"? wilt verwijderen?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -739,17 +742,17 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen?\n" "Deze gegevens zijn niet terug te halen!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (Experimenteel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -758,12 +761,12 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Geluid Backend:" @@ -771,7 +774,7 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -810,7 +813,7 @@ msgstr "BP register " msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Backend Instellingen" @@ -828,7 +831,7 @@ msgstr "Achtergrond invoer" msgid "Backward" msgstr "Terug" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Verkeerde bestands header" @@ -841,11 +844,11 @@ msgstr "" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Banner:" @@ -857,7 +860,7 @@ msgstr "Balk" msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -886,7 +889,7 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Onder" @@ -895,11 +898,11 @@ msgstr "Onder" msgid "Bound Controls: %lu" msgstr "Gekoppelde controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Defect" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Zoek" @@ -907,15 +910,15 @@ msgstr "Zoek" msgid "Browse for a directory to add" msgstr "Zoek een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Zoek een ISO folder" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -925,7 +928,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Knoppen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -949,7 +952,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "CP Reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" @@ -973,7 +976,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Kan Wiimote met verbinding %02x niet vinden" @@ -988,9 +991,9 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatale Error" msgid "Cancel" msgstr "Annuleer" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Kan %s niet openen" @@ -999,7 +1002,7 @@ msgstr "Kan %s niet openen" msgid "Cannot unregister events with events pending" msgstr "Kan geen events afmelden als er events in afwachting zijn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1010,7 +1013,7 @@ msgstr "" "%s\\n\n" "is geen geldig gamecube geheugenkaart bestand." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1022,7 +1025,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalaans" @@ -1030,11 +1033,11 @@ msgstr "Catalaans" msgid "Center" msgstr "Middelpunt" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Verander" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Verander &Schijf" @@ -1042,11 +1045,11 @@ msgstr "Verander &Schijf" msgid "Change Disc" msgstr "Verander Schijf" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Spel veranderen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1062,11 +1065,11 @@ msgstr "Verandert teken van zVer parameter (na correctie)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Verandert teken van zDichtbij parameter (na correctie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Het heeft geen effect als je dit veranderd wanneer de emulator draait!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1082,39 +1085,39 @@ msgstr "Cheat Zoeken" msgid "Cheats Manager" msgstr "Cheats Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Controleer Partitie integriteit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Integriteit controleren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1122,7 +1125,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1130,8 +1133,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Kies de folder om naar uit te pakken" @@ -1150,7 +1153,7 @@ msgstr "Klassiek" msgid "Clear" msgstr "Legen" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1160,7 +1163,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Sluit" @@ -1185,7 +1188,7 @@ msgstr "Commando" msgid "Comment" msgstr "Reactie" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Reactie:" @@ -1197,12 +1200,12 @@ msgstr "Comprimeer ISO ..." msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Config" @@ -1216,22 +1219,22 @@ msgstr "Configureer" msgid "Configure Control" msgstr "Configureer Besturing" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Configureer Besturing Pads" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Bevestiging bij Stop" @@ -1240,17 +1243,17 @@ msgstr "Bevestiging bij Stop" msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Verbind USB Toetsenbord" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Verbind Wiimote %i" @@ -1271,7 +1274,7 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Verbinden..." @@ -1291,7 +1294,7 @@ msgstr "Bestuur" msgid "Convert to GCI" msgstr "Omzetten naar GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopiëren mislukt" @@ -1300,7 +1303,7 @@ msgstr "Kopiëren mislukt" msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Core" @@ -1314,7 +1317,7 @@ msgstr "Het volgende bestanden kon niet gemaakt worden %s " msgid "Could not initialize backend %s." msgstr "Kon de %s backend niet initialiseren." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1325,25 +1328,16 @@ msgstr "" "geen GC/Wii backup.Meeste PC DVD drives kunnen geen originele Gamecube en " "Wii schijven lezen!" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Kon ISO bestand %s niet herkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Kon %s niet opslaan" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Kon de pads niet instellen. De speler heeft het spel verlaten, of het spel " -"draait nog!\n" -"(pads instellen terwijl het spel draait wordt nog niet ondersteund)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1365,11 +1359,11 @@ msgstr "" "Zo ja, dan moet je je memory card locatie opnieuw aangeven in de " "configuratie." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1382,7 +1376,7 @@ msgstr "" msgid "Count:" msgstr "Tel:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Land:" @@ -1422,12 +1416,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Huidige map verandert van %s naar %s na wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Aangepaste Projectie Hack" @@ -1435,11 +1429,11 @@ msgstr "Aangepaste Projectie Hack" msgid "Custom Projection Hack Settings" msgstr "Aangepaste Projectie Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tsjechisch" @@ -1451,36 +1445,37 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP op toegeweide thread" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP op toegeweide thread" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD Station:" @@ -1492,7 +1487,7 @@ msgstr "DVDLowRead - Fatale Error: kan het volume niet lezen" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatale Error: kan het volume niet lezen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1500,7 +1495,7 @@ msgstr "" msgid "Data Size" msgstr "Data grootte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Datum:" @@ -1537,8 +1532,8 @@ msgstr "Decomprimeer ISO..." msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" @@ -1551,7 +1546,7 @@ msgstr "Ververs de speellijst" msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Standaard ISO:" @@ -1595,8 +1590,8 @@ msgstr "" msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1608,7 +1603,7 @@ msgstr "Bellen" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1676,7 +1671,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Schijf" @@ -1703,24 +1698,60 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II decodering" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafische Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1736,12 +1767,12 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1749,7 +1780,7 @@ msgstr "Dolphin TAS Film (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin op &Google Code" @@ -1768,12 +1799,12 @@ msgstr "" "Dolphin is ingesteld om alle spellen te verbergen. Dubbelklik hier om alle " "spellen te weergeven..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin kan de verzochte actie niet uitvoeren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1800,11 +1831,11 @@ msgstr "%lu codes gedownload. (%lu toegevoegd)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Dump Geluid" @@ -1850,9 +1881,9 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Nederlands" @@ -1884,7 +1915,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Vroege Geheugen Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Wijzig" @@ -1896,16 +1927,20 @@ msgstr "Wijzig ActionReplay Code" msgid "Edit Config" msgstr "Wijzig Configuratie" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Wijzig Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Wijzig..." @@ -1917,7 +1952,7 @@ msgstr "Effect" msgid "Embedded Frame Buffer" msgstr "Ingebedde Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Emu Thread draait al!" @@ -1955,7 +1990,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Emulatie Staat:" @@ -1983,11 +2018,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Activeer Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Activeer Bounding Box Berekeningen" @@ -1995,27 +2030,27 @@ msgstr "Activeer Bounding Box Berekeningen" msgid "Enable Cache" msgstr "Activeer Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Activeer Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Activeer MMU" @@ -2023,7 +2058,7 @@ msgstr "Activeer MMU" msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" @@ -2031,7 +2066,7 @@ msgstr "Activeer Schermbeveiliger" msgid "Enable Speaker Data" msgstr "Activeer Speaker Data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" @@ -2053,7 +2088,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2089,7 +2124,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2097,11 +2132,11 @@ msgstr "" "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. " "Uitschakelen voor elk ander spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2109,22 +2144,13 @@ msgstr "" "Activeert Dolby Pro Logic II emulatie met 5.1 surround. Niet beschikbaar met " "OSX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Activeert Dolby Pro Logic II emulatie met 5.1 surround. Alleen voor OpenAL " "backend." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Activeert Dolby Pro Logic II emulatie met 5.1 surround. Allen voor OpenAL " -"backend. Het hernoemen van soft_oal.dll naa OpenAL32.dll kan nodig zijn om " -"het werkend te maken." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2138,7 +2164,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2160,9 +2186,9 @@ msgstr "" msgid "End" msgstr "Einde" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Engels" @@ -2191,11 +2217,11 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Error (Fout)" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " @@ -2229,7 +2255,6 @@ msgid "Euphoria" msgstr "Euforie" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Exception handler - toegang onder geheugen ruimte. %08llx%08llx" @@ -2238,16 +2263,21 @@ msgstr "Exception handler - toegang onder geheugen ruimte. %08llx%08llx" msgid "Execute" msgstr "Uitvoeren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exporteer alle saves..." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Exporteren Mislukt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exporteer Bestand" @@ -2255,7 +2285,7 @@ msgstr "Exporteer Bestand" msgid "Export Recording" msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exporteer Opname..." @@ -2271,9 +2301,10 @@ msgstr "Exporteer Wii save (Experimenteel)" msgid "Export all saves" msgstr "Exporteer alle saves..." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Uitpakken is mislukt, opnieuw proberen?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Exporteren Mislukt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2295,44 +2326,44 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra parameter, alleen nuttig in \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Apploader Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "DOL Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Map Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Bestand Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Uitpakken..." @@ -2348,11 +2379,11 @@ msgstr "FIFO Speler" msgid "FRANCE" msgstr "Frankrijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST Groote:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Verbinden Mislukt!" @@ -2360,7 +2391,7 @@ msgstr "Verbinden Mislukt!" msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2401,16 +2432,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Kon geen data lezen van %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Mislukt om banner.bin te lezen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "bk header lezen mislukt" @@ -2441,12 +2472,12 @@ msgstr "" "Het lezen van de block allocation table is mislukt\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Mislukt om gegevens uit %d te lezen" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Kon geen data lezen van bestand: %s" @@ -2467,7 +2498,7 @@ msgstr "" "Het lezen van de map is mislukt\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Kon de header niet lezen" @@ -2479,29 +2510,34 @@ msgstr "" "Het lezen van de header is mislukt\n" "(0x000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Het schrijven van header voor bestanden %d is mislukt" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Het lezen van de unieke ID van de schijf image is mislukt" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Het schrijven van BT.DINF naar SYSCONF is mislukt" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Mislukt om te schrijven bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Kon geen data lezen van bestand: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Het schrijven van header voor %s is mislukt" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Het schrijven van header voor bestanden %d is mislukt" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Farsi" @@ -2513,11 +2549,11 @@ msgstr "Snel" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snelle versie van de MMU. Werkt niet voor elk spel." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2525,7 +2561,7 @@ msgstr "" "Fatale desync. Terugspelen wordt geannuleerd. (Fout in SpeelWiimote: %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo Speler" @@ -2566,16 +2602,16 @@ msgstr "Bestand is niet herkend als geheugenkaart" msgid "File not compressed" msgstr "Bestand niet gecompressed" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Onbekende open mode: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" @@ -2603,7 +2639,7 @@ msgstr "Forceer 16:9" msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Forceer Textuur Filtering" @@ -2636,7 +2672,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2659,7 +2695,7 @@ msgstr "" msgid "Forward" msgstr "Vooruit" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2668,6 +2704,11 @@ msgstr "" msgid "Found %d results for '" msgstr "%d resulataten gevonden voor '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Kon %s niet opslaan" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2697,7 +2738,7 @@ msgstr "Frame Bereik" msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Framelimiet:" @@ -2709,9 +2750,9 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Frans" @@ -2724,7 +2765,7 @@ msgstr "Frets" msgid "From" msgstr "Van" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Volledig scherm" @@ -2736,7 +2777,7 @@ msgstr "Volledige Scherm Resolutie:" msgid "GCI File(*.gci)" msgstr "GCI Bestand(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GCPad" @@ -2744,27 +2785,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "Spel ID:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Het spel draait al!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Het spel draait niet!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Spel niet gevonden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Spel Specifieke Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Spel Config" @@ -2772,7 +2813,7 @@ msgstr "Spel Config" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube Savegame bestanden(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2781,16 +2822,16 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Instellingen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko Codes" @@ -2808,7 +2849,7 @@ msgstr "" "directory te plaatsen en Dolphin opnieuw op te starten.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Algemeen" @@ -2817,9 +2858,9 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Duits" @@ -2828,11 +2869,11 @@ msgstr "Duits" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is groter dan de grootte van de AR code lijst %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafische" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Grafische instellingen" @@ -2859,7 +2900,7 @@ msgstr "" "\n" "Bij geval van twijfel gemarkeerd laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Grieks" @@ -2887,7 +2928,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebreeuws" @@ -2899,7 +2940,7 @@ msgstr "Hoogte" msgid "Help" msgstr "Help" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2920,7 +2961,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2959,7 +3000,7 @@ msgid "Home" msgstr "Thuis" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2968,11 +3009,11 @@ msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Hongaarse" @@ -2980,14 +3021,14 @@ msgstr "Hongaarse" msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Poging tot verkrijgen van data van een onbekende ticket: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -3000,11 +3041,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin zal waarschijnlijk blijven hangen." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL Instellingen" @@ -3020,11 +3061,11 @@ msgstr "IR Aanwijzer" msgid "IR Sensitivity:" msgstr "IR Gevoeligheid:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "ISO Map" @@ -3036,7 +3077,7 @@ msgstr "ITALIË" msgid "Icon" msgstr "Icoon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3080,9 +3121,15 @@ msgstr "" msgid "Import Save" msgstr "Importeer Save" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importeren is mislukt, opnieuw proberen?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importeer Save" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Exporteren Mislukt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3104,21 +3151,17 @@ msgstr "" "Geimporteerd bestand heeft sav extension\n" "maar heeft geen juiste header" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "In Game" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "In-Game" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Framelimiet:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3138,7 +3181,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3146,7 +3189,7 @@ msgstr "Schakel SD Card in" msgid "Insert name here.." msgstr "Voeg naam hier toe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Installeer WAD" @@ -3154,30 +3197,31 @@ msgstr "Installeer WAD" msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Integriteitscontrole Fout" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Integriteitscontrole afgerond" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Integriteitscontrole afgerond. Geen fouten gevonden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3186,11 +3230,11 @@ msgstr "" "Integriteitscontrole for partitie %d mislukt. De dump is waarschijnlijk " "corrupt or is verkeerd gepatcht. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Interface Instellingen" @@ -3215,15 +3259,15 @@ msgstr "Interne LZO fout - lzo_init() is mislukt" msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Onjuiste grootte (%x) of Magic word (%x)" @@ -3256,7 +3300,7 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Onjuist opname bestand" @@ -3272,13 +3316,13 @@ msgstr "Ongeldige zoekopdracht (niet in staat naar nummers te converteren)" msgid "Invalid search string (only even string lengths supported)" msgstr "Ongeldige zoekopdracht (alleen even string lengte ondersteund)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Onjuiste staat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italië" @@ -3286,16 +3330,16 @@ msgstr "Italië" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japans" @@ -3321,8 +3365,8 @@ msgstr "Houdt venster bovenop" msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Koreaans" @@ -3340,16 +3384,16 @@ msgstr "L Knop" msgid "L-Analog" msgstr "L-Analoog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Wachttijd:" @@ -3392,7 +3436,7 @@ msgstr "" msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" @@ -3491,15 +3535,15 @@ msgstr "Laad staat 8" msgid "Load State Slot 9" msgstr "Laad staat 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Laad staat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Laad Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu %d%c" @@ -3518,10 +3562,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Laad vooraf ingestelde waardes van de beschikbare hack patronen." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Lokaal" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Logboek" @@ -3555,11 +3595,11 @@ msgid "Logger Outputs" msgstr "Logger Uitvoer" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Logboek Bijhouden" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Verbinding met de server verloren!" @@ -3567,7 +3607,7 @@ msgstr "Verbinding met de server verloren!" msgid "M Button" msgstr "M Knop" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3576,7 +3616,7 @@ msgstr "" "Verkeerde MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" @@ -3590,11 +3630,11 @@ msgstr "MadCatz Gameshark bestanden(*.gcs)" msgid "Main Stick" msgstr "Hoofd Knuppel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "Maker ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Maker:" @@ -3630,7 +3670,7 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3642,7 +3682,7 @@ msgstr "" "Geheugenkaart Manager Waarschuwing - Maak backups voor gebruik, het zou " "moeten werken" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3669,7 +3709,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Microfoon" @@ -3682,7 +3722,7 @@ msgstr "Min" msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3831,7 +3871,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3878,7 +3918,7 @@ msgstr "Geen ISOs of WADS gevonden." msgid "No audio output" msgstr "Geen audio output" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Geen banner gevonden voor titel %s" @@ -3904,7 +3944,7 @@ msgstr "Geen vrije map indexes" msgid "No recorded file" msgstr "Geen opgenomen bestand" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Geen save map gevonden voor titel %s" @@ -3913,11 +3953,11 @@ msgstr "Geen save map gevonden voor titel %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" @@ -3925,18 +3965,18 @@ msgstr "Noorweegse Bokmaal" msgid "Not Equal" msgstr "Niet gelijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Niet ingesteld" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" "Geen Wii save of het lezen van de grootte van bestandsheader %x is mislukt" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Niet verbonden" @@ -3982,7 +4022,7 @@ msgstr "Object" msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Uit" @@ -3990,16 +4030,20 @@ msgstr "Uit" msgid "Offset:" msgstr "Afstand:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "In-Scherm Berichtgeving" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Er zijn maar %d blocks beschikaarr" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Open" @@ -4012,7 +4056,7 @@ msgstr "Open &bevattende map" msgid "Open Wii &save folder" msgstr "Open Wii &save map" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Open Bestand..." @@ -4038,6 +4082,16 @@ msgstr "OpenCL Texture Decoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4064,7 +4118,7 @@ msgstr "" msgid "Other" msgstr "Overige" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4076,7 +4130,7 @@ msgstr "" msgid "Output" msgstr "Uitgang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Opname afspelen" @@ -4084,7 +4138,7 @@ msgstr "Opname afspelen" msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Pad" @@ -4113,21 +4167,21 @@ msgstr "Parameters" msgid "Partition %i" msgstr "Partitie %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pauze" @@ -4140,7 +4194,7 @@ msgstr "Pauze aan het eind van de film" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfect" @@ -4150,9 +4204,9 @@ msgid "Perspective %d" msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Speel" @@ -4164,7 +4218,7 @@ msgstr "Speel Opname" msgid "Play/Pause" msgstr "Spel/Pauze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Speelbaar" @@ -4172,11 +4226,11 @@ msgstr "Speelbaar" msgid "Playback Options" msgstr "Terugspeel Opties" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Spelers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4188,36 +4242,36 @@ msgstr "Maak een perspectief voor het opslaan" msgid "Plus-Minus" msgstr "Ongeveer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Poort 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" @@ -4225,17 +4279,17 @@ msgstr "Portugees (Braziliaans)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Vroegtijdige beeïndiging van filmpje in PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Vroegtijdige beeïndiging van filmpje in PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Vroegtijdige beeïndiging van filmpje in PlayWiimote. %u > %u" @@ -4268,7 +4322,7 @@ msgstr "Profiel" msgid "Properties" msgstr "Eigenschappen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Cache leegmaken" @@ -4276,8 +4330,8 @@ msgstr "Cache leegmaken" msgid "Question" msgstr "Vraag" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Stoppen" @@ -4338,6 +4392,11 @@ msgstr "Echte Wiimotes" msgid "Record" msgstr "Speel Opnemen" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Opname Opties" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Opname Informatie" @@ -4373,7 +4432,7 @@ msgstr "" "In geval van twijfel selecteer Geen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Ververs" @@ -4382,14 +4441,14 @@ msgstr "Ververs" msgid "Refresh List" msgstr "Lijst Verversen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Ververs de speellijst" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Verwijder" @@ -4421,7 +4480,7 @@ msgstr "Resultaten" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4439,15 +4498,15 @@ msgstr "Rechter Stick" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Zet DSP HLE en LLE op een toegeweide thread (niet aangeraden omdat het audio " "problemen kan veroorzaken met HLE en freezes met LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russisch" @@ -4460,7 +4519,7 @@ msgid "Safe" msgstr "Betrouwbaar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Opslaan" @@ -4521,28 +4580,28 @@ msgstr "Sla Staat 8 Op" msgid "Save State Slot 9" msgstr "Sla Staat 1 Op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Sla staat op als..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." @@ -4564,7 +4623,7 @@ msgstr "Scannen voor ISO's" msgid "Scanning..." msgstr "Scannen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "ScrShot" @@ -4580,7 +4639,7 @@ msgstr "Zoeken" msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Zoeken in submappen" @@ -4603,12 +4662,12 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4630,19 +4689,19 @@ msgstr "Selecteer een save file om te importeren" msgid "Select floating windows" msgstr "Selecteer zwevende vensters" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4719,7 +4778,7 @@ msgstr "" "\n" "In geval van twijfel gebruik OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Verzend" @@ -4731,11 +4790,11 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4756,7 +4815,7 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Index is groter dan de grootte van de AR Code lijst %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4764,19 +4823,20 @@ msgstr "" "Zet de wachttijd (in ms). Hogere waarden kunnen krakende audio verminderen. " "Alleen voor OpenAL instellingen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Instellingen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Schudden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Korte Naam:" @@ -4784,23 +4844,28 @@ msgstr "Korte Naam:" msgid "Shoulder Buttons" msgstr "Schouder Knoppen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Toon &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Toon &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Toon &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Toon &Toolbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Standaard" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Toon Schijven" @@ -4812,11 +4877,11 @@ msgstr "Weergeef EFB Kopie Regios" msgid "Show FPS" msgstr "Toon FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Toon Frans" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Toon Gamecube" @@ -4824,35 +4889,35 @@ msgstr "Toon Gamecube" msgid "Show Input Display" msgstr "Toon Input Venster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Toon Italië" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Toon JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Toon Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Toon Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Bekijk Log &Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Toon PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Toon Platformen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Toon Regio" @@ -4860,27 +4925,27 @@ msgstr "Toon Regio" msgid "Show Statistics" msgstr "Weergeef statistieken" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Toon Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Toon USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Toon Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Toon Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Toon een bevestigingsvenster voordat u stopt met een spel." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4898,7 +4963,7 @@ msgstr "Toon eerste blok" msgid "Show lag counter" msgstr "Toon vertragingsteller" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4936,7 +5001,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Toon onbekend" @@ -4954,7 +5019,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" @@ -4962,11 +5027,11 @@ msgstr "Vereenvoudigd Chinees" msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Sla het legen van DCBZ over" @@ -4991,17 +5056,17 @@ msgstr "" "\n" "Bij geval van twijfel ongemarkeerd laten." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -5009,7 +5074,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Software Weergever" @@ -5025,7 +5090,7 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Geluids Instellingen" @@ -5043,9 +5108,9 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spaans" @@ -5073,37 +5138,29 @@ msgstr "" "\n" "In geval van twijfel selecteer 640x528" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Versnel Disc Transfer Rate" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Vierkante knuppel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Standaard Controller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Start &netplay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Start Op&nemen" @@ -5119,7 +5176,7 @@ msgstr "Staat" msgid "State Saves" msgstr "Opgeslage Staten" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Stuurwiel" @@ -5128,7 +5185,7 @@ msgid "Stick" msgstr "Knuppel" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Stop" @@ -5159,16 +5216,16 @@ msgstr "Strum" msgid "Subtract" msgstr "Onttrekken " -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Bestand succesvol gexporteerd naar %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Succesvol save games geimporteerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5176,11 +5233,11 @@ msgstr "" msgid "Swing" msgstr "Zwaai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Synchroniseer GPU thread" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5188,8 +5245,8 @@ msgstr "" "Synchroniseert de GPU en CPU threads om willekeurige freezes te voorkomen in " "Dual Core modus. (Aan = Compatibel, Uit = Snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Systeem Taal:" @@ -5218,13 +5275,13 @@ msgstr "Linker Tabel" msgid "Table Right" msgstr "Rechter Tabel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Neem een Schermafdruk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5244,7 +5301,7 @@ msgstr "Texture Cache" msgid "Texture Format Overlay" msgstr "Texture Formaat Overlay" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "De WAD is succesvol geinstalleerd" @@ -5256,13 +5313,13 @@ msgstr "Het adres is onjuist" msgid "The checksum was successfully fixed" msgstr "De checksum was met succes gefixt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5321,7 +5378,7 @@ msgstr "" "Het save bestand dat je probeert te kopiëren heeft een onjuiste bestands " "grootte" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5329,23 +5386,23 @@ msgstr "" "De geselecteerde taal wordt niet door je systeem ondersteund. Dolphin zal " "terugvallen op je systeems taal." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "De NetPlay versie van de server en client zijn incompatibel!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "De server is vol!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "De server reageerde: het spel draait al!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "De server verstuurde een onbekende foutmelding!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Het opgegeven bestand \"%s\" bestaat niet" @@ -5354,11 +5411,11 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Thema:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5366,7 +5423,7 @@ msgstr "" "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is " "waarschijnlijk incompleet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5382,7 +5439,7 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games." @@ -5405,7 +5462,7 @@ msgstr "" "\\n\n" "Bij twijfel, ongeselecteerd laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5418,7 +5475,7 @@ msgstr "" "geluid verhelpen, maar kan ook constant lawaai ten gevolge hebben, " "afhankelijk van welk spel gebruikt wordt)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5472,7 +5529,7 @@ msgstr "EFB Regio kopie" msgid "Toggle Fog" msgstr "Zet Alle Log Types Aan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" @@ -5482,11 +5539,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" @@ -5510,7 +5567,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turks" @@ -5564,7 +5621,7 @@ msgstr "" "manier hebt ingevoerd. \n" "Wil je deze regel negeren en verder gaan met verwerken?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Onbepaalde %i" @@ -5601,12 +5658,12 @@ msgstr "Onbekende commando 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Onbekende vermeldingstype %i in SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Onbekend bericht ontvangen met id : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5627,7 +5684,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" @@ -5639,7 +5696,7 @@ msgstr "Gebruik &Volledig Scherm" msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" @@ -5663,6 +5720,15 @@ msgstr "" "\n" "In geval van twijfel ongemarkeerd laten." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5685,7 +5751,7 @@ msgstr "Hulpprogramma" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Snelheids Hack" @@ -5710,7 +5776,7 @@ msgstr "Breedsprakigheid" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Video" @@ -5718,17 +5784,17 @@ msgstr "Video" msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installatie mislukt: fout bij het creëren van %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "WAD installatie mislukt: fout bij het creëren van ticket" @@ -5762,7 +5828,7 @@ msgstr "Waarschuwing - ELF wordt in de verkeerde console mode gestart!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Waarschuwing - ISO wordt in de verkeerde console mode gestart!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5787,7 +5853,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5798,7 +5864,7 @@ msgstr "" "> %u) (frame %u > %u). Je dient een andere save te laden voordat je verder " "gaat, of deze staat laden met alleen-lezen uitgeschakeld. " -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5810,7 +5876,7 @@ msgstr "" "of deze staat laden met alleen-lezen uitgeschakeld. Anders zullen er " "waarschijnlijk synchronisatie problemen optreden. " -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5862,23 +5928,19 @@ msgstr "Breedbeeld Hack" msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Wii Save Importeren" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5887,7 +5949,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kon het bestand niet lezen" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5896,7 +5958,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5904,7 +5966,7 @@ msgstr "Wiimote Connected" msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wiimote instellingen" @@ -5928,14 +5990,14 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Werken..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -6000,7 +6062,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "U kunt geen panelen sluiten die paginas bevatten." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Je moet een spel kiezen!" @@ -6016,7 +6078,7 @@ msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven" msgid "You must enter a valid profile name." msgstr "Je moet een geldige profiel naam invoeren!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -6030,7 +6092,7 @@ msgstr "" "Wil je nu stoppen om het probleem op te lossen?\n" "Als je \"Nee\" selecteert kan het geluid vervromd klinken." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6049,7 +6111,7 @@ msgstr "" "Het zou 0x%04x moet zijn, maar is 0x%04llx \n" "Wil je een nieuwe genereren?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -6115,7 +6177,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "applader (.img)" @@ -6128,7 +6190,17 @@ msgstr "iCacheJIT: Lezen van Opcode vanaf %x. Graag rapporteren." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Onbekend bericht ontvangen met id : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -6162,9 +6234,28 @@ msgstr "| OF" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "Kan Wiimote niet vinden op bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Kon de pads niet instellen. De speler heeft het spel verlaten, of het " +#~ "spel draait nog!\n" +#~ "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" + #~ msgid "Enable Hotkeys" #~ msgstr "Activeer Sneltoetsen" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Activeert Dolby Pro Logic II emulatie met 5.1 surround. Allen voor " +#~ "OpenAL backend. Het hernoemen van soft_oal.dll naa OpenAL32.dll kan nodig " +#~ "zijn om het werkend te maken." + +#~ msgid "Export failed, try again?" +#~ msgstr "Uitpakken is mislukt, opnieuw proberen?" + #~ msgid "Failed to Listen!!" #~ msgstr "Luisteren Mislukt!!" @@ -6189,12 +6280,21 @@ msgstr "| OF" #~ "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT " #~ "= Snel)" +#~ msgid "Import failed, try again?" +#~ msgstr "Importeren is mislukt, opnieuw proberen?" + +#~ msgid "In-Game" +#~ msgstr "In-Game" + #~ msgid "Last Overwritten State" #~ msgstr "Laatste Overgeschreven Staat" #~ msgid "Last Saved State" #~ msgstr "Laatste Opgeslagen Staat" +#~ msgid "Local" +#~ msgstr "Lokaal" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Herverbind Wiimote bij Staat Laden" @@ -6216,3 +6316,6 @@ msgstr "| OF" #~ "OpenGL specificaties en kan glitches veroorzaken.\n" #~ "\n" #~ "In geval van twijfel laat dit uitgevinkt." + +#~ msgid "Wii Save Import" +#~ msgstr "Wii Save Importeren" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 14edac3371..9af7bb9ecc 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-18 20:46+0000\n" "Last-Translator: Baszta \n" "Language-Team: Polish (http://www.transifex.com/projects/p/dolphin-emu/" @@ -25,9 +25,9 @@ msgstr "" msgid " (too many to display)" msgstr "(za dużo do wyświetlenia)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Gra :" @@ -44,7 +44,7 @@ msgstr "" "\"%s\" nie istnieje.\n" "Stworzyć nową 16MB kartę pamięci?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -71,8 +71,8 @@ msgstr "%d próbki" msgid "%d samples (quality level %d)" msgstr "%d próbki (poziom jakości %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s już istnieje, zastąpić?" @@ -111,12 +111,17 @@ msgstr "" "Plik nie jest wystarczającej wielkości by być poprawnym plikiem karty " "pamięci (0x%x bajtów)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "Nie można otworzyć %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "Nie można otworzyć %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s jest plikiem o wadze 0 bajtów" @@ -126,7 +131,7 @@ msgstr "%s jest plikiem o wadze 0 bajtów" msgid "%s is already compressed! Cannot compress it further." msgstr "%s jest już skompresowany! Bardziej się nie da." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "Nazwa pliku %s jest zbyt długa, max 45 znaków" @@ -155,7 +160,7 @@ msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&O programie..." @@ -163,7 +168,7 @@ msgstr "&O programie..." msgid "&Boot from DVD Drive..." msgstr "&Załaduj z napędu DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Breakpointy" @@ -171,7 +176,7 @@ msgstr "&Breakpointy" msgid "&Browse for ISOs..." msgstr "&Załaduj z ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Menadżer cheatów" @@ -195,11 +200,11 @@ msgstr "&Emulacja" msgid "&File" msgstr "&Plik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Wyprzedzanie klatek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Pełny ekran" @@ -207,7 +212,7 @@ msgstr "&Pełny ekran" msgid "&Graphics Settings" msgstr "&Ustawienia graficzne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Pomoc" @@ -215,7 +220,7 @@ msgstr "&Pomoc" msgid "&Hotkey Settings" msgstr "Ustawienia &hotkey'ów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -227,11 +232,11 @@ msgstr "&Wczytaj stan" msgid "&Memcard Manager (GC)" msgstr "&Menadżer karty pamięci (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Pamięć" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Otwórz..." @@ -239,11 +244,11 @@ msgstr "&Otwórz..." msgid "&Options" msgstr "&Opcje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Wstrzymaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Graj" @@ -251,39 +256,39 @@ msgstr "&Graj" msgid "&Properties" msgstr "&Właściwości" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "Tryb &Tylko do odczytu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Odśwież listę" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Rejestry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Dźwięk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Narzędzia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Wideo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Widok" @@ -372,7 +377,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -380,7 +385,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -388,8 +393,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay jest już otwarte!" @@ -416,8 +421,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -440,13 +443,13 @@ msgstr "" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Kody AR" @@ -578,11 +581,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Dodaj łatkę" @@ -590,9 +593,9 @@ msgstr "Dodaj łatkę" msgid "Add new pane" msgstr "Dodaj nowy panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Dodaj..." @@ -644,36 +647,36 @@ msgstr "Reguluje siłę nacisku wymaganego do aktywacji przycisków." msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" @@ -701,7 +704,7 @@ msgstr "Apploader niewłaściwego rozmiaru... Czy to rzeczywiście apploader?" msgid "Apploader unable to load from file" msgstr "Apploader nie mógł wczytać z pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -719,7 +722,7 @@ msgstr "" "\n" "W razie wątpliwości, wybierz (wyłączone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabski" @@ -728,7 +731,7 @@ msgstr "Arabski" msgid "Are you sure you want to delete \"%s\"?" msgstr "Czy jesteś pewny by usunąc \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,15 +739,15 @@ msgstr "" "Czy jesteś pewny by usunąc te pliki?\n" "Przepadną na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (eksperymentalne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -753,12 +756,12 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden panel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Audio Backend :" @@ -766,7 +769,7 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -805,7 +808,7 @@ msgstr "BP rejestr" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Ustawienia Backend'u" @@ -823,7 +826,7 @@ msgstr "Wejście w tle" msgid "Backward" msgstr "W tył" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Zły nagłówek pliku" @@ -836,11 +839,11 @@ msgstr "" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Szczegóły banera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Baner:" @@ -852,7 +855,7 @@ msgstr "Wajcha" msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -881,7 +884,7 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Dół" @@ -890,11 +893,11 @@ msgstr "Dół" msgid "Bound Controls: %lu" msgstr "Bound Controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Zepsuty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Szukaj" @@ -902,15 +905,15 @@ msgstr "Szukaj" msgid "Browse for a directory to add" msgstr "Szukaj folder do dodania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Szukaj folderu wyjściowego" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Bufor:" @@ -920,7 +923,7 @@ msgstr "Bufor:" msgid "Buttons" msgstr "Przyciski" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -944,7 +947,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" @@ -965,7 +968,7 @@ msgstr "" "Zazwyczaj bezpieczne ulepszenie, ale czasami może powodować błędy.\\nW razie " "wątpliwości, pozostaw włączone." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Nie można odnaleźć Wiilota przez handle połączenia %02x" @@ -980,9 +983,9 @@ msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny błąd" msgid "Cancel" msgstr "Anuluj" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Nie moża otworzyć %s" @@ -991,7 +994,7 @@ msgstr "Nie moża otworzyć %s" msgid "Cannot unregister events with events pending" msgstr "Nie można wyrejestrować zdarzeń podczas ich wykonywania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1002,7 +1005,7 @@ msgstr "" "%s\n" "nie jest właściwym plikiem karty pamięci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1014,7 +1017,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Kataloński" @@ -1022,11 +1025,11 @@ msgstr "Kataloński" msgid "Center" msgstr "Środek" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Zmień" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Zmień &dysk" @@ -1034,11 +1037,11 @@ msgstr "Zmień &dysk" msgid "Change Disc" msgstr "Zmień dysk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Zmień grę" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1054,12 +1057,12 @@ msgstr "Zmienia symbol do parametru zFar (po poprawce)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Zmienia symbol do parametru zNear (po poprawce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Zmiana tego nie będzie miała wpływu jeśli emulator jest w trakcie pracy!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1075,39 +1078,39 @@ msgstr "Szukaj cheatów" msgid "Cheats Manager" msgstr "Menadżer cheatów" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Sprawdź integralność partycji" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Sprawdzanie integralności..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chiński uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródłowy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródłowy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Wybierz domyślne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1115,7 +1118,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartę pamięci:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1123,8 +1126,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1143,7 +1146,7 @@ msgstr "Classic" msgid "Clear" msgstr "Wyczyść" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1153,7 +1156,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Zamknij" @@ -1178,7 +1181,7 @@ msgstr "Polecenie" msgid "Comment" msgstr "Komentarz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Komentarz:" @@ -1190,12 +1193,12 @@ msgstr "Kompresuj ISO" msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Kompresowanie ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Konfig" @@ -1209,22 +1212,22 @@ msgstr "Konfiguracja" msgid "Configure Control" msgstr "Konfiguracja sterowania" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Konfiguracja padów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" @@ -1233,17 +1236,17 @@ msgstr "Potwierdź przy zatrzymaniu" msgid "Connect" msgstr "Połącz" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Podłącz klawiaturę USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Podłącz klawiaturę USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Połącz Wiilot %i" @@ -1264,7 +1267,7 @@ msgstr "Połącz Wiilot 3" msgid "Connect Wiimote 4" msgstr "Połącz Wiilot 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Łączę..." @@ -1284,7 +1287,7 @@ msgstr "Sterowanie" msgid "Convert to GCI" msgstr "Konwertuj do GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopiowanie nie powiodło się" @@ -1293,7 +1296,7 @@ msgstr "Kopiowanie nie powiodło się" msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Rdzeń" @@ -1307,7 +1310,7 @@ msgstr "Nie można utworzyć %s" msgid "Could not initialize backend %s." msgstr "Beckend %s nie mógł zostać zainicjalizowany." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1318,24 +1321,16 @@ msgstr "" "Wii. Zwróć uwagę, że oryginalne nośniki GC i Wii nie będą odczytywane przez " "większość napędów DVD." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Nie rozpoznao pliku ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Nie można zapisać %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Nie można ustawić pada. Gracz odszedł lub gra jest uruchomiona!\n" -"(Ustawienie padów podczas uruchomionej gry, nie jest jeszcze wspierane)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1356,11 +1351,11 @@ msgstr "" "Czy wiadomość ta pojawia się po przeniesieniu folderu emulatora?\n" "Jeśli tak, należy ponownie określić ścieżki kart pamięci w opcjach programu." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1373,7 +1368,7 @@ msgstr "" msgid "Count:" msgstr "Ilość:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Kraj:" @@ -1413,12 +1408,12 @@ msgstr "" msgid "Crossfade" msgstr "Suwak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Aktualny folder zmieniono z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1426,11 +1421,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ustawienia Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Własne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Czeski" @@ -1442,36 +1437,37 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "Dedykowany wątek dla DSPLLE" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "Dedykowany wątek dla DSPLLE" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Źródło DVD:" @@ -1483,7 +1479,7 @@ msgstr "DVDLowRead - Fatal Error: błąd odczytu dysku" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatal Error: błąd odczytu dysku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1491,7 +1487,7 @@ msgstr "" msgid "Data Size" msgstr "Rozmiar danych" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Data:" @@ -1528,8 +1524,8 @@ msgstr "Wypakuj ISO..." msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" @@ -1542,7 +1538,7 @@ msgstr "Odśwież listę gier" msgid "Default" msgstr "Domyślne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Domyślne ISO:" @@ -1586,8 +1582,8 @@ msgstr "" msgid "Device" msgstr "Urządzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Ustawienia urządzenia" @@ -1599,7 +1595,7 @@ msgstr "Pokrętło" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1667,7 +1663,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Dysk" @@ -1694,24 +1690,60 @@ msgstr "" msgid "Divide" msgstr "Podziel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualną emulację?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dekoder Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ustawienia graficzne %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin strona &WWW" @@ -1727,12 +1759,12 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1740,7 +1772,7 @@ msgstr "Filmy TAS (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Konfiguracja Wiilot'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" @@ -1760,12 +1792,12 @@ msgstr "" "Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by " "pokazać wszystkie gry..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Program nie był w stanie zakończyć żądanej akcji." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1792,11 +1824,11 @@ msgstr "Pobrano %lu kodów. (dodano %lu)" msgid "Drums" msgstr "Perkusja" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Zrzut audio" @@ -1842,9 +1874,9 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holenderski" @@ -1876,7 +1908,7 @@ msgstr "Europa" msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Edycja" @@ -1888,16 +1920,20 @@ msgstr "Edytuj kody ActionReplay" msgid "Edit Config" msgstr "Edytuj konfigurację" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Edytuj patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Edytuj bierzącą perspektywę" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Edytuj..." @@ -1909,7 +1945,7 @@ msgstr "Efekt" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Wątek emulacji jest już uruchomiony" @@ -1948,7 +1984,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulowany Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Stan emulacji:" @@ -1976,11 +2012,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Włącz log AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Włącz łączenie bloków" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Włącz Bounding Box Calculation" @@ -1988,27 +2024,27 @@ msgstr "Włącz Bounding Box Calculation" msgid "Enable Cache" msgstr "Włącz cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Włącz kody" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Włącz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Włącz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Włącz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Włącz Idle Skipping (przyspieszenie)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Włącz MMU" @@ -2016,7 +2052,7 @@ msgstr "Włącz MMU" msgid "Enable Progressive Scan" msgstr "Włącz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Włącz wygaszacz ekranu" @@ -2024,7 +2060,7 @@ msgstr "Włącz wygaszacz ekranu" msgid "Enable Speaker Data" msgstr "Włącz dane głosu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Włącz WideScreen" @@ -2046,7 +2082,7 @@ msgstr "" "\n" "W razie wątpliwości, wybierz 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2082,7 +2118,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2090,32 +2126,23 @@ msgstr "" "Włącz to by przyspieszyć The Legend of Zelda: Twilight Princess. Wyłącz dla " "KAŻDEJ innej gry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Włącza Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" "Włącza emulację Dolby Pro Logic II używając 5.1 surround. Niedostępne na OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Włącza emulację Dolby Pro Logic II używając 5.1 surround. Tylko OpenAL." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Włącza emulację Dolby Pro Logic II używając 5.1 surround. Tylko OpenAL. " -"Zmiana nazwy pliku soft_oal.dll na OpenAL32.dll może spowodować, że ta opcja " -"zacznie działać." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2128,7 +2155,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2150,9 +2177,9 @@ msgstr "" msgid "End" msgstr "Koniec" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Angielski" @@ -2181,11 +2208,11 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Błąd" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne." @@ -2216,7 +2243,6 @@ msgid "Euphoria" msgstr "Euforia" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Handler wyjątku - dostęp poniżej obszaru pamięci. %08llx%08llx" @@ -2225,16 +2251,21 @@ msgstr "Handler wyjątku - dostęp poniżej obszaru pamięci. %08llx%08llx" msgid "Execute" msgstr "Wykonaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Eksportuj wszystkie zapisy" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Eksportuj nieudany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Eksportuj plik" @@ -2242,7 +2273,7 @@ msgstr "Eksportuj plik" msgid "Export Recording" msgstr "Eksportuj nagranie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Eksportuj nagranie..." @@ -2258,9 +2289,10 @@ msgstr "Eksportuj zapis Wii (eksperymentalne)" msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Eksport nieudany, ponowić?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Eksportuj nieudany" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2282,44 +2314,44 @@ msgstr "Parametr Dodatkowy" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametr Dodatkowy przydatny tylko w ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Wypakuj wszystkie pliki..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Wypakuj Apploader'a..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Wypakuj DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Wypakuj folder..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Wypakuj plik..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Wypakuj partycję..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Wypakowywanie..." @@ -2335,11 +2367,11 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "Francja" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Rozmiar FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Połączenie nieudane!" @@ -2347,7 +2379,7 @@ msgstr "Połączenie nieudane!" msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udało się!" @@ -2387,16 +2419,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Nieudany odczyt %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Błąd odczytu banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Odczyt nagłówka bk nie powiódł się" @@ -2427,12 +2459,12 @@ msgstr "" "Błąd poprawnego odczytu block allocation table\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Odczyt z %d nieudany" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Odczyt z pliku %s nie powiódł się" @@ -2453,7 +2485,7 @@ msgstr "" "Błąd poprawnego odczytu folderu\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Odczyt nagłówka nie powiódł się" @@ -2465,29 +2497,34 @@ msgstr "" "Błąd poprawnego odczytu nagłówka\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Błąd zapisu nagłówka do pliku %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Błąd odczytu unikalnego ID z obrazu dysku" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Błąd zapisu BT.DINF do SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Zapis bkhdr nie powiódł się" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Odczyt z pliku %s nie powiódł się" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Zapis nagłówka do %s nie powiódł się" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Błąd zapisu nagłówka do pliku %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Farsi" @@ -2499,11 +2536,11 @@ msgstr "Szybki" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2511,7 +2548,7 @@ msgstr "" "Fatal desync. Anulowanie playback'u. (Błąd w PlayWiimote: %u != %u, byte " "%u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo Player" @@ -2552,16 +2589,16 @@ msgstr "Plik nierozpoznany jako karta pamięci" msgid "File not compressed" msgstr "Plik nie skompresowany" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy się!" @@ -2589,7 +2626,7 @@ msgstr "Wymuś 16:9" msgid "Force 4:3" msgstr "Wymuś 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Wymuś konsolę jako NTSC-J" @@ -2621,7 +2658,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2643,7 +2680,7 @@ msgstr "" msgid "Forward" msgstr "W przód" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2652,6 +2689,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Znaleziono %d dla '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Nie można zapisać %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2681,7 +2723,7 @@ msgstr "Zasięg klatki" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Limit klatek:" @@ -2693,9 +2735,9 @@ msgstr "Klatki do nagrania" msgid "Free Look" msgstr "Free Look" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francuski" @@ -2708,7 +2750,7 @@ msgstr "Gryfy" msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "FullScr" @@ -2720,7 +2762,7 @@ msgstr "Rozdzielczość pełnoekranowa:" msgid "GCI File(*.gci)" msgstr "Plik GCI(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GCPad" @@ -2728,27 +2770,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID gry:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Gra jest już uruchomiona!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Gra nie jest uruchomiona!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Nie znaleziono gry!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Specyficzne ustawienia gry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Konfiguracja gry" @@ -2756,7 +2798,7 @@ msgstr "Konfiguracja gry" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Pliki zapisu GameCube(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2765,16 +2807,16 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamięci GC (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Ustawienia pada GC" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Kody Gecko" @@ -2792,7 +2834,7 @@ msgstr "" "zrestartowaniiu programu)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Główne" @@ -2801,9 +2843,9 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Niemiecki" @@ -2812,11 +2854,11 @@ msgstr "Niemiecki" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeks jest większy niż rozmiar listy kodów AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Ustawienia graficzne" @@ -2842,7 +2884,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw włączone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Grecki" @@ -2870,7 +2912,7 @@ msgstr "Hacki" msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodła się" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebrajski" @@ -2882,7 +2924,7 @@ msgstr "Wysokość" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2903,7 +2945,7 @@ msgstr "" "\n" "Narka!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2941,7 +2983,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2950,11 +2992,11 @@ msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Węgierski" @@ -2962,13 +3004,13 @@ msgstr "Węgierski" msgid "Hybrid Wiimote" msgstr "Hybrydowy Wiilot" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Próba otrzymania danych z nieznanego ticket'u: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2981,11 +3023,11 @@ msgstr "" "TitleID %016llx.\n" "Program teraz chyba się zawiesi :C" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zła ścieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Ustawienia IPL" @@ -3001,11 +3043,11 @@ msgstr "Wskaźnik IR" msgid "IR Sensitivity:" msgstr "Czułość IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Foldery ISO" @@ -3017,7 +3059,7 @@ msgstr "Włochy" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3061,9 +3103,15 @@ msgstr "" msgid "Import Save" msgstr "Importuj zapis" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importowanie nie powiodło się, próbować ponownie?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importuj zapis" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Eksportuj nieudany" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3085,21 +3133,17 @@ msgstr "" "Zaimportowany plik posiada rozszerzenie sav\n" "lecz nie posiada właściwego nagłówka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "W grze" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "W grze" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Limit klatek:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3119,7 +3163,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Włóż kartę SD" @@ -3127,7 +3171,7 @@ msgstr "Włóż kartę SD" msgid "Insert name here.." msgstr "Wprowadź nazwę tutaj..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Zainstaluj WAD" @@ -3135,29 +3179,30 @@ msgstr "Zainstaluj WAD" msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Błąd sprawdzania integralności" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Sprawdzanie integralności zakończone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Sprawdzanie integralności zakończone. Nie znaleziono błędów." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3166,11 +3211,11 @@ msgstr "" "Sprawdzenie integralności dla partycji %d nie powiodło się. Twój zrzut jest " "prawdopodobnie uszkodzony lub został źle spatchowany." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Ustawienia interfejsu" @@ -3195,15 +3240,15 @@ msgstr "Wewnętrzny błąd LZO - lzo_init() nie powiodło się" msgid "Internal Resolution:" msgstr "Wewnętrzna rozdzielczość:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolne)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Niewłaściwy rozmiar (%x) lub Magic word (%x)" @@ -3236,7 +3281,7 @@ msgstr "" "%s\n" "Będziesz musiał ponownie zrzucić grę." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Newłaściwy plik nagrania" @@ -3254,13 +3299,13 @@ msgstr "" "Niewłaściwy łańcuch przeszukiwania (wspierane są tylko równe długości " "łańcucha)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Niewłaściwy stan" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Włoski" @@ -3268,16 +3313,16 @@ msgstr "Włoski" msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (zalecane)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL experimental recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japoński" @@ -3303,8 +3348,8 @@ msgstr "Okno na wierzchu" msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Koreański" @@ -3322,16 +3367,16 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Język:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Opóźnienie:" @@ -3374,7 +3419,7 @@ msgstr "" msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Limit FPS" @@ -3473,15 +3518,15 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State Slot 9" msgstr "Wczytaj stan Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Wczytaj stan..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3500,10 +3545,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Ładuje wartości wcześniej ustawione z dostępnych hack patterns" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Lokalny" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Log" @@ -3537,11 +3578,11 @@ msgid "Logger Outputs" msgstr "Logger Outputs" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Logging" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Połączenie z serwerem przerwane!" @@ -3549,7 +3590,7 @@ msgstr "Połączenie z serwerem przerwane!" msgid "M Button" msgstr "M Button" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3558,7 +3599,7 @@ msgstr "" "MD5 niepoprawne\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3572,11 +3613,11 @@ msgstr "Pliki MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Główna gałka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID twórcy:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Twórca:" @@ -3613,7 +3654,7 @@ msgid "Memory Byte" msgstr "Bajt pamięci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Karta pamięci" @@ -3625,7 +3666,7 @@ msgstr "" "Memory Card Manager OSTRZEŻENIE - Twórz kopie zapasowe przed użyciem, " "powinno zostać naprawione, ale może namieszać!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3650,7 +3691,7 @@ msgstr "Wielkość pliku karty pamięci nie odpowiada wielkości nagłówka" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mikrofon" @@ -3663,7 +3704,7 @@ msgstr "Min" msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3812,7 +3853,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3859,7 +3900,7 @@ msgstr "Nie odnaleziono IOS/WAD" msgid "No audio output" msgstr "Brak wyjścia audio" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Nie odnaleziono pliku banera dla tytułu %s" @@ -3885,7 +3926,7 @@ msgstr "Brak wolnych wejść folderów" msgid "No recorded file" msgstr "Brak nagranego pliku" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Nie odnaleziono folderu zapisu dla tytułu %s" @@ -3894,11 +3935,11 @@ msgstr "Nie odnaleziono folderu zapisu dla tytułu %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Żadne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norweski" @@ -3906,17 +3947,17 @@ msgstr "Norweski" msgid "Not Equal" msgstr "Nie równe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Nie ustawiono" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "To nie jest zapis Wii lub błąd odczytu rozmiaru nagłówka pliku %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Nie połączono" @@ -3962,7 +4003,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Zasięg objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Wyłączone" @@ -3970,16 +4011,20 @@ msgstr "Wyłączone" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "On-Screen Display Messages" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Dostępnych tylko %d bloków" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Otwórz" @@ -3992,7 +4037,7 @@ msgstr "Otwórz &folder zawartości" msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Otwórz plik..." @@ -4018,6 +4063,16 @@ msgstr "OpenCL Texture Decoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4043,7 +4098,7 @@ msgstr "" msgid "Other" msgstr "Pozostałe" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4055,7 +4110,7 @@ msgstr "" msgid "Output" msgstr "Wyjście" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Od&twórz nagranie" @@ -4063,7 +4118,7 @@ msgstr "Od&twórz nagranie" msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Pad " @@ -4092,21 +4147,21 @@ msgstr "Paramerty" msgid "Partition %i" msgstr "Partycja %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Ścieżki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pause" @@ -4119,7 +4174,7 @@ msgstr "Zatrzymaj na koncu filmu" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfekcyjny" @@ -4129,9 +4184,9 @@ msgid "Perspective %d" msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Play" @@ -4143,7 +4198,7 @@ msgstr "Odtwórz nagranie" msgid "Play/Pause" msgstr "Play/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Grywalny" @@ -4151,11 +4206,11 @@ msgstr "Grywalny" msgid "Playback Options" msgstr "Opcje playback'u" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Gracze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Potwierdź..." @@ -4167,36 +4222,36 @@ msgstr "Proszę utworzyć perspektywę przed zapisem" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" @@ -4204,17 +4259,17 @@ msgstr "Portugalski (Brazylijski)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Premature movie end in PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Premature movie end in PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Premature movie end in PlayWiimote. %u > %u" @@ -4247,7 +4302,7 @@ msgstr "Profil" msgid "Properties" msgstr "Właściwości" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Purge Cache" @@ -4255,8 +4310,8 @@ msgstr "Purge Cache" msgid "Question" msgstr "Pytanie" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Zamknij" @@ -4317,6 +4372,11 @@ msgstr "Prawdziwe Wiiloty" msgid "Record" msgstr "Nagranie" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Opcje nagrywania" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Informacje nagrywania" @@ -4352,7 +4412,7 @@ msgstr "" "W razie wątpliwości, wybierz Żadne." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Odśwież" @@ -4361,14 +4421,14 @@ msgstr "Odśwież" msgid "Refresh List" msgstr "Odśwież listę" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Odśwież listę gier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Usuń" @@ -4399,7 +4459,7 @@ msgstr "Wynik" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4417,15 +4477,15 @@ msgstr "Gałka prawa" msgid "Rumble" msgstr "Wibracje" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Wykonuj DSPLLE na dedykowanym wątku (niezalecane: może powodować błędy audio " "z HLE oraz zawieszanie z LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Rosyjski" @@ -4438,7 +4498,7 @@ msgid "Safe" msgstr "Bezpieczny" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Zapisz" @@ -4499,28 +4559,28 @@ msgstr "Slot stanu 9" msgid "Save State Slot 9" msgstr "Slot stanu 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Zapisz stan..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Zapisz bierzącą perspektywę" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." @@ -4542,7 +4602,7 @@ msgstr "Przeszukuję obrazy ISO" msgid "Scanning..." msgstr "Przeszukuję..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "ScrShot" @@ -4558,7 +4618,7 @@ msgstr "Szukaj" msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" @@ -4581,12 +4641,12 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4608,19 +4668,19 @@ msgstr "Wybierz plik zapisu do importowania" msgid "Select floating windows" msgstr "Select floating windows" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4698,7 +4758,7 @@ msgstr "" "\n" "W razie wątpliwości, użyj OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Wyślij" @@ -4710,11 +4770,11 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serial Port 1 - Port używany przez urządzenia takie jak net adapter" @@ -4733,7 +4793,7 @@ msgstr "Ustaw jako domyślną kartę pamięci %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Indeks jest większy niz rozmiar listy kodu AR %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4741,19 +4801,20 @@ msgstr "" "Ustaw opóźnienie (ms). Wyższe wartości mogą zniwelować trzaski dźwięków. " "Tylko OpenAL." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Ustawienia..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Wstrząs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Krótka nazwa:" @@ -4761,23 +4822,28 @@ msgstr "Krótka nazwa:" msgid "Shoulder Buttons" msgstr "Przyciski tylnie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Pokaż &konsolę" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Pokaż &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Pokaż pasek &stanu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Pokaż pasek &narzędzi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Domyślne" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Pokaż napędy" @@ -4789,11 +4855,11 @@ msgstr "Pokaż EFB Copy Regions" msgid "Show FPS" msgstr "Pokaż FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Pokaż Francję" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Pokaż GameCube" @@ -4801,35 +4867,35 @@ msgstr "Pokaż GameCube" msgid "Show Input Display" msgstr "Pokaż Input Display" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Pokaż Włochy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Pokaż Japonię" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Pokaż Koreę" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Pokaż język:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Pokaż &konfigurację logu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Pokaż PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Pokaż platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Pokaż regiony" @@ -4837,27 +4903,27 @@ msgstr "Pokaż regiony" msgid "Show Statistics" msgstr "Pokaż statystyki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Pokaż Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Pokaż USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Pokaż WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Pokaż Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4875,7 +4941,7 @@ msgstr "Pokaż pierwszy blok" msgid "Show lag counter" msgstr "Pokaż licznik opóźnienia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4912,7 +4978,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Pokaż niewiadome" @@ -4930,7 +4996,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chiński uproszczony" @@ -4938,11 +5004,11 @@ msgstr "Chiński uproszczony" msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Pomiń BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Pomiń oczyszczanie DCBZ" @@ -4966,17 +5032,17 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -4984,7 +5050,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Renderer Programowy" @@ -5000,7 +5066,7 @@ msgstr "" "Czy na pewno chcesz włączyć renderowanie programowe? W razie wątpliwości, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Ustawienia dźwięku" @@ -5018,9 +5084,9 @@ msgstr "Utworzenie bufora dźwięku nie powiodło się: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Hiszpański" @@ -5048,37 +5114,29 @@ msgstr "" "\n" "W razie wątpliwości, wybierz 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Przyspiesz Disc Transfer Rate" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Standardowy kontroler" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "&Rozpocznij nagrywanie" @@ -5094,7 +5152,7 @@ msgstr "Stan" msgid "State Saves" msgstr "Stany zapisu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Kierownica" @@ -5103,7 +5161,7 @@ msgid "Stick" msgstr "Gałka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Stop" @@ -5134,16 +5192,16 @@ msgstr "Struny" msgid "Subtract" msgstr "Wyciągnij" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Sukcesywnie wyeksportowano plik do %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Importowanie zapisów zakończone powodzeniem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5151,11 +5209,11 @@ msgstr "" msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Synchronizuj wątek GPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5163,8 +5221,8 @@ msgstr "" "Synchronizuje wątki GPU i CPU by zapobiec zawieszaniu w trybie dwóch rdzeni " "(ON = zgodne, OFF = szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Język systemu:" @@ -5193,13 +5251,13 @@ msgstr "Talerz lewo" msgid "Table Right" msgstr "Talerz prawo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Zrób zdjęcie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5219,7 +5277,7 @@ msgstr "Cache tekstur" msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD zainstalowany poprawnie" @@ -5231,13 +5289,13 @@ msgstr "Nieprawidłowy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liście" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5293,30 +5351,30 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Zapis, który chcesz skopiować posiada niewłaściwą wielkość pliku." -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" "Wybrany język nie jest wspierany przez Twój system. Ustawienia domyślne." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Wersje NetPlay klienta i serwera są niekompatybilne!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Serwer pełny!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Odpowiedź serwera: gra aktualnie uruchomiona!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Serwer odesłał nieznany błąd!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Wskazany plik \"%s\" nie istnieje." @@ -5325,11 +5383,11 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "Niewłaściwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Kompozycja:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5337,7 +5395,7 @@ msgstr "" "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes " "prawdopodobnie niekompletny." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5353,7 +5411,7 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikują Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." @@ -5377,7 +5435,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5389,7 +5447,7 @@ msgstr "" "PAL:50), ustaw Audio Throttle w DSP (może naprawić klikania dźwięku, ale " "może spowodować trwały szum zależnie od gry)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5442,7 +5500,7 @@ msgstr "EFB Copies" msgid "Toggle Fog" msgstr "Przełącz wszystkie typy logów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Przełącz na pełny ekran" @@ -5452,11 +5510,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chiński tradycyjny" @@ -5480,7 +5538,7 @@ msgstr "" "Próba odczytu z niewłaściwego SYSCONF\n" "bt id Wiilota niedostępne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turecki" @@ -5533,7 +5591,7 @@ msgstr "" "zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n" "Czy chcesz pominąć linię i kontynuować analizę?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Niezdefiniowane %i" @@ -5570,12 +5628,12 @@ msgstr "Nieznane polecenie 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Nieznany typ wejścia %i w SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Nieznana wiadomość o ID: %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" @@ -5594,7 +5652,7 @@ msgstr "Aktualizuj" msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" @@ -5606,7 +5664,7 @@ msgstr "Użyj trybu pełnoekranowego" msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" @@ -5630,6 +5688,15 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5653,7 +5720,7 @@ msgstr "Narzędzie" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Speed Hack" @@ -5678,7 +5745,7 @@ msgstr "Verbosity" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Wideo" @@ -5686,17 +5753,17 @@ msgstr "Wideo" msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Poziom" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalacja WAD nie powiodła się: błąd tworzenia %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Instalacja WAD nie powiodła się: błąd tworzenia biletu" @@ -5730,7 +5797,7 @@ msgstr "Ostrzeżenie - uruchomienie ELF w złym trybie konsoli!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ISO w złym trybie konsoli!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5754,7 +5821,7 @@ msgstr "" "i mają taką samą nazwę jak plik na Twojej karcie pamięci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5765,7 +5832,7 @@ msgstr "" "> %u) (klatka %u > %u). Powinien zostać wczytany inny zapis przed " "kontynuacją lub wczytaj ten stan z wyłączonym trybem tylko do odczytu." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5777,7 +5844,7 @@ msgstr "" "ten stan z wyłączonym trybem tylko do odczytu. W przeciwnym razie może " "nastąpić desynchronizacja." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5827,23 +5894,19 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Źródło Wii NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Import zapisów Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5852,7 +5915,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: nie moża odczytać z pliku" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiilot" @@ -5861,7 +5924,7 @@ msgstr "Wiilot" msgid "Wiimote %i" msgstr "Wiilot %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiilot połączony" @@ -5869,7 +5932,7 @@ msgstr "Wiilot połączony" msgid "Wiimote Motor" msgstr "Wiilot Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Ustawienia Wiilota" @@ -5893,14 +5956,14 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Pracuję..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5965,7 +6028,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nie możesz zamknąć paneli jeśli są w nich strony." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Wybierz grę!" @@ -5982,7 +6045,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawną nazwę profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -5996,7 +6059,7 @@ msgstr "" "Czy chcesz zatrzymać i naprawić problrm?\n" "Jeśli wybierzesz \"Nie\", audio będzie zniekształcone." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6015,7 +6078,7 @@ msgstr "" "Powinno być 0x%04x (jest 0x%04llx)\n" "Czy chcesz wygenerować nowy?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -6082,7 +6145,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6095,7 +6158,17 @@ msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Nieznana wiadomość o ID: %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwrócił -1 przy uruchamianiu programu!" @@ -6129,9 +6202,27 @@ msgstr "| OR" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Nie można ustawić pada. Gracz odszedł lub gra jest uruchomiona!\n" +#~ "(Ustawienie padów podczas uruchomionej gry, nie jest jeszcze wspierane)" + #~ msgid "Enable Hotkeys" #~ msgstr "Włącz skróty klawiszowe" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Włącza emulację Dolby Pro Logic II używając 5.1 surround. Tylko OpenAL. " +#~ "Zmiana nazwy pliku soft_oal.dll na OpenAL32.dll może spowodować, że ta " +#~ "opcja zacznie działać." + +#~ msgid "Export failed, try again?" +#~ msgstr "Eksport nieudany, ponowić?" + #~ msgid "Failed to Listen!!" #~ msgstr "Nasłuchiwanie nieudane!" @@ -6156,12 +6247,21 @@ msgstr "| OR" #~ "Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, " #~ "OFF = szybko)" +#~ msgid "Import failed, try again?" +#~ msgstr "Importowanie nie powiodło się, próbować ponownie?" + +#~ msgid "In-Game" +#~ msgstr "W grze" + #~ msgid "Last Overwritten State" #~ msgstr "Ostatni nadpisany stan" #~ msgid "Last Saved State" #~ msgstr "Ostatni zapisany stan" +#~ msgid "Local" +#~ msgstr "Lokalny" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Podłacz ponownie Wiilota gdy wczytywany jest stan" @@ -6183,3 +6283,6 @@ msgstr "| OR" #~ "powodować spore błędy.\n" #~ "\n" #~ "W razie wątpliwości, pozostaw wyłączone." + +#~ msgid "Wii Save Import" +#~ msgstr "Import zapisów Wii" diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 3e54f34d73..f895b389fa 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: delroth \n" "Language-Team: LANGUAGE \n" @@ -22,9 +22,9 @@ msgstr "" msgid " (too many to display)" msgstr "(demasiados para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Jogo: " @@ -41,7 +41,7 @@ msgstr "" "\"%s\" Inexistente.\n" " Criar um novo cartão de memória de 16MB?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." @@ -66,8 +66,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s já existe, substituir?" @@ -98,12 +98,17 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s falha ao abrir" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s falha ao abrir" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s é um ficheiro com 0 bytes" @@ -113,7 +118,7 @@ msgstr "%s é um ficheiro com 0 bytes" msgid "%s is already compressed! Cannot compress it further." msgstr "%s já está comprimido! Não é possível comprimir mais." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "" @@ -143,7 +148,7 @@ msgstr "%u Blocos livres; %u Entradas de directórios livres" msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Sobre..." @@ -151,7 +156,7 @@ msgstr "&Sobre..." msgid "&Boot from DVD Drive..." msgstr "&Arrancar através da unidade de DVD ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Pontos de partida" @@ -159,7 +164,7 @@ msgstr "&Pontos de partida" msgid "&Browse for ISOs..." msgstr "&Procurar ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Gestor de Cheats" @@ -183,11 +188,11 @@ msgstr "&Emulação" msgid "&File" msgstr "&Ficheiro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Ecrã Inteiro" @@ -195,7 +200,7 @@ msgstr "&Ecrã Inteiro" msgid "&Graphics Settings" msgstr "&Definições Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Ajuda" @@ -203,7 +208,7 @@ msgstr "&Ajuda" msgid "&Hotkey Settings" msgstr "&Definições de Teclas de Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -215,11 +220,11 @@ msgstr "&Carregar Estado" msgid "&Memcard Manager (GC)" msgstr "&Gestor de Cartão de Memória(GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Abrir..." @@ -227,11 +232,11 @@ msgstr "&Abrir..." msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Começar" @@ -239,39 +244,39 @@ msgstr "&Começar" msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Modo só de leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Ver" @@ -360,7 +365,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -368,7 +373,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -376,8 +381,8 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Uma janela NetPlay já está aberta!!" @@ -402,8 +407,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -428,13 +431,13 @@ msgstr "" "\n" "Tem que fazer forward TCP para ser host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Códigos AR" @@ -559,11 +562,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Adicionar Patch" @@ -571,9 +574,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Adicionar..." @@ -626,36 +629,36 @@ msgstr "" msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Definições avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" @@ -683,7 +686,7 @@ msgstr "Apploader é do tamanho errado...é mesmo uma apploader?" msgid "Apploader unable to load from file" msgstr "Apploader impossibilitada de carregar através do ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -701,7 +704,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Árabe" @@ -710,7 +713,7 @@ msgstr "Árabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Tem a certeza que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -718,17 +721,17 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -737,12 +740,12 @@ msgstr "Proporção de ecrã:" msgid "At least one pane must remain open." msgstr "Pelo menos um painel deve manter-se aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Áudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Áudio Backend :" @@ -750,7 +753,7 @@ msgstr "Áudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Automático" @@ -789,7 +792,7 @@ msgstr "" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Definições Backend" @@ -807,7 +810,7 @@ msgstr "Introdução em segundo plano" msgid "Backward" msgstr "Retroceder" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Cabeçalho de ficheiro inválido" @@ -820,11 +823,11 @@ msgstr "" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Banner:" @@ -836,7 +839,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Definições Básicas" @@ -865,7 +868,7 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Inferior" @@ -874,11 +877,11 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controlos agregados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Inactivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Procurar" @@ -886,15 +889,15 @@ msgstr "Procurar" msgid "Browse for a directory to add" msgstr "Procurar por uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Procurar por uma pasta de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -904,7 +907,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -926,7 +929,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" @@ -950,7 +953,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -965,9 +968,9 @@ msgstr "" msgid "Cancel" msgstr "Cancelar" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Impossível abrir %s" @@ -976,7 +979,7 @@ msgstr "Impossível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Impossível retirar registo de eventos quando há eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +987,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -996,7 +999,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalão" @@ -1004,11 +1007,11 @@ msgstr "Catalão" msgid "Center" msgstr "Centro" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Mudar &Disco..." @@ -1016,11 +1019,11 @@ msgstr "Mudar &Disco..." msgid "Change Disc" msgstr "Mudar Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Mudar de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1036,12 +1039,12 @@ msgstr "Alterações assinaladas a parâmetro zFar (após correcção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Mudanças assinaladas a parâmetro zNear (após correcção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Alterações não vão surtir efeito enquanto o emulador estiver em execução!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Conversa" @@ -1057,39 +1060,39 @@ msgstr "Procura de Cheats" msgid "Cheats Manager" msgstr "Gestor de Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1097,7 +1100,7 @@ msgstr "Escolha um ficheiro para abrir" msgid "Choose a memory card:" msgstr "Escolha um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1105,8 +1108,8 @@ msgstr "" "Escolha o ficheiro a usar como apploader: (aplica-se a apenas a discos " "construídos através de pastas)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1125,7 +1128,7 @@ msgstr "Clássico" msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1135,7 +1138,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Fechar" @@ -1160,7 +1163,7 @@ msgstr "Comando" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Comentar:" @@ -1172,12 +1175,12 @@ msgstr "Comprimir ISO..." msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "A comprimir ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Configurar" @@ -1191,22 +1194,22 @@ msgstr "Configuração" msgid "Configure Control" msgstr "Configuração de Controlos" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Configuração de Comandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" @@ -1215,17 +1218,17 @@ msgstr "Confirmar Ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" @@ -1246,7 +1249,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "A conectar..." @@ -1266,7 +1269,7 @@ msgstr "Controlo" msgid "Convert to GCI" msgstr "Converter para GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Cópia Falhou" @@ -1275,7 +1278,7 @@ msgstr "Cópia Falhou" msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Core" @@ -1289,7 +1292,7 @@ msgstr "Não foi possível criar %s" msgid "Could not initialize backend %s." msgstr "Não foi possível iniciar o backend %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1300,25 +1303,16 @@ msgstr "" "de GC/Wii. Tenha atenção que discos de jogos originais Gamecube ou Wii não " "serão lidos na maioria das unidades de DVD." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer ficheiro ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Não foi possível guardar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Não foi possível definir os comandos. O jogador saiu ou o jogo está em " -"execução!\n" -"(definir os controlos enquanto o jogo está em execução ainda não é suportado)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1332,11 +1326,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1349,7 +1343,7 @@ msgstr "" msgid "Count:" msgstr "Contador:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "País" @@ -1389,12 +1383,12 @@ msgstr "" msgid "Crossfade" msgstr "Desvanecimento cruzado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Hack de projecção personalizada" @@ -1402,11 +1396,11 @@ msgstr "Hack de projecção personalizada" msgid "Custom Projection Hack Settings" msgstr "Definições de Hack de projecção customizada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Checo" @@ -1418,36 +1412,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Raiz de DVD:" @@ -1459,7 +1453,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1467,7 +1461,7 @@ msgstr "" msgid "Data Size" msgstr "Dimensão de Dados" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Data:" @@ -1504,8 +1498,8 @@ msgstr "Descomprimir ISO..." msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "A descomprimir ISO" @@ -1518,7 +1512,7 @@ msgstr "Actualizar lista de Jogos" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1562,8 +1556,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1575,7 +1569,7 @@ msgstr "Marcação" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1643,7 +1637,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disco" @@ -1670,24 +1664,60 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Configurações Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1703,12 +1733,12 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1716,7 +1746,7 @@ msgstr "Dolphin TAS filmes (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuração Dolphin do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin em &Google Code" @@ -1736,12 +1766,12 @@ msgstr "" "Dolphin está actualmente definido para esconder todos os jogos. Duplo " "clique aqui para mostrar todos os jogos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1768,11 +1798,11 @@ msgstr "Descarregados %lu códigos. (adicionados %lu)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Depositar Áudio" @@ -1819,9 +1849,9 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holandês" @@ -1850,7 +1880,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Actualizações de Memória Inicial" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Editar" @@ -1862,16 +1892,20 @@ msgstr "Editar Código ActionReplay" msgid "Edit Config" msgstr "Editar Configuração" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Editar..." @@ -1883,7 +1917,7 @@ msgstr "Efeito" msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Thread de Emulador já em execução" @@ -1921,7 +1955,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Estado da Emulação:" @@ -1949,11 +1983,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1961,27 +1995,27 @@ msgstr "" msgid "Enable Cache" msgstr "Activar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Activar Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Activar MMU" @@ -1989,7 +2023,7 @@ msgstr "Activar MMU" msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" @@ -1997,7 +2031,7 @@ msgstr "Activar Protector de Ecrã" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" @@ -2019,7 +2053,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2056,7 +2090,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2064,27 +2098,21 @@ msgstr "" "Activar isto para aumentar desempenho no The Legend of Zelda: Twilight " "Princess. Desactive para qualquer outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2097,7 +2125,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2119,9 +2147,9 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglês" @@ -2150,11 +2178,11 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " @@ -2185,7 +2213,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2195,16 +2222,21 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exportar todos os jogos guardados" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "A Exportação Falhou" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exportar Ficheiro" @@ -2212,7 +2244,7 @@ msgstr "Exportar Ficheiro" msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exportar Gravação..." @@ -2228,9 +2260,10 @@ msgstr "Exportar jogo guardado Wii (Experimental)" msgid "Export all saves" msgstr "Exportar todos os jogos guardados" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Exportação falhou, tentar novamente?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "A Exportação Falhou" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2252,44 +2285,44 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra apenas útil em \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Extrair Todos os Ficheiros..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Extrair Pasta..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Extrair Ficheiro..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "A Extrair..." @@ -2305,11 +2338,11 @@ msgstr "Reprodutor FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Tamanho FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "A Conexão Falhou!" @@ -2317,7 +2350,7 @@ msgstr "A Conexão Falhou!" msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2358,16 +2391,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2396,12 +2429,12 @@ msgstr "" "Falha ao ler a tabela de blocos atribuídos\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Falha ao ler dados do ficheiro %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2422,7 +2455,7 @@ msgstr "" "Falha ao ler a pasta correctamente\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2434,29 +2467,34 @@ msgstr "" "Falha ao ler o cabeçalho correctamente\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Falha ao escrever cabeçalho para o ficheiro %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Falha ao ler ID único da imagem do disco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Falha ao escrever BT.DINF para SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Falha ao escrever bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Falha ao ler dados do ficheiro %d" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Falha ao escrever cabeçalho para %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Falha ao escrever cabeçalho para o ficheiro %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "" @@ -2468,17 +2506,17 @@ msgstr "Rápido" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versão rápida do MMU. Não funciona em todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Reprodutor Fifo" @@ -2519,16 +2557,16 @@ msgstr "Ficheiros não são reconhecidos como sendo de cartão de memória" msgid "File not compressed" msgstr "Ficheiro não comprimido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo aberto desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" @@ -2556,7 +2594,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" @@ -2589,7 +2627,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2611,7 +2649,7 @@ msgstr "" msgid "Forward" msgstr "Frente" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2620,6 +2658,11 @@ msgstr "" msgid "Found %d results for '" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Não foi possível guardar %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2649,7 +2692,7 @@ msgstr "Alcance de Quadros" msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Limite de Quadros:" @@ -2661,9 +2704,9 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francês" @@ -2676,7 +2719,7 @@ msgstr "Trastes" msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Ecrã Inteiro" @@ -2688,7 +2731,7 @@ msgstr "Resolução em ecrã Inteiro:" msgid "GCI File(*.gci)" msgstr "Ficheiro GCI(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "ComandoGC" @@ -2696,27 +2739,27 @@ msgstr "ComandoGC" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID do Jogo:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "O jogo já está a correr!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "O jogo não está a correr!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Definições específicas por jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Configuração de Jogo" @@ -2724,7 +2767,7 @@ msgstr "Configuração de Jogo" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2733,16 +2776,16 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Definições de Comando Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2756,7 +2799,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Geral" @@ -2765,9 +2808,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Alemão" @@ -2776,11 +2819,11 @@ msgstr "Alemão" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index é maior que o tamanho da lista de código %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Definições Gráficas" @@ -2799,7 +2842,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Grego" @@ -2827,7 +2870,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebraico" @@ -2839,7 +2882,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2851,7 +2894,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2890,7 +2933,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2899,11 +2942,11 @@ msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Húngaro" @@ -2911,14 +2954,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentativa de obter dados de um ticket desconhecido: %08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2927,11 +2970,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Definições IPL" @@ -2947,11 +2990,11 @@ msgstr "Ponteiro Infra Vermelho" msgid "IR Sensitivity:" msgstr "Sensibilidade de Infra Vermelhos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Pastas ISO" @@ -2963,7 +3006,7 @@ msgstr "Itália" msgid "Icon" msgstr "Ícone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3005,9 +3048,15 @@ msgstr "" msgid "Import Save" msgstr "Importar Jogo Guardado" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importação falhou, tentar novamente?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importar Jogo Guardado" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "A Exportação Falhou" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3029,21 +3078,17 @@ msgstr "" "O ficheiro importado tem a extensão sav\n" "mas não tem um cabeçalho correcto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Em Jogo" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "Em-Jogo" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Limite de Quadros:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Informação" @@ -3063,7 +3108,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3071,7 +3116,7 @@ msgstr "Inserir Cartão SD" msgid "Insert name here.." msgstr "Introduza o nome aqui..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Instalar WAD" @@ -3079,40 +3124,41 @@ msgstr "Instalar WAD" msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Definições de interface" @@ -3137,15 +3183,15 @@ msgstr "Erro interno de LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra mágica (%x)" @@ -3178,7 +3224,7 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" @@ -3194,13 +3240,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Estado Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italiano" @@ -3208,16 +3254,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japonês" @@ -3240,8 +3286,8 @@ msgstr "" msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Coreano" @@ -3259,16 +3305,16 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3311,7 +3357,7 @@ msgstr "" msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3410,15 +3456,15 @@ msgstr "Carregar Estado Slot 8" msgid "Load State Slot 9" msgstr "Carregar Estado Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Carregar Estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3437,10 +3483,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar Valores de origem para padrões de hack disponíveis." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Local" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Relatório" @@ -3470,11 +3512,11 @@ msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Relatório em execução" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "A ligação ao servidor perdeu-se!" @@ -3482,7 +3524,7 @@ msgstr "A ligação ao servidor perdeu-se!" msgid "M Button" msgstr "Botão M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3491,7 +3533,7 @@ msgstr "" "MD5 não combina\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" @@ -3505,11 +3547,11 @@ msgstr "ficheiros MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Stick Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID do autor:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Fabricante:" @@ -3540,7 +3582,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Cartão de memória" @@ -3552,7 +3594,7 @@ msgstr "" "Gestor de Cartões de memória AVISO-Faça cópias de segurança antes de " "utilizar, deve estar corrigido mas também pode danificar!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3577,7 +3619,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mic" @@ -3590,7 +3632,7 @@ msgstr "Min" msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3739,7 +3781,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3786,7 +3828,7 @@ msgstr "Nenhum ISO ou WAD encontrado" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Nenhum ficheiro banner foi encontrado para o título %s" @@ -3812,7 +3854,7 @@ msgstr "Sem entradas de índice para pastas livres" msgid "No recorded file" msgstr "Nenhum ficheiro de gravação" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Não foi encontrada a pasta de jogo guardado para o título %s" @@ -3821,11 +3863,11 @@ msgstr "Não foi encontrada a pasta de jogo guardado para o título %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" @@ -3833,17 +3875,17 @@ msgstr "Bokmaal Norueguês" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Não definido" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Não conectado" @@ -3889,7 +3931,7 @@ msgstr "Objecto" msgid "Object Range" msgstr "Alcance de Objecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Desligado" @@ -3897,16 +3939,20 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Abrir" @@ -3919,7 +3965,7 @@ msgstr "Abrir &Pasta" msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Abrir ficheiro..." @@ -3945,6 +3991,16 @@ msgstr "Descodificador de Textura OpenCL" msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3970,7 +4026,7 @@ msgstr "" msgid "Other" msgstr "Outro" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3982,7 +4038,7 @@ msgstr "" msgid "Output" msgstr "Destino" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "R&eproduzir Gravação..." @@ -3990,7 +4046,7 @@ msgstr "R&eproduzir Gravação..." msgid "Pad" msgstr "Comando" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Comando" @@ -4019,21 +4075,21 @@ msgstr "Parâmetros" msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Caminhos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pausa" @@ -4046,7 +4102,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfeito" @@ -4056,9 +4112,9 @@ msgid "Perspective %d" msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Começar" @@ -4070,7 +4126,7 @@ msgstr "Tocar Gravação" msgid "Play/Pause" msgstr "Começar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Jogável" @@ -4078,11 +4134,11 @@ msgstr "Jogável" msgid "Playback Options" msgstr "Opções de Reprodução" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4094,36 +4150,36 @@ msgstr "Por favor crie uma perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Mais-Menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" @@ -4131,17 +4187,17 @@ msgstr "Português (Brasileiro)" msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4174,7 +4230,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Limpar Cache" @@ -4182,8 +4238,8 @@ msgstr "Limpar Cache" msgid "Question" msgstr "Questão" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Sair" @@ -4244,6 +4300,11 @@ msgstr "" msgid "Record" msgstr "Gravar" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Opções de Gravação" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Informação de Gravação" @@ -4280,7 +4341,7 @@ msgstr "" "Em caso de dúvida, seleccione Nenhum." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Actualizar" @@ -4289,14 +4350,14 @@ msgstr "Actualizar" msgid "Refresh List" msgstr "Actualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Remover" @@ -4327,7 +4388,7 @@ msgstr "Resultados" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4345,13 +4406,12 @@ msgstr "Stick Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russo" @@ -4364,7 +4424,7 @@ msgid "Safe" msgstr "Seguro" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Guardar" @@ -4425,28 +4485,28 @@ msgstr "Guardar Estado Slot 8" msgid "Save State Slot 9" msgstr "Guardar Estado Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Guardar Estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." @@ -4468,7 +4528,7 @@ msgstr "A procurar ISOs" msgid "Scanning..." msgstr "Em Analise..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "ScrShot" @@ -4484,7 +4544,7 @@ msgstr "" msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" @@ -4507,12 +4567,12 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4534,19 +4594,19 @@ msgstr "Seleccione um ficheiro de jogo guardado para importar" msgid "Select floating windows" msgstr "Seleccionar janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4612,7 +4672,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Enviar" @@ -4624,11 +4684,11 @@ msgstr "Posição da Barra de Sensor:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4649,25 +4709,26 @@ msgstr "Definir como cartão de memória padrão %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive:O Index é maior que a lista de códigos ar %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Definições..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Abanar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Abreviatura:" @@ -4675,23 +4736,28 @@ msgstr "Abreviatura:" msgid "Shoulder Buttons" msgstr "Botões Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Mostrar &Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Mostrar &Barra de estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Mostrar Barra de Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Padrão" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Mostrar Unidades" @@ -4703,11 +4769,11 @@ msgstr "Mostrar Regiões de Cópia EFB" msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Mostrar GameCube" @@ -4715,35 +4781,35 @@ msgstr "Mostrar GameCube" msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Mostrar Japão" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Mostrar Coreia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Mostrar Pal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Mostrar Regiões" @@ -4751,27 +4817,27 @@ msgstr "Mostrar Regiões" msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma caixa de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4789,7 +4855,7 @@ msgstr "Mostrar primeiro bloco" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4824,7 +4890,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Mostrar desconhecido" @@ -4842,7 +4908,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -4850,11 +4916,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4879,17 +4945,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -4897,7 +4963,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Captura de ecrã" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Renderizador por Software" @@ -4914,7 +4980,7 @@ msgstr "" "Tem a certeza que quer activar a renderização por software? Em caso de " "dúvida, seleccione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Definições de Som" @@ -4932,9 +4998,9 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Espanhol" @@ -4962,37 +5028,29 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Aumente a taxa de transferência do disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Stick quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Comando padrão" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Começar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Começar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "&Começar Gravação" @@ -5008,7 +5066,7 @@ msgstr "Estado" msgid "State Saves" msgstr "Estados Guardados" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "" @@ -5017,7 +5075,7 @@ msgid "Stick" msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Parar" @@ -5048,16 +5106,16 @@ msgstr "Strum" msgid "Subtract" msgstr "Subtrair" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Ficheiros extraídos com sucesso para %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Sucesso na importação de ficheiros de jogo guardado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5065,18 +5123,18 @@ msgstr "" msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Idioma do sistema:" @@ -5105,13 +5163,13 @@ msgstr "Table Esquerda" msgid "Table Right" msgstr "Table Direita" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Tirar Screenshot" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "" @@ -5131,7 +5189,7 @@ msgstr "Cache de Textura" msgid "Texture Format Overlay" msgstr "Formato da textura" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "O WAD foi instalado correctamente" @@ -5143,13 +5201,13 @@ msgstr "O caminho é inválido" msgid "The checksum was successfully fixed" msgstr "A checksum foi reparada com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5204,7 +5262,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Jogo Guardado que está a tentar copiar tem um tamanho de ficheiro inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5212,23 +5270,23 @@ msgstr "" "O idioma seleccionado não é suportado pelo seu sistema. A repor padrão do " "sistema." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "O servidor e a versão NetPlay do cliente são incompatíveis" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "O servidor está cheio!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "O servidor respondeu: O jogo está a correr neste momento!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "O servidor enviou uma mensagem de erro desconhecida!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "O ficheiro especificado \"%s\" não existe" @@ -5237,11 +5295,11 @@ msgstr "O ficheiro especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5249,7 +5307,7 @@ msgstr "" "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5265,7 +5323,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o próprio " "Action Replay" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos." @@ -5281,7 +5339,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -5289,7 +5347,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5343,7 +5401,7 @@ msgstr "Cópias EFB" msgid "Toggle Fog" msgstr "Alternar Todos os Tipos de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" @@ -5353,11 +5411,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinês Tradicional" @@ -5381,7 +5439,7 @@ msgstr "" "Tentativa de leitura inválida de SYSCONF\n" " ids bt de wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turco" @@ -5432,7 +5490,7 @@ msgstr "" "encriptado ou desencriptado válido. Verifique se o escreveu correctamente.\n" "Quer ignorar esta linha e continuar a analisar?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" @@ -5469,12 +5527,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Tipo de entrada desconhecida %i em SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Mensagem desconhecida recebida com a id : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5495,7 +5553,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5507,7 +5565,7 @@ msgstr "Utilizar Ecrã Inteiro" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" @@ -5532,6 +5590,15 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5555,7 +5622,7 @@ msgstr "Utilidade" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Hack de velocidade" @@ -5580,7 +5647,7 @@ msgstr "Verbosidade" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Vídeo" @@ -5588,17 +5655,17 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalação WAD falhou: erro ao criar %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" @@ -5633,7 +5700,7 @@ msgstr "Aviso - A iniciar um ELF em modo errado de consola!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - A iniciar um ISO em modo errado de consola!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5658,7 +5725,7 @@ msgstr "" "e tem o mesmo nome que um ficheiro no seu cartão de memória\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5666,7 +5733,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5674,7 +5741,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5710,23 +5777,19 @@ msgstr "Hack de Ecrã Panorâmico" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importação de Jogo Guardado Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5735,7 +5798,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler do ficheiro" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5744,7 +5807,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5752,7 +5815,7 @@ msgstr "Wiimote Conectado" msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Definições de Wiimote" @@ -5776,14 +5839,14 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "A trabalhar..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5843,7 +5906,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Não pode fechar painéis que contenham páginas." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Tem que escolher um jogo!!" @@ -5859,7 +5922,7 @@ msgstr "Tem que introduzir um valor decimal, hexadecimal ou octal válido." msgid "You must enter a valid profile name." msgstr "Tem que introduzir um nome de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Tem que reiniciar o Dolphin para que as alterações sejam efectuadas" @@ -5870,7 +5933,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5889,7 +5952,7 @@ msgstr "" "Deveria ser 0x%04x (mas é 0x%04llx)\n" "Pretende gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP hack" @@ -5957,7 +6020,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5970,7 +6033,17 @@ msgstr "iCacheJIT: A ler Opcode de %x. Por favor reportar." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Mensagem desconhecida recebida com a id : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -5989,9 +6062,21 @@ msgstr "| OU" #~ msgid "Accurate VBeam emulation" #~ msgstr "Emulação VBeam precisa" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Não foi possível definir os comandos. O jogador saiu ou o jogo está em " +#~ "execução!\n" +#~ "(definir os controlos enquanto o jogo está em execução ainda não é " +#~ "suportado)" + #~ msgid "Enable Hotkeys" #~ msgstr "Activar Teclas de Atalho" +#~ msgid "Export failed, try again?" +#~ msgstr "Exportação falhou, tentar novamente?" + #~ msgid "Failed to Listen!!" #~ msgstr "A Escuta Falhou!!" @@ -6010,12 +6095,21 @@ msgstr "| OU" #~ "Se os FPS são erráticos, esta opção poderá ajudar. (ON = Compatível, OFF " #~ "= Rápido)" +#~ msgid "Import failed, try again?" +#~ msgstr "Importação falhou, tentar novamente?" + +#~ msgid "In-Game" +#~ msgstr "Em-Jogo" + #~ msgid "Last Overwritten State" #~ msgstr "Último estado Substituído" #~ msgid "Last Saved State" #~ msgstr "Último Estado Guardado" +#~ msgid "Local" +#~ msgstr "Local" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Reconectar Wiimote ao Carregar Estado" @@ -6024,3 +6118,6 @@ msgstr "| OU" #~ msgid "Skip Dest. Alpha Pass" #~ msgstr "Saltar Dest. Alpha Pass" + +#~ msgid "Wii Save Import" +#~ msgstr "Importação de Jogo Guardado Wii" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 9c8a588503..bd70210262 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-08 18:30+0000\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -26,9 +26,9 @@ msgstr "" msgid " (too many to display)" msgstr "(muitos para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " Jogo : " @@ -45,7 +45,7 @@ msgstr "" "\"%s\" não existe.\n" "Criar um novo Memory Card de 16MB?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -71,8 +71,8 @@ msgstr "%d amostras" msgid "%d samples (quality level %d)" msgstr "%d amostras (nível de qualidade %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s já existe, deseja substituir?" @@ -110,12 +110,17 @@ msgstr "" "o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x " "bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s Falha na abertura" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s Falha na abertura" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s é um arquivo de 0 bytes" @@ -125,7 +130,7 @@ msgstr "%s é um arquivo de 0 bytes" msgid "%s is already compressed! Cannot compress it further." msgstr "%s Já está comprimido! Não é possível comprimir mais." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s é muito longo para o nome do arquivo, o máximo de caractéres é 45" @@ -154,7 +159,7 @@ msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Sobre..." @@ -162,7 +167,7 @@ msgstr "&Sobre..." msgid "&Boot from DVD Drive..." msgstr "&Carregar a Partir do Drive de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Pontos de Interrupção" @@ -170,7 +175,7 @@ msgstr "&Pontos de Interrupção" msgid "&Browse for ISOs..." msgstr "&Procurar por ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Gerenciador de &Cheats" @@ -194,11 +199,11 @@ msgstr "&Emulação" msgid "&File" msgstr "&Arquivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Tela Cheia" @@ -206,7 +211,7 @@ msgstr "&Tela Cheia" msgid "&Graphics Settings" msgstr "Configurações de &Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Ajuda" @@ -214,7 +219,7 @@ msgstr "&Ajuda" msgid "&Hotkey Settings" msgstr "Configurações de &Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -226,11 +231,11 @@ msgstr "&Carregar Estado" msgid "&Memcard Manager (GC)" msgstr "Gerenciador de Cartão de &Memória (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Abrir..." @@ -238,11 +243,11 @@ msgstr "&Abrir..." msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pausar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Jogar" @@ -250,39 +255,39 @@ msgstr "&Jogar" msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Recarregar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registradores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Ver" @@ -371,7 +376,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -379,7 +384,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -387,8 +392,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Uma janela de Netplay já está aberta!!" @@ -415,8 +420,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -442,13 +445,13 @@ msgstr "" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "Códigos AR" @@ -581,11 +584,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Adicionar Código de ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Adicionar Patch" @@ -593,9 +596,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Adicionar..." @@ -647,36 +650,36 @@ msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Configurações Avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" @@ -704,7 +707,7 @@ msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?" msgid "Apploader unable to load from file" msgstr "O Apploader não pôde carregar do arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -722,7 +725,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Árabe" @@ -731,7 +734,7 @@ msgstr "Árabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Você tem certeza de que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -739,17 +742,17 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (experimental)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -758,12 +761,12 @@ msgstr "Proporção:" msgid "At least one pane must remain open." msgstr "Pelo menos um painél deve permanecer aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Áudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Backend de Audio" @@ -771,7 +774,7 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Automático" @@ -810,7 +813,7 @@ msgstr "Registrador BP" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Configurações do Backend" @@ -828,7 +831,7 @@ msgstr "Input em Background" msgid "Backward" msgstr "Para trás" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Header de Arquivo Ruim" @@ -841,11 +844,11 @@ msgstr "" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Banner:" @@ -857,7 +860,7 @@ msgstr "Alavanca" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -886,7 +889,7 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Embaixo" @@ -895,11 +898,11 @@ msgstr "Embaixo" msgid "Bound Controls: %lu" msgstr "Controles Acoplados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Quebrado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Procurar" @@ -907,15 +910,15 @@ msgstr "Procurar" msgid "Browse for a directory to add" msgstr "Procurar por um diretório para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Procurar por um diretório de output" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -925,7 +928,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -949,7 +952,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" @@ -971,7 +974,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -986,9 +989,9 @@ msgstr "Não é possível ler do DVD_Plugin - DVD-Interface: Erro Fatal" msgid "Cancel" msgstr "Cancelar" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Não é possível abrir %s" @@ -997,7 +1000,7 @@ msgstr "Não é possível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Não é possível cancelar o registro de evnetos com eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1008,7 +1011,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1020,7 +1023,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalão" @@ -1028,11 +1031,11 @@ msgstr "Catalão" msgid "Center" msgstr "Centralizar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Mudar &Disco..." @@ -1040,11 +1043,11 @@ msgstr "Mudar &Disco..." msgid "Change Disc" msgstr "Mudar o Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Mudar Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1060,11 +1063,11 @@ msgstr "Muda o sinal para o parâmetro do zFar (após a correção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Muda o sinal para o parâmetro do zNear (após a correção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Mudar isso não vai ter efeito enquanto o emulador estiver rodando!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat" @@ -1080,39 +1083,39 @@ msgstr "Busca de Cheats" msgid "Cheats Manager" msgstr "Gerenciador de Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Checar Integridade da Partição" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Checando Integridade..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1120,7 +1123,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1128,8 +1131,8 @@ msgstr "" "Escolher um arquivo para ser usado como apploader: (aplicável somente para " "discos construídos de diretórios)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1148,7 +1151,7 @@ msgstr "Clássico" msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1158,7 +1161,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Fechar" @@ -1183,7 +1186,7 @@ msgstr "Comandos" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Comentário:" @@ -1195,12 +1198,12 @@ msgstr "Comprimir ISO..." msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Comprimindo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Configurar" @@ -1214,22 +1217,22 @@ msgstr "Configurar" msgid "Configure Control" msgstr "Configurar Controle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Configurar Controles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" @@ -1238,17 +1241,17 @@ msgstr "Confirmar ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" @@ -1269,7 +1272,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Conectando..." @@ -1289,7 +1292,7 @@ msgstr "Controle" msgid "Convert to GCI" msgstr "Converter para GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Falha na Cópia" @@ -1298,7 +1301,7 @@ msgstr "Falha na Cópia" msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Núcleo" @@ -1312,7 +1315,7 @@ msgstr "Não pôde criar %s" msgid "Could not initialize backend %s." msgstr "Não foi possível inicializar o Backend 5s. %s" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1323,25 +1326,16 @@ msgstr "" "cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem " "ser lidos pela maioria dos leitores de DVD dos PCs." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer o arquivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Não foi possível salvar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Não foi possível definir os controles. O jogador saiu ou o jogo está rodando " -"no momento!\n" -"(Definir os controles durante o jogo ainda não é suportado)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1355,11 +1349,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1372,7 +1366,7 @@ msgstr "" msgid "Count:" msgstr "Contagem:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "País:" @@ -1412,12 +1406,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Diretória atual foi alterado de %s para %s conforme wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Hack de Projeção Customizado" @@ -1425,11 +1419,11 @@ msgstr "Hack de Projeção Customizado" msgid "Custom Projection Hack Settings" msgstr "Configurações de Hack de Projeção Customizado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tcheco" @@ -1441,36 +1435,37 @@ msgstr "D" msgid "D-Pad" msgstr "Direcional Digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP em um Thread Dedicado" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Configurações de Áudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP em um Thread Dedicado" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "Raiz do DVD:" @@ -1482,7 +1477,7 @@ msgstr "DVDLowRead - Erro Fatal: falha ao ler do volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erro Fatal: falha ao ler do volume" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1490,7 +1485,7 @@ msgstr "" msgid "Data Size" msgstr "Tamanho de Arquivo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Data:" @@ -1527,8 +1522,8 @@ msgstr "Descomprimir ISO..." msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" @@ -1541,7 +1536,7 @@ msgstr "Atualizar a lista de jogos" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1585,8 +1580,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1598,7 +1593,7 @@ msgstr "Discar" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1666,7 +1661,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disco" @@ -1693,24 +1688,60 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Decoder Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configurações %s Gráficas do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "&Web Site do Dolphin" @@ -1726,12 +1757,12 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS do Dolphin (*.dtm)" @@ -1739,7 +1770,7 @@ msgstr "Filmes TAS do Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuração de Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" @@ -1759,12 +1790,12 @@ msgstr "" "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" "clique aqui para mostrar todos os jogos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "O Dolphin não conseguiu completar a ação requisitada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1791,11 +1822,11 @@ msgstr "Códigos %lu baixados. (Adicionados %lu)" msgid "Drums" msgstr "Bateria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Extrair Áudio" @@ -1841,9 +1872,9 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holandês" @@ -1876,7 +1907,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Atualizações prévias de Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Editar" @@ -1888,16 +1919,20 @@ msgstr "Editar Código ActionReplay" msgid "Edit Config" msgstr "Editar Configuração" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Editar perspectiva atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Editar..." @@ -1909,7 +1944,7 @@ msgstr "Efeito" msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Este Segmento de Emulação já está rodando" @@ -1947,7 +1982,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emular Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Estado de Emulação" @@ -1975,11 +2010,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Ativar Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Ativar Cálculo de Caixas Limitadoras" @@ -1987,27 +2022,27 @@ msgstr "Ativar Cálculo de Caixas Limitadoras" msgid "Enable Cache" msgstr "Ativar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Ativar Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Ativar Modo de Dois Núcleos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Ativar Modo de Dois Núcleos (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Ativar MMU" @@ -2015,7 +2050,7 @@ msgstr "Ativar MMU" msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" @@ -2023,7 +2058,7 @@ msgstr "Ativar Salva-Tela" msgid "Enable Speaker Data" msgstr "Ativar Dados do Auto-falante" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Ativar WideScreen" @@ -2046,7 +2081,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2082,7 +2117,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2090,11 +2125,11 @@ msgstr "" "Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight " "Princess. Disative para QUALQUER UM outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2102,22 +2137,13 @@ msgstr "" "Habilita emulação do Dolby Pro Logic II usando surround 5.1. Não disponível " "no OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " "apenas no backend OpenAL." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " -"apenas no backend OpenAL. Talvez seja necessário renomear o soft_oal.dll " -"para OpenAL32.dll para que funcione." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2130,7 +2156,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2152,9 +2178,9 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglês" @@ -2183,11 +2209,11 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." @@ -2218,7 +2244,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2228,16 +2253,21 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exportar todos os saves" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Falha na Exportação" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exportar Arquivo" @@ -2245,7 +2275,7 @@ msgstr "Exportar Arquivo" msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exportar Gravação..." @@ -2261,9 +2291,10 @@ msgstr "Exportar save do Wii (Experimental)" msgid "Export all saves" msgstr "Exportar todos os saves" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Falha na exportação, tentar novamente?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Falha na Exportação" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2285,44 +2316,44 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra útil apenas em \"Metroid Other M\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Extrair Todos os arquivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Extrair diretorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Extrair Arquivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Extraindo..." @@ -2338,11 +2369,11 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Tamanho FST:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Falha ao Conectar\"" @@ -2350,7 +2381,7 @@ msgstr "Falha ao Conectar\"" msgid "Failed to download codes." msgstr "Falha ao dazer o download de códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2390,16 +2421,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Falha ao ler %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Falha ao ler o bk header" @@ -2430,12 +2461,12 @@ msgstr "" "Falha ao ler mesa de alocação de blocos corretamente\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Falha ao ler dados do arquivo %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Falha ao ler dados do arquivo: %s" @@ -2456,7 +2487,7 @@ msgstr "" "Não foi possível ler o diretório corretamente\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Falha ao ler o header" @@ -2468,29 +2499,34 @@ msgstr "" "Não foi possível ler o header corretamente\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Falha ao escrever o header para o arquivo %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Não foi possível ler ID exclusivo da imagem do disco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Falha ao escrever BT.DINF no SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Falha ao escrever bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Falha ao ler dados do arquivo: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Falha ao escrever o header para %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Falha ao escrever o header para o arquivo %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Persa" @@ -2502,11 +2538,11 @@ msgstr "Rápido" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rápida versão do MMU. Não funciona para todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2514,7 +2550,7 @@ msgstr "" "Desincronização fatal. Abortando reprodução. (Erro em PlayWiimote: %u != %u, " "byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo Player" @@ -2555,16 +2591,16 @@ msgstr "Arquivo não reconhecido como Memory Card" msgid "File not compressed" msgstr "Arquivo não comprimido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" @@ -2592,7 +2628,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" @@ -2625,7 +2661,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2647,7 +2683,7 @@ msgstr "" msgid "Forward" msgstr "Para frente" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2656,6 +2692,11 @@ msgstr "" msgid "Found %d results for '" msgstr "%d resultados encontrados para '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Não foi possível salvar %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2685,7 +2726,7 @@ msgstr "Alcanço do Quadro" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Limitador de FPS:" @@ -2697,9 +2738,9 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Francês" @@ -2712,7 +2753,7 @@ msgstr "Notas" msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Tela Cheia" @@ -2724,7 +2765,7 @@ msgstr "Resolução da Tela Cheia:" msgid "GCI File(*.gci)" msgstr "Arquivo GCI(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GCPad" @@ -2732,27 +2773,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID do jogo:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "O jogo já está rodando!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "O jogo não está rodando!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Jogo não encontrado!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Opções especificas do jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Opçõesdojogo" @@ -2760,7 +2801,7 @@ msgstr "Opçõesdojogo" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Arquivos de Save do GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2769,16 +2810,16 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Configurações do controle de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2796,7 +2837,7 @@ msgstr "" "diretório Sys e reiniciando o Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Geral" @@ -2805,9 +2846,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Alemão" @@ -2816,11 +2857,11 @@ msgstr "Alemão" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Configurações Gráficas" @@ -2846,7 +2887,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Grego" @@ -2874,7 +2915,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "A checagem do header falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebreu" @@ -2886,7 +2927,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2906,7 +2947,7 @@ msgstr "" "\n" "Até mais!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2946,7 +2987,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Host" @@ -2955,11 +2996,11 @@ msgid "Hotkey Configuration" msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Húngaro" @@ -2967,13 +3008,13 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentou adiquirir dados de um ticket desconhecido: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2982,11 +3023,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Definições de IPL" @@ -3002,11 +3043,11 @@ msgstr "Ponteiro IR" msgid "IR Sensitivity:" msgstr "Sensibilidade IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Diretórios de ISO" @@ -3018,7 +3059,7 @@ msgstr "ITÁLIA" msgid "Icon" msgstr "Icone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3062,9 +3103,15 @@ msgstr "" msgid "Import Save" msgstr "Importar Save" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Falha na Importação, tentar novamente?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importar Save" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Falha na Exportação" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3086,21 +3133,17 @@ msgstr "" "O arquivo importado tem a extensão sav\n" "mas não tem um header correto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Funciona" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "In-Game" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Limitador de FPS:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3120,7 +3163,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3128,7 +3171,7 @@ msgstr "Insira cartão SD" msgid "Insert name here.." msgstr "Insira nome aqui.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Instalar WAD" @@ -3136,30 +3179,31 @@ msgstr "Instalar WAD" msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Erro na Checagem de Integridade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Checagem de Integridade completa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Checagem de Integridade completa. Nenhum erro foi encontrado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3168,11 +3212,11 @@ msgstr "" "Checagem de Integridade para a partição %d falhou. Sua cópia deve estar " "corrompida ou foi incorretamente corrigido (patch)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Opções de interface" @@ -3197,15 +3241,15 @@ msgstr "Erro Interno do LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra Mágica(%x)" @@ -3238,7 +3282,7 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" @@ -3256,13 +3300,13 @@ msgstr "" "String de busca inválida (apenas comprimentos correspondentes de string são " "suportados)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Estado Salvo Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italiano" @@ -3270,16 +3314,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (Recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japonês" @@ -3305,8 +3349,8 @@ msgstr "Manter Janela no Topo" msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Coreano" @@ -3324,16 +3368,16 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Linguagem:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Latência:" @@ -3376,7 +3420,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3475,15 +3519,15 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State Slot 9" msgstr "Carregar Estado do Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Carregar State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3503,10 +3547,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar valores predefinidos dos padrões de hacks disponíveis." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Local" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Log" @@ -3540,11 +3580,11 @@ msgid "Logger Outputs" msgstr "Resposta do Logger" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Logando" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "A conexão com o servidor foi perdida!" @@ -3552,7 +3592,7 @@ msgstr "A conexão com o servidor foi perdida!" msgid "M Button" msgstr "Butão M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3561,7 +3601,7 @@ msgstr "" "Incompatibilidade do MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" @@ -3575,11 +3615,11 @@ msgstr "Arquivos de Gameshark MadCatz(*.gcs)" msgid "Main Stick" msgstr "Analógico Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID da fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Fabricante:" @@ -3616,7 +3656,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Cartão de memoria" @@ -3628,7 +3668,7 @@ msgstr "" "AVISO do Gerenciador de- Memory Card - Faça backupsantes de usar, deve estar " "funcionando mas pode corromper coisas!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3653,7 +3693,7 @@ msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Microfone" @@ -3666,7 +3706,7 @@ msgstr "Mínimo" msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Opções diversas" @@ -3815,7 +3855,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3862,7 +3902,7 @@ msgstr "Sem ISOs ou WADs achados" msgid "No audio output" msgstr "Nenhuma saída de áudio" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Nenhum arquivo de banner encontrado para o título %s" @@ -3888,7 +3928,7 @@ msgstr "Não há entradas de índice de diretório livres" msgid "No recorded file" msgstr "Nenhum arquivo gravado" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Nenhuma pasta de salva encontrada para o título %s" @@ -3897,11 +3937,11 @@ msgstr "Nenhuma pasta de salva encontrada para o título %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" @@ -3909,18 +3949,18 @@ msgstr "Norueguês Bokmaal" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Indefinido" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" "Nenhum arquivo salvo do Wii save ou falha ao ler o header de tamanho %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Não conectado" @@ -3966,7 +4006,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Alcance do Objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Desligado" @@ -3974,16 +4014,20 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Mostrar Mensagens na Tela" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Abrir" @@ -3996,7 +4040,7 @@ msgstr "Abrir &conteúdo da pasta" msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Abrir Arquivo..." @@ -4022,6 +4066,16 @@ msgstr "Decodificador de Texturas OpenCL" msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4047,7 +4101,7 @@ msgstr "" msgid "Other" msgstr "Outros" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4059,7 +4113,7 @@ msgstr "" msgid "Output" msgstr "Saída" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "R&eproduzir gravação..." @@ -4067,7 +4121,7 @@ msgstr "R&eproduzir gravação..." msgid "Pad" msgstr "Controle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Controle" @@ -4096,21 +4150,21 @@ msgstr "Parâmetros" msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Diretórios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pausar" @@ -4123,7 +4177,7 @@ msgstr "Pausar no fim do vídeo" msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfeito" @@ -4133,9 +4187,9 @@ msgid "Perspective %d" msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Executar" @@ -4147,7 +4201,7 @@ msgstr "Reproduzir Gravação" msgid "Play/Pause" msgstr "Executar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Jogável" @@ -4155,11 +4209,11 @@ msgstr "Jogável" msgid "Playback Options" msgstr "Opções de Reprodução" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4171,36 +4225,36 @@ msgstr "Favor criar uma perspectiva antes de salvar" msgid "Plus-Minus" msgstr "Positivo-Negativo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Porta 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" @@ -4208,17 +4262,17 @@ msgstr "Português (Brasil)" msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fim prematuro do vídeo no PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u > %u" @@ -4251,7 +4305,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Limpar o Cache" @@ -4259,8 +4313,8 @@ msgstr "Limpar o Cache" msgid "Question" msgstr "Questão" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Sair" @@ -4321,6 +4375,11 @@ msgstr "Wiimotes Reais" msgid "Record" msgstr "Gravar" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Opções de Gravação" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Informações de Gravação" @@ -4356,7 +4415,7 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Atualizar" @@ -4365,14 +4424,14 @@ msgstr "Atualizar" msgid "Refresh List" msgstr "Atualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Remover" @@ -4403,7 +4462,7 @@ msgstr "Resultados" msgid "Return" msgstr "Retornar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4421,15 +4480,15 @@ msgstr "Analógico Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Executa DSP HLE e LLE em um thread dedicado (não recomendado: pode causar " "falhas no áudio com HLE e congelamentos com LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russo" @@ -4442,7 +4501,7 @@ msgid "Safe" msgstr "Seguro" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Salvar" @@ -4503,28 +4562,28 @@ msgstr "Salvar Instante Atual no Slot 8" msgid "Save State Slot 9" msgstr "Salvar Instante Atual no Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Salvar Instante Atual..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." @@ -4546,7 +4605,7 @@ msgstr "Procurando por ISOs" msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "ScrShot" @@ -4562,7 +4621,7 @@ msgstr "Busca" msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" @@ -4585,12 +4644,12 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4611,19 +4670,19 @@ msgstr "Selecione um arquivo de jogo salvo para importar" msgid "Select floating windows" msgstr "Selecionar Janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecione um instante para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Selecione um instante para salvar" @@ -4701,7 +4760,7 @@ msgstr "" "\n" "Se estiver em dúvida, use Direct3D 11." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Enviar" @@ -4713,11 +4772,11 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4739,7 +4798,7 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4747,19 +4806,20 @@ msgstr "" "Configura a latência (em ms). Valores mais altos podem reduzir problemas de " "corte no áudio. Disponível apenas no backend OpenAL." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Configurações..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Arquivo de configuração não encontrado" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Nome Curto:" @@ -4767,23 +4827,28 @@ msgstr "Nome Curto:" msgid "Shoulder Buttons" msgstr "Botões Superiores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Mostrar &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Mostrar Janela de &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Mostrar barra de &Status" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Show Barra de &Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Padrão" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Mostrar Drives" @@ -4795,11 +4860,11 @@ msgstr "Mostrar Regiões de Cópia do EFB" msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Mostrar GameCube" @@ -4807,35 +4872,35 @@ msgstr "Mostrar GameCube" msgid "Show Input Display" msgstr "Mostrar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Mostrar Coréia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Mostrar Regiões" @@ -4843,27 +4908,27 @@ msgstr "Mostrar Regiões" msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma janela de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4881,7 +4946,7 @@ msgstr "Mostrar o primeiro bloco" msgid "Show lag counter" msgstr "Mostar o contador de lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4919,7 +4984,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Mostra desconhecido" @@ -4937,7 +5002,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -4945,11 +5010,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Pular limpeza DCBZ" @@ -4974,17 +5039,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -4992,7 +5057,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Captura de tela" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Renderizador por Software" @@ -5008,7 +5073,7 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Configurações de Som" @@ -5026,9 +5091,9 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Espanhol" @@ -5056,37 +5121,29 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Aumentar a velocidade de transferência do disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Analógico Quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Controle Padrão" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Iniciar NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Iniciar Ca&ptura" @@ -5102,7 +5159,7 @@ msgstr "Status" msgid "State Saves" msgstr "Estados Salvos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Volante" @@ -5111,7 +5168,7 @@ msgid "Stick" msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Parar" @@ -5142,16 +5199,16 @@ msgstr "Palheta" msgid "Subtract" msgstr "Subtrair" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Arquivo exportado com sucesso para %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Arquivos de salva importados com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5159,11 +5216,11 @@ msgstr "" msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Sincronizar thread da GPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5171,8 +5228,8 @@ msgstr "" "Sincroniza as threads da GPU e da CPU para ajudar a evitar travamentos " "aleatórios no modo Dual Core. (ATIVADO = Compatível, DESATIVADO = Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Idioma do Systema:" @@ -5201,13 +5258,13 @@ msgstr "Esquerda da Mesa" msgid "Table Right" msgstr "Direita da Mesa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Capturar Tela" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5227,7 +5284,7 @@ msgstr "Cache de Texturas" msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "O WAD foi instalado com sucesso" @@ -5239,13 +5296,13 @@ msgstr "O endereço é inválido" msgid "The checksum was successfully fixed" msgstr "O Checksum foi corrigido com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5302,7 +5359,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Salva que você está tentando copiar tem um tamanho de arquivo inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5310,23 +5367,23 @@ msgstr "" "O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do " "sistema." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "As versões de NetPlay do Client e do Servidor são incompatíveis!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "O servidor está cheio!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "O servidor respondeu: O jogo está rodando no momento!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "O servidor enviou uma mensagem de erro desconhecida!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "O arquivo especificado \"%s\" não existe" @@ -5335,11 +5392,11 @@ msgstr "O arquivo especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Tema:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5347,7 +5404,7 @@ msgstr "" "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5363,7 +5420,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o Action " "Replay em si." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." @@ -5388,7 +5445,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5401,7 +5458,7 @@ msgstr "" "consertar cortes no áudio mas pode causar ruído constante dependendo do " "jogo)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5455,7 +5512,7 @@ msgstr "Cópias de EFB" msgid "Toggle Fog" msgstr "Ligar/Desligar Todos os Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" @@ -5465,11 +5522,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinês Tradicional" @@ -5493,7 +5550,7 @@ msgstr "" "Tentando ler de um SYSCONF inválido\n" "Os Bt IDs do Wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turco" @@ -5547,7 +5604,7 @@ msgstr "" "corretamente.\n" "Você gostaria de ignorar esta linha e continuar a análise?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "%i indefinido" @@ -5584,12 +5641,12 @@ msgstr "Comando desconhecido 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Tipo de entrada desconhecido %i no SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Menssagem desconhecida recebida com identificação: %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5609,7 +5666,7 @@ msgstr "Atualizar" msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5621,7 +5678,7 @@ msgstr "Usar Tela Cheia" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" @@ -5646,6 +5703,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5669,7 +5735,7 @@ msgstr "Utilitário" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "Hack de velocidade MMU" @@ -5694,7 +5760,7 @@ msgstr "Verbosidade" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Vídeo" @@ -5702,17 +5768,17 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Falha na instalação da WAD: Erro na criação de %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Falha na instalação da WAD: Erro na criação do ticket" @@ -5746,7 +5812,7 @@ msgstr "Aviso - Inicializando ELF no modo de console errado!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - Inicializando ISO no modo de console errado!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5771,7 +5837,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5782,7 +5848,7 @@ msgstr "" "(byte %u > %u) (frame %u > %u). Você deveria carregar outro instante salvo, " "ou carregar este instante com o modo somente-leitura desligado." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5794,7 +5860,7 @@ msgstr "" "este instante com o modo somente-leitura desligado. Caso contrário você " "provavelmente terá uma desincronização." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5845,23 +5911,19 @@ msgstr "Hack de Widescreen" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importar Save de Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Save do Wii (*.bin)|*.bin" @@ -5870,7 +5932,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler o arquivo" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5879,7 +5941,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5887,7 +5949,7 @@ msgstr "Wiimote Conectado" msgid "Wiimote Motor" msgstr "Motor do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Configurações do Wiimote" @@ -5911,14 +5973,14 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Funcionando..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5983,7 +6045,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Você não pode fechar painéis que têm páginas neles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Você deve escolher um jogo!!" @@ -5999,7 +6061,7 @@ msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal." msgid "You must enter a valid profile name." msgstr "Você deve digitar um nome válido para o perfil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Você deve reiniciar o Dolphin para que as modificações tenham efeito." @@ -6013,7 +6075,7 @@ msgstr "" "Gostaria de parar agora para resolver o problema?\n" "Se você escolher \"Não\", o áudio pode falhar." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6032,7 +6094,7 @@ msgstr "" "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n" "Você gostaria de gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "Hack do ZTB" @@ -6100,7 +6162,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6113,7 +6175,17 @@ msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Menssagem desconhecida recebida com identificação: %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retornou -1 ao rodar o aplicativo!" @@ -6144,9 +6216,28 @@ msgstr "| OR" #~ "\n" #~ "Se estiver em dúvida, deixe isto desativado." +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Não foi possível definir os controles. O jogador saiu ou o jogo está " +#~ "rodando no momento!\n" +#~ "(Definir os controles durante o jogo ainda não é suportado)" + #~ msgid "Enable Hotkeys" #~ msgstr "Ativar Hotkeys" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " +#~ "apenas no backend OpenAL. Talvez seja necessário renomear o soft_oal.dll " +#~ "para OpenAL32.dll para que funcione." + +#~ msgid "Export failed, try again?" +#~ msgstr "Falha na exportação, tentar novamente?" + #~ msgid "Failed to Listen!!" #~ msgstr "Não foi possível Ouvir!!" @@ -6168,12 +6259,21 @@ msgstr "| OR" #~ "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = " #~ "Compatível, OFF = Rápido)" +#~ msgid "Import failed, try again?" +#~ msgstr "Falha na Importação, tentar novamente?" + +#~ msgid "In-Game" +#~ msgstr "In-Game" + #~ msgid "Last Overwritten State" #~ msgstr "Último State sobrescrito" #~ msgid "Last Saved State" #~ msgstr "Último State Salvo" +#~ msgid "Local" +#~ msgstr "Local" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Reconectar Wiimote ao carregar Estado Salvo" @@ -6182,3 +6282,6 @@ msgstr "| OR" #~ msgid "Skip Dest. Alpha Pass" #~ msgstr "Não fazer o Dest. Alpha Pass" + +#~ msgid "Wii Save Import" +#~ msgstr "Importar Save de Wii" diff --git a/Languages/po/ru.po b/Languages/po/ru.po index eac42ed2a6..426993f964 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: N69 <69@no-spam.ws>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/dolphin-emu/" @@ -25,9 +25,9 @@ msgstr "" msgid " (too many to display)" msgstr "(слишком много)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " Игра : " @@ -44,7 +44,7 @@ msgstr "" "\"%s\" не существует.\n" " Создать новую карту памяти на 16Мб?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -70,8 +70,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s уже существует, переписать?" @@ -108,12 +108,17 @@ msgstr "" "%s невозможно загрузить карту памяти\n" "Размер файла неверен (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s не может быть открыт" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s не может быть открыт" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s - пустой файл" @@ -123,7 +128,7 @@ msgstr "%s - пустой файл" msgid "%s is already compressed! Cannot compress it further." msgstr "%s уже сжат! Больше сжать нельзя." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s слишком длинное имя файла, максимальная длина 45 знаков" @@ -152,7 +157,7 @@ msgstr "%u Свободных блоков; %u Свободных папок" msgid "&& AND" msgstr "&& И" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&О программе" @@ -160,7 +165,7 @@ msgstr "&О программе" msgid "&Boot from DVD Drive..." msgstr "&Запустить игру с DVD-диска..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Закладки" @@ -168,7 +173,7 @@ msgstr "&Закладки" msgid "&Browse for ISOs..." msgstr "&Выбрать папку с ISO-файлами..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Менеджер &читов" @@ -192,11 +197,11 @@ msgstr "&Эмуляция" msgid "&File" msgstr "&Файл" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "&Frame Advance" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Полноэкранный режим" @@ -204,7 +209,7 @@ msgstr "&Полноэкранный режим" msgid "&Graphics Settings" msgstr "&Опции видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Помощь" @@ -212,7 +217,7 @@ msgstr "&Помощь" msgid "&Hotkey Settings" msgstr "&Настройка \"Горячих\" клавиш" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -224,11 +229,11 @@ msgstr "Быстрая &загрузка" msgid "&Memcard Manager (GC)" msgstr "&Менеджер карт памяти (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "Па&мять" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "Выбор &файла для запуска..." @@ -236,11 +241,11 @@ msgstr "Выбор &файла для запуска..." msgid "&Options" msgstr "&Опции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Пауза" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Запустить" @@ -248,39 +253,39 @@ msgstr "&Запустить" msgid "&Properties" msgstr "&Свойства" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Режим \"Только для чтения\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Обновить список игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Регистры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Сбросить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "З&вук" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Остановить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Инструменты" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Вид" @@ -369,7 +374,7 @@ msgstr "<Введите название>" msgid "" msgstr "<Разрешений экрана не найдено>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "<Ничего>" @@ -377,7 +382,7 @@ msgstr "<Ничего>" msgid "" msgstr "<Нажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<Системный>" @@ -385,8 +390,8 @@ msgstr "<Системный>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Окно сетевой игры уже открыто!" @@ -411,8 +416,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -438,13 +441,13 @@ msgstr "" "\n" "Для создания игры вам необходимо открыть указанный порт на вашем роутере!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR-коды" @@ -565,11 +568,11 @@ msgstr "Адаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Добавление патча" @@ -577,9 +580,9 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Добавить..." @@ -617,36 +620,36 @@ msgstr "" msgid "Advanced" msgstr "Расширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Расширенные настройки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Все GC/Wii файлы (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Все GC/Wii образы (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Все GCM-файлы Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Файлы быстрых сохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа дисков GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Все файлы (*.*)|*.*" @@ -674,7 +677,7 @@ msgstr "Загрузчик неверноего размера... это точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Загрузчик:" @@ -689,7 +692,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabic" @@ -698,7 +701,7 @@ msgstr "Arabic" msgid "Are you sure you want to delete \"%s\"?" msgstr "Вы уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -706,15 +709,15 @@ msgstr "" "Вы уверены, что хотите удалить эти файлы?\n" "Они исчезнут навсегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Соотношение сторон:" @@ -723,12 +726,12 @@ msgstr "Соотношение сторон:" msgid "At least one pane must remain open." msgstr "Хотя бы одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Аудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Вывод аудио:" @@ -736,7 +739,7 @@ msgstr "Вывод аудио:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Авто" @@ -772,7 +775,7 @@ msgstr "BP регистры" msgid "Back" msgstr "Назад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Настройка вывода" @@ -790,7 +793,7 @@ msgstr "Фоновой ввод" msgid "Backward" msgstr "Взмах" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Неверный заголовок файла" @@ -803,11 +806,11 @@ msgstr "" msgid "Banner" msgstr "Логотип" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Данные логотипа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Логотип:" @@ -819,7 +822,7 @@ msgstr "Панель" msgid "Basic" msgstr "Основные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Основные настройки" @@ -848,7 +851,7 @@ msgid "Blue Right" msgstr "Синяя справа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "снизу" @@ -857,11 +860,11 @@ msgstr "снизу" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Не работает" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Обзор" @@ -869,15 +872,15 @@ msgstr "Обзор" msgid "Browse for a directory to add" msgstr "Выберите папку с образами игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Выбор папки с ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Укажите папку для сохранения" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Буфер:" @@ -887,7 +890,7 @@ msgstr "Буфер:" msgid "Buttons" msgstr "Кнопки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -909,7 +912,7 @@ msgstr "C Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Режим эмуляции CPU" @@ -926,7 +929,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -941,9 +944,9 @@ msgstr "" msgid "Cancel" msgstr "Отмена" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Не удалось открыть %s" @@ -952,7 +955,7 @@ msgstr "Не удалось открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -960,7 +963,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -972,7 +975,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalan" @@ -980,11 +983,11 @@ msgstr "Catalan" msgid "Center" msgstr "Центр" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Сменить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Сменить &диск..." @@ -992,11 +995,11 @@ msgstr "Сменить &диск..." msgid "Change Disc" msgstr "Изменить диск" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Сменить игру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1012,12 +1015,12 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Изменения данной опции вступят в силу только после перезапуска эмулятора." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Чат" @@ -1033,39 +1036,39 @@ msgstr "Поиск кодов" msgid "Cheats Manager" msgstr "Менеджер чит-кодов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Проверка целостности раздела" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Проверка целостности ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Выберите основной DVD-диск:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Выберете папку с NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Выберите папку для добавления в список" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Выберите файл карты памяти" @@ -1073,14 +1076,14 @@ msgstr "Выберите файл карты памяти" msgid "Choose a memory card:" msgstr "Выберите карту памяти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Выберите папку для сохранения файлов" @@ -1099,7 +1102,7 @@ msgstr "Circle Stick" msgid "Clear" msgstr "Очистить" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1109,7 +1112,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Закрыть" @@ -1134,7 +1137,7 @@ msgstr "Команда" msgid "Comment" msgstr "Комментарий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Комментарий:" @@ -1146,12 +1149,12 @@ msgstr "Сжать ISO-файл..." msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Сжатие образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Настройки" @@ -1165,22 +1168,22 @@ msgstr "Настройка" msgid "Configure Control" msgstr "Настройка управления" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Настроить контроллеры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Настройка эмулятора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Подтвердить перезапись файла" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Спрашивать при остановке" @@ -1189,17 +1192,17 @@ msgstr "Спрашивать при остановке" msgid "Connect" msgstr "Подключиться" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Подключить USB-клавиатуру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Подключить Wiimote %i" @@ -1220,7 +1223,7 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Подключение..." @@ -1240,7 +1243,7 @@ msgstr "Ctrl" msgid "Convert to GCI" msgstr "Конвертировать в GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Копирование неудачно" @@ -1249,7 +1252,7 @@ msgstr "Копирование неудачно" msgid "Copy to Memcard %c" msgstr "Копировать на карту памяти %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Ядро" @@ -1263,7 +1266,7 @@ msgstr "Не удалось создать %s" msgid "Could not initialize backend %s." msgstr "Не удалось инициализировать вывод %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1274,22 +1277,16 @@ msgstr "" "игры GC/Wii. Пожалйста, учитывайте, что большинство приводов для ПК не " "способны прочитать оригинальные диски для Gamecube и Wii." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Не удалось определить ISO образ %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Не удалось сохранить %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1303,11 +1300,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1318,7 +1315,7 @@ msgstr "" msgid "Count:" msgstr "Счетчик:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Страна:" @@ -1355,12 +1352,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1368,11 +1365,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Настройки Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Czech" @@ -1384,36 +1381,36 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "Аудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Эмулятор движка DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "Эмуляция DSP HLE (быстрая)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор DSP LLE (медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE рекомпилятор" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Настройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD-диск:" @@ -1425,7 +1422,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1433,7 +1430,7 @@ msgstr "" msgid "Data Size" msgstr "Размер данных" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Дата:" @@ -1470,8 +1467,8 @@ msgstr "Распаковка ISO..." msgid "Decompress selected ISOs..." msgstr "Снять сжатие с выбранных ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Распаковка ISO..." @@ -1484,7 +1481,7 @@ msgstr "Обновление списка игр" msgid "Default" msgstr "Сброс" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Образ по умолчанию:" @@ -1526,8 +1523,8 @@ msgstr "" msgid "Device" msgstr "Устройство" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Настройки устройств" @@ -1539,7 +1536,7 @@ msgstr "Вызов" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1589,7 +1586,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Диск" @@ -1613,24 +1610,60 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Вы хотите остановить эмуляцию?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Декодер Dolby Pro Logic II" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Настройки графики %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "&Веб-сайт эмулятора" @@ -1646,12 +1679,12 @@ msgstr "Настройки эмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Настройки Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ролики (*.dtm)" @@ -1659,7 +1692,7 @@ msgstr "Dolphin TAS ролики (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Настройка Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "&Репозиторий на Google Code" @@ -1679,12 +1712,12 @@ msgstr "" "Dolphin настроен на скрытие всех игр. Кликните здесь два раза, чтобы " "показать игры..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1711,11 +1744,11 @@ msgstr "Скачано %lu кодов. (добавлено %lu)" msgid "Drums" msgstr "Барабаны" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Макет" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Дампить аудио" @@ -1752,9 +1785,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Dutch" @@ -1786,7 +1819,7 @@ msgstr "ЕВРОПА" msgid "Early Memory Updates" msgstr "Ранние обновление памяти" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Изменить" @@ -1798,16 +1831,20 @@ msgstr "Изменить код ActionReplay" msgid "Edit Config" msgstr "Править вручную" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Изменить патч" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Изменить точку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Изменить..." @@ -1819,7 +1856,7 @@ msgstr "Эффект" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "" @@ -1846,7 +1883,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Качество эмуляции:" @@ -1868,11 +1905,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Включить логирование AR-событий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Включить совмещение блоков" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1880,27 +1917,27 @@ msgstr "" msgid "Enable Cache" msgstr "Включить кэш" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Включить чит-коды" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (ускорение)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (ускорение)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Включить MMU" @@ -1908,7 +1945,7 @@ msgstr "Включить MMU" msgid "Enable Progressive Scan" msgstr "Включить прогрессивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Включить режим \"Сохранения экрана\"" @@ -1916,7 +1953,7 @@ msgstr "Включить режим \"Сохранения экрана\"" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Включить широкий экран" @@ -1937,7 +1974,7 @@ msgstr "" "В некоторых играх возможны проблемы.\n" " Если не уверены , выберите 1х." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1965,7 +2002,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1973,11 +2010,11 @@ msgstr "" "Ускоряет игру The Legend of Zelda: Twilight Princess. Для любой ДРУГОЙ игры " "данный хак должен быть ОТКЛЮЧЕН." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Включить Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -1985,19 +2022,13 @@ msgstr "" "Включить Dolby Pro Logic II эмуляцию, используя 5.1 канальный звук. Нет " "поддержки в OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Включить Dolby Pro Logic II эмуляцию, используя 5.1 канальный звук. " "Необходим OpenAL вывод звука." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2006,7 +2037,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2025,9 +2056,9 @@ msgstr "" msgid "End" msgstr "Конец" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "English" @@ -2056,11 +2087,11 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Ошибки" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному." @@ -2089,7 +2120,6 @@ msgid "Euphoria" msgstr "Эйфория" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2098,16 +2128,21 @@ msgstr "" msgid "Execute" msgstr "Выполнить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Экспортировать все сохранения" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Экспорт неудачен" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Экспортирование файла" @@ -2115,7 +2150,7 @@ msgstr "Экспортирование файла" msgid "Export Recording" msgstr "Экспорт записи" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "&Экспортировать запись процесса" @@ -2131,9 +2166,10 @@ msgstr "Экспортировать сохранение Wii (эксперем msgid "Export all saves" msgstr "Экспортировать все сохранения" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Экспорт неудачен, повторить?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Экспорт неудачен" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2155,44 +2191,44 @@ msgstr "Экстра параметр" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Извлечь все файлы..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Извлечь apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Извлечь DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Извлесь папку..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Извлечь файл..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Извлечение всех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Подождите..." @@ -2208,11 +2244,11 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "ФРАНЦИЯ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "Размер ТФС:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Ошибка подключания!" @@ -2220,7 +2256,7 @@ msgstr "Ошибка подключания!" msgid "Failed to download codes." msgstr "Ошибка скачивания кодов." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка извлечения в %s!" @@ -2252,16 +2288,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Невозможно прочитать %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Ошибка чтения banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2285,12 +2321,12 @@ msgid "" "(0x6000-0x7FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Ошибка чтения данных из файла %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2309,7 +2345,7 @@ msgstr "" "Невозможно прочитать директорию корректно \n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2319,29 +2355,34 @@ msgid "" "(0x0000-0x1FFF)" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Ошибка записи заголовка для файла %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Ошибка чтения уникального ID из образа диска" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Ошибка записи BT.DINF в SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Ошибка записи bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Ошибка чтения данных из файла %d" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Ошибка записи заголовка для %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Ошибка записи заголовка для файла %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Farsi" @@ -2353,17 +2394,17 @@ msgstr "быстрое" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быстрая верси MMU (работает не со всеми играми)." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "FIFO Player" @@ -2404,16 +2445,16 @@ msgstr "Файл не распознается как карта памяти" msgid "File not compressed" msgstr "Файл не сжат" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: неизвестный режим открытия : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Файловая система" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Тип файла 'ini' неизвестен! Его нельзя открыть!" @@ -2441,7 +2482,7 @@ msgstr "16:9" msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Запускать консоль в режиме NTSC-J" @@ -2465,7 +2506,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2484,7 +2525,7 @@ msgstr "" msgid "Forward" msgstr "Вперед" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2493,6 +2534,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Найдено %d результатов для '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Не удалось сохранить %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2522,7 +2568,7 @@ msgstr "Диапазон кадра" msgid "Frame S&kipping" msgstr "&Пропуск кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Лимит кадров:" @@ -2534,9 +2580,9 @@ msgstr "Кадров для записи" msgid "Free Look" msgstr "Свободный обзор" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "French" @@ -2549,7 +2595,7 @@ msgstr "Лады" msgid "From" msgstr "Из" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "ПолнЭкран" @@ -2561,7 +2607,7 @@ msgstr "Полноэкранное разрешение:" msgid "GCI File(*.gci)" msgstr "Файл GCI(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "Джойстик" @@ -2569,27 +2615,27 @@ msgstr "Джойстик" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "ID игры:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Игра уже запущена!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Игра не запущена!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Персональные настройки игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Настройки игры" @@ -2597,7 +2643,7 @@ msgstr "Настройки игры" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Файлы созранений GameCube(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2606,16 +2652,16 @@ msgid "Gamecube &Pad Settings" msgstr "Настройки джойстика Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Настройка контроллера GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko-коды" @@ -2629,7 +2675,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Общие" @@ -2638,9 +2684,9 @@ msgstr "Общие" msgid "General Settings" msgstr "Основные настройки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "German" @@ -2649,11 +2695,11 @@ msgstr "German" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Настройка видео" @@ -2672,7 +2718,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Greek" @@ -2700,7 +2746,7 @@ msgstr "Хаки" msgid "Header checksum failed" msgstr "Ошибка контрольной суммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebrew" @@ -2712,7 +2758,7 @@ msgstr "Высота" msgid "Help" msgstr "Помощь" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2724,7 +2770,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2761,7 +2807,7 @@ msgid "Home" msgstr "Дом" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Создать" @@ -2770,11 +2816,11 @@ msgid "Hotkey Configuration" msgstr "Настройка \"горячих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Hungarian" @@ -2782,12 +2828,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2796,11 +2842,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "Настройки консоли (IPL)" @@ -2816,11 +2862,11 @@ msgstr "ИК указатель" msgid "IR Sensitivity:" msgstr "Чувствительность IR-сигнала:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Папки с файлами образов" @@ -2832,7 +2878,7 @@ msgstr "ИТАЛИЯ" msgid "Icon" msgstr "Иконка" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2864,9 +2910,15 @@ msgstr "" msgid "Import Save" msgstr "Импортировать сохранение" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Ошибка импорта, попробовать еще раз?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Импортировать сохранение" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Экспорт неудачен" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -2888,21 +2940,17 @@ msgstr "" "Импортированный файл имеет расширение sav\n" "но содержит неверный заголовок" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Почти играбельна" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "В игре" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Лимит кадров:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Информация" @@ -2922,7 +2970,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Вставьте сюда сам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Вставить SD-карту" @@ -2930,7 +2978,7 @@ msgstr "Вставить SD-карту" msgid "Insert name here.." msgstr "Введите имя кода..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Установить WAD" @@ -2938,40 +2986,41 @@ msgstr "Установить WAD" msgid "Install to Wii Menu" msgstr "Установить в меню Wii" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Установка WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Ошибка проверки целостности" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Проверка целостности завершена" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Проверка целостности завершена. Ошибок не было найдено." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Интерфейс" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Настройки интерфейса" @@ -2996,15 +3045,15 @@ msgstr "Внутреняя ошибка LZO - ошибка в lzo_init()" msgid "Internal Resolution:" msgstr "Внутреннее разрешение:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Заставка" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Invalid Size(%x) or Magic word (%x)" @@ -3037,7 +3086,7 @@ msgstr "" "%s\n" " Лучше сделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Неверный файл записи" @@ -3053,13 +3102,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Неверное сохранение" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italian" @@ -3067,16 +3116,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "ЯПОНИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Italian" @@ -3099,8 +3148,8 @@ msgstr "Держать окно главным" msgid "Key" msgstr "Комбинация" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Korean" @@ -3118,16 +3167,16 @@ msgstr "Кнопка L" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Язык" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Задержка:" @@ -3165,7 +3214,7 @@ msgstr "" msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Лимитировать FPS" @@ -3264,15 +3313,15 @@ msgstr "Загрузить \"быстрое сохранение\" 8" msgid "Load State Slot 9" msgstr "Загрузить \"быстрое сохранение\" 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Загрузить игру..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Загрузить системное меню Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить системное меню Wii %d%c" @@ -3291,10 +3340,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Локальный" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Лог" @@ -3324,11 +3369,11 @@ msgid "Logger Outputs" msgstr "Logger Outputs" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Окно лога" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Соединение с сервером потеряно!" @@ -3336,7 +3381,7 @@ msgstr "Соединение с сервером потеряно!" msgid "M Button" msgstr "Кнопка M" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3345,7 +3390,7 @@ msgstr "" "MD5 не совпадает\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Ускорить MMU (спидхак)" @@ -3359,11 +3404,11 @@ msgstr "Файлы Gameshark MadCatz (*.gcs)" msgid "Main Stick" msgstr "Основной стик" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "ID создателя:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Создатель:" @@ -3394,7 +3439,7 @@ msgid "Memory Byte" msgstr "Байт памяти" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Карта памяти" @@ -3404,7 +3449,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3423,7 +3468,7 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Мик." @@ -3436,7 +3481,7 @@ msgstr "Мин." msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Разное" @@ -3573,7 +3618,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3620,7 +3665,7 @@ msgstr "ISO/WAD-файлов не обнаружено" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Не найден баннер для %s" @@ -3646,7 +3691,7 @@ msgstr "" msgid "No recorded file" msgstr "Нет файла для записи" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Не найдена папка с сохранениями для %s" @@ -3655,11 +3700,11 @@ msgstr "Не найдена папка с сохранениями для %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Отсутствует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3667,17 +3712,17 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "Не равно" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Неизвестно" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Не подключено" @@ -3723,7 +3768,7 @@ msgstr "Объект" msgid "Object Range" msgstr "Объект диапазона" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Выкл" @@ -3731,16 +3776,20 @@ msgstr "Выкл" msgid "Offset:" msgstr "Смещение:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Выводить сообщения на экран" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Доступно только %d блоков" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Открыть" @@ -3753,7 +3802,7 @@ msgstr "Открыть &папку с образом" msgid "Open Wii &save folder" msgstr "Открыть папку с &сохранениями Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Выбор файла для запуска..." @@ -3779,6 +3828,16 @@ msgstr "Декодер текстур OpenCL" msgid "OpenMP Texture Decoder" msgstr "Декодер текстур OpenMP" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3800,7 +3859,7 @@ msgstr "" msgid "Other" msgstr "Другой" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3810,7 +3869,7 @@ msgstr "" msgid "Output" msgstr "Вывод" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Про&играть запись процесса" @@ -3818,7 +3877,7 @@ msgstr "Про&играть запись процесса" msgid "Pad" msgstr "Джойстик" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Джойстик" @@ -3847,21 +3906,21 @@ msgstr "Параметры " msgid "Partition %i" msgstr "Раздел %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Папки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Пауза" @@ -3874,7 +3933,7 @@ msgstr "Пауза в конце ролика" msgid "Per-Pixel Lighting" msgstr "По-пискельное освещение" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Отлично" @@ -3884,9 +3943,9 @@ msgid "Perspective %d" msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Запуск" @@ -3898,7 +3957,7 @@ msgstr "Проиграть записанное" msgid "Play/Pause" msgstr "Старт/Пауза" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Играбельна" @@ -3906,11 +3965,11 @@ msgstr "Играбельна" msgid "Playback Options" msgstr "Параметры просмотра" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Игроки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Пожалуйста, подтвердите..." @@ -3922,36 +3981,36 @@ msgstr "Пожалуйста, создайте точку обозрения, п msgid "Plus-Minus" msgstr "Плюс-Минус" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Порт 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Порт 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Порт 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Порт 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -3959,17 +4018,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "Эффекты пост-обработки:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4002,7 +4061,7 @@ msgstr "Профиль" msgid "Properties" msgstr "Свойства" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Очистить кэш" @@ -4010,8 +4069,8 @@ msgstr "Очистить кэш" msgid "Question" msgstr "Вопрос" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Выход" @@ -4072,6 +4131,11 @@ msgstr "Настоящий Wiimotes" msgid "Record" msgstr "Запись" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Опции записи" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Информация о записи" @@ -4102,7 +4166,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Обновить" @@ -4111,14 +4175,14 @@ msgstr "Обновить" msgid "Refresh List" msgstr "Обновить список" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Обновление списка игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Удалить" @@ -4146,7 +4210,7 @@ msgstr "Результаты" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4164,13 +4228,12 @@ msgstr "Правый стик" msgid "Rumble" msgstr "Видбрация" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Русский" @@ -4183,7 +4246,7 @@ msgid "Safe" msgstr "безопасное" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Сохр." @@ -4244,28 +4307,28 @@ msgstr "Слот \"быстрого сохранения\" 8" msgid "Save State Slot 9" msgstr "Слот \"быстрого сохранения\" 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Сохранить игру как..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Выберите место для сохранения сжатого GCM/ISO-образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Выберите место для сохранения несжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4287,7 +4350,7 @@ msgstr "Поиск образов дисков" msgid "Scanning..." msgstr "Поиск..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Скриншот" @@ -4303,7 +4366,7 @@ msgstr "Поиск" msgid "Search Filter" msgstr "Фильтр поиска" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Искать в подпапках" @@ -4326,12 +4389,12 @@ msgstr "Секция %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Выберите файл для записи игрового процесса" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Выберете Wii WAD файл для установки" @@ -4350,19 +4413,19 @@ msgstr "Выберите файл сохранения для импорта" msgid "Select floating windows" msgstr "Выберите плавающие окна" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Выберите файл для запуска..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Выберите файл сохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Выберите файл сохранения для загрузки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Выберите или укажите файл для быстрого сохранения" @@ -4415,7 +4478,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Отправить" @@ -4427,11 +4490,11 @@ msgstr "Месторасположение сенсора:" msgid "Separator" msgstr "Разделитель" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4452,25 +4515,26 @@ msgstr "Установить картой памяти по умолчанию % msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Настройки..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Файл настроек не найден" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Встряска" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Короткое имя:" @@ -4478,23 +4542,28 @@ msgstr "Короткое имя:" msgid "Shoulder Buttons" msgstr "Shoulder Buttons" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Отображать &консоль" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Показать &лог" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Отображать панель &статуса" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Отображать панель &инструментов" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Сброс" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Отображать игры на DVD" @@ -4506,11 +4575,11 @@ msgstr "Показывать регионы копии EFB" msgid "Show FPS" msgstr "Показывать FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Франции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "GameCube" @@ -4518,35 +4587,35 @@ msgstr "GameCube" msgid "Show Input Display" msgstr "Показать вывод экрана" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Италии" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Кореи" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Отображать язык:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Показать &настройки логирования" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Отображать игры платформ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Отображать игры регионов..." @@ -4554,27 +4623,27 @@ msgstr "Отображать игры регионов..." msgid "Show Statistics" msgstr "Показывать статистику" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Тайваня" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "WAD-файлы" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Активирует запрос подтверждения об остановке процесса эмуляции игры." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4594,7 +4663,7 @@ msgstr "Показать первый блок" msgid "Show lag counter" msgstr "Показать лаги счетчика" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4625,7 +4694,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Неизвестные" @@ -4640,7 +4709,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Повернутый Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4648,11 +4717,11 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Пропускать загрузку BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Пропустить очистку DCBZ" @@ -4670,17 +4739,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Слот %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Слот A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Слот B" @@ -4688,7 +4757,7 @@ msgstr "Слот B" msgid "Snapshot" msgstr "Снапшот" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Программный рендинг" @@ -4700,7 +4769,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Настройки эмуляции звука" @@ -4718,9 +4787,9 @@ msgstr "Ошибка создания аудио-буфера %s." msgid "Space" msgstr "Пробел" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spanish" @@ -4740,37 +4809,29 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Ускорить чтение с диска" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Квадратный стик" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Стандартный контроллер" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Старт" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "&Сетевая игра" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Начать &запись процесса" @@ -4786,7 +4847,7 @@ msgstr "Статус" msgid "State Saves" msgstr "Быстрые сохранения" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Рулевое колесо" @@ -4795,7 +4856,7 @@ msgid "Stick" msgstr "Стик" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Стоп" @@ -4821,16 +4882,16 @@ msgstr "Бренчать" msgid "Subtract" msgstr "Вычитать" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Файл успешно экспортирован в %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Сохранение успешно импортировано" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4838,18 +4899,18 @@ msgstr "" msgid "Swing" msgstr "Покачивание" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Язык системы:" @@ -4878,13 +4939,13 @@ msgstr "Левая панель" msgid "Table Right" msgstr "Правая панель" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Сделать скриншот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -4904,7 +4965,7 @@ msgstr "Кэширование текстур" msgid "Texture Format Overlay" msgstr "Наложение форматов текстур" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD-файл успешно установлен" @@ -4916,13 +4977,13 @@ msgstr "Неверный адрес" msgid "The checksum was successfully fixed" msgstr "Контрольная сумма успешно исправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Выбпвнная папка уже в списке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -4972,30 +5033,30 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Сохранение, которое вы пытаетесь скопировать имеет неверный размер" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" "Выбранный язык не поддерживается вашей системой. Возвращаемся к стандартному." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Версии \"сетевой игры\" сервера и клиента несовместимы!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Сервер заполнен!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Ответ с сервера: игра уже запущена!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Сервер прислал неизвестное сообщение об ошибке!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Указанный файл \"%s\" не существует" @@ -5004,11 +5065,11 @@ msgstr "Указанный файл \"%s\" не существует" msgid "The value is invalid" msgstr "Неверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Тема:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5016,7 +5077,7 @@ msgstr "" "Не найден билет для 00000001/00000002. Ваша копия NAND скорее всего не " "полная." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5036,7 +5097,7 @@ msgstr "" "Симулятор action replay не поддерживает коды, которые меняют сам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Активация данной опции может привести к замедлению эмуляции в Wii-меню и " @@ -5054,7 +5115,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -5062,7 +5123,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5111,7 +5172,7 @@ msgstr "EFB Копии" msgid "Toggle Fog" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Включение полноэкранного режима" @@ -5121,11 +5182,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "сверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -5147,7 +5208,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turkish" @@ -5195,7 +5256,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Не определено %i" @@ -5232,12 +5293,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Неизвестный тип записи %i в SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Получено неизвестное сообщение с id : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!" @@ -5256,7 +5317,7 @@ msgstr "Обновить" msgid "Upright Wiimote" msgstr "Перевернутый Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Использовать EuRGB60-режим (PAL60)" @@ -5268,7 +5329,7 @@ msgstr "Использовать полноэкранный режим" msgid "Use Hex" msgstr "Использовать HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Показывать panic-уведомления (ошибки)" @@ -5288,6 +5349,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5305,7 +5375,7 @@ msgstr "Утилиты" msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "Ускорить MMU (спидхак)" @@ -5330,7 +5400,7 @@ msgstr "Глубина анализа" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Видео" @@ -5338,17 +5408,17 @@ msgstr "Видео" msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Громкость" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Ошибка установки WAD: ошибка создания %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "Невозможно установить WAD: ошибка создания билета" @@ -5378,7 +5448,7 @@ msgstr "Предупреждение: запуск ELF в неправильно msgid "Warning - starting ISO in wrong console mode!" msgstr "Предупреждение: запуск ISO в неправильном режиме!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5401,7 +5471,7 @@ msgstr "" "с совпадающими именами будут переписаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5409,7 +5479,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5417,7 +5487,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5453,23 +5523,19 @@ msgstr "Форсировать \"Широкоформатный экран\"" msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Импорт сохранений Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы сохранений Wii (*.bin)|*.bin" @@ -5478,7 +5544,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Нельзя прочесть файл" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5487,7 +5553,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5495,7 +5561,7 @@ msgstr "Wiimote подключен" msgid "Wiimote Motor" msgstr "Включить поддержку мотора" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Настройка Wiimote" @@ -5519,14 +5585,14 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Перенос строк" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Подождите..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5586,7 +5652,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Вы не можете закрыть панель, в которой есть страницы." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Выберите игру!" @@ -5602,7 +5668,7 @@ msgstr "Нужно ввести десятичное или шестнадцат msgid "You must enter a valid profile name." msgstr "Введите правильное имя профиля." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Необходимо перезапустить Dolphin, чтобы изменения вступили в силу." @@ -5613,7 +5679,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5631,7 +5697,7 @@ msgstr "" "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x\n" "Вы хотите создать новый?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "Включить ZTP-хак" @@ -5681,7 +5747,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -5694,7 +5760,17 @@ msgstr "iCacheJIT: Чтение кода операции из %x. Пожалу msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Получено неизвестное сообщение с id : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуске приложения!" @@ -5716,6 +5792,9 @@ msgstr "| ИЛИ" #~ msgid "Enable Hotkeys" #~ msgstr "Включить горячие клавиши" +#~ msgid "Export failed, try again?" +#~ msgstr "Экспорт неудачен, повторить?" + #~ msgid "Failed to Listen!!" #~ msgstr "Нельзя прослушать!!" @@ -5737,12 +5816,21 @@ msgstr "| ИЛИ" #~ "Если FPS прыгает, эта опция может помочь. (ВКЛ = Совместимость, ВЫКЛ = " #~ "Ускорение)" +#~ msgid "Import failed, try again?" +#~ msgstr "Ошибка импорта, попробовать еще раз?" + +#~ msgid "In-Game" +#~ msgstr "В игре" + #~ msgid "Last Overwritten State" #~ msgstr "Последнее перезаписанное сохранение" #~ msgid "Last Saved State" #~ msgstr "Последнее сохранение" +#~ msgid "Local" +#~ msgstr "Локальный" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Переподключить Wiimote 1, при загрузке \"быстрых сохранений\"" @@ -5751,3 +5839,6 @@ msgstr "| ИЛИ" #~ msgid "Skip Dest. Alpha Pass" #~ msgstr "Пропустить Dest. Alpha доступ" + +#~ msgid "Wii Save Import" +#~ msgstr "Импорт сохранений Wii" diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 6279a6a22d..2a94544d90 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: delroth \n" "Language-Team: LANGUAGE \n" @@ -23,9 +23,9 @@ msgstr "" msgid " (too many to display)" msgstr "&" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Igra" @@ -42,7 +42,7 @@ msgstr "" "\"%s\" ne postoji.\n" " Kreiraj novu memorisku karticu (16mb)?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." @@ -67,8 +67,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s vec postoji, zameniti?" @@ -99,12 +99,17 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s nije uspelo da otvori" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s nije uspelo da otvori" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s je 0 byte fajl" @@ -114,7 +119,7 @@ msgstr "%s je 0 byte fajl" msgid "%s is already compressed! Cannot compress it further." msgstr "%s je vec kompresovan! Nemoze se kompresovati vise." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s je previse dugo za \"filename\", maximalno slova 45" @@ -143,7 +148,7 @@ msgstr "" msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&O" @@ -151,7 +156,7 @@ msgstr "&O" msgid "&Boot from DVD Drive..." msgstr "&Bootuj sa DVD drajvera" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "" @@ -159,7 +164,7 @@ msgstr "" msgid "&Browse for ISOs..." msgstr "&Trazi \"ISO\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Chit Meneger " @@ -183,11 +188,11 @@ msgstr "&Emulacija" msgid "&File" msgstr "&Fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Pun Ekran" @@ -195,7 +200,7 @@ msgstr "&Pun Ekran" msgid "&Graphics Settings" msgstr "&Graficke Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Pomoc" @@ -203,7 +208,7 @@ msgstr "&Pomoc" msgid "&Hotkey Settings" msgstr "&Hotkey Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -215,11 +220,11 @@ msgstr "Loaduj Savestate" msgid "&Memcard Manager (GC)" msgstr "&Memorijska kartica (Meneger za GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Memorija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Otvori..." @@ -227,11 +232,11 @@ msgstr "&Otvori..." msgid "&Options" msgstr "&Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Pokreni" @@ -239,39 +244,39 @@ msgstr "&Pokreni" msgid "&Properties" msgstr "&Pribor/Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Refresuj listu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Alat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Pogledaj" @@ -360,7 +365,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -368,7 +373,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -376,8 +381,8 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Netplay prozor je vec otvoren!!" @@ -401,8 +406,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -411,13 +414,13 @@ msgid "" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR Kodovi" @@ -529,11 +532,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Dodaj Patch " @@ -541,9 +544,9 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Dodaj..." @@ -581,36 +584,36 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "" @@ -638,7 +641,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "" @@ -653,7 +656,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -662,7 +665,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -670,15 +673,15 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "" @@ -687,12 +690,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "" @@ -700,7 +703,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -736,7 +739,7 @@ msgstr "" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "" @@ -754,7 +757,7 @@ msgstr "" msgid "Backward" msgstr "U nazad" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "" @@ -767,11 +770,11 @@ msgstr "" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Detalji o Baneru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Baner:" @@ -783,7 +786,7 @@ msgstr "Bar" msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -812,7 +815,7 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Donji deo/dno" @@ -821,11 +824,11 @@ msgstr "Donji deo/dno" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Ostecen/a/nje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Trazi" @@ -833,15 +836,15 @@ msgstr "Trazi" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "" @@ -851,7 +854,7 @@ msgstr "" msgid "Buttons" msgstr "Tasteri" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -873,7 +876,7 @@ msgstr "C-Stick" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" @@ -890,7 +893,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -905,9 +908,9 @@ msgstr "" msgid "Cancel" msgstr "Odustani" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Nemoze otvoriti %s" @@ -916,7 +919,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -924,7 +927,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -934,7 +937,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -942,11 +945,11 @@ msgstr "" msgid "Center" msgstr "Centar " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Promeni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Promeni &Disk..." @@ -954,11 +957,11 @@ msgstr "Promeni &Disk..." msgid "Change Disc" msgstr "Promeni Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Promeni Igru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -974,11 +977,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chat/Caskanje" @@ -994,39 +997,39 @@ msgstr "Trazi Chit" msgid "Cheats Manager" msgstr "Chit Meneger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1034,14 +1037,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Biraj folder u kome zelis da ekstraktujes " @@ -1060,7 +1063,7 @@ msgstr "Klasik/a" msgid "Clear" msgstr "Ocisti" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1070,7 +1073,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Zatvori" @@ -1095,7 +1098,7 @@ msgstr "Komanda" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Koment:" @@ -1107,12 +1110,12 @@ msgstr "Kompresuj ISO..." msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Podesi" @@ -1126,22 +1129,22 @@ msgstr "" msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "" @@ -1150,16 +1153,16 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Connect Balance Board" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1180,7 +1183,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Povezivanje..." @@ -1200,7 +1203,7 @@ msgstr "Kontrola" msgid "Convert to GCI" msgstr "Konvertuj u GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopiranje neuspesno " @@ -1209,7 +1212,7 @@ msgstr "Kopiranje neuspesno " msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "" @@ -1223,7 +1226,7 @@ msgstr "" msgid "Could not initialize backend %s." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1231,22 +1234,16 @@ msgid "" "most PC DVD drives." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1260,11 +1257,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1275,7 +1272,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Zemlja:" @@ -1312,12 +1309,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "" @@ -1325,11 +1322,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" @@ -1341,36 +1338,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "" @@ -1382,7 +1379,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1390,7 +1387,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "" @@ -1427,8 +1424,8 @@ msgstr "" msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "" @@ -1440,7 +1437,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "" @@ -1482,8 +1479,8 @@ msgstr "" msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1495,7 +1492,7 @@ msgstr "" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1545,7 +1542,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disk" @@ -1569,24 +1566,60 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Graficka Podesavanja " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sajt" @@ -1602,12 +1635,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1615,7 +1648,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "" @@ -1631,12 +1664,12 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" @@ -1660,11 +1693,11 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "" @@ -1701,9 +1734,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1732,7 +1765,7 @@ msgstr "" msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "" @@ -1744,16 +1777,20 @@ msgstr "" msgid "Edit Config" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "" @@ -1765,7 +1802,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "" @@ -1792,7 +1829,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "" @@ -1814,11 +1851,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1826,27 +1863,27 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "" @@ -1854,7 +1891,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "" @@ -1862,7 +1899,7 @@ msgstr "" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "" @@ -1879,7 +1916,7 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1905,33 +1942,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -1940,7 +1971,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -1957,9 +1988,9 @@ msgstr "" msgid "End" msgstr "Kraj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1988,11 +2019,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2019,7 +2050,6 @@ msgid "Euphoria" msgstr "" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "" @@ -2028,16 +2058,20 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +msgid "Export All Wii Saves" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "" @@ -2045,7 +2079,7 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "" @@ -2061,9 +2095,10 @@ msgstr "" msgid "Export all saves" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Kopiranje neuspesno " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2085,44 +2120,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "" @@ -2138,11 +2173,11 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "" @@ -2150,7 +2185,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2182,16 +2217,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2215,12 +2250,12 @@ msgid "" "(0x6000-0x7FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2237,7 +2272,7 @@ msgid "" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2247,29 +2282,34 @@ msgid "" "(0x0000-0x1FFF)" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, c-format +msgid "Failed to read header for file %d" +msgstr "" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, c-format +msgid "Failed to write data to file: %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "" @@ -2281,17 +2321,17 @@ msgstr "Brzo " msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "" @@ -2328,16 +2368,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2365,7 +2405,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "" @@ -2389,7 +2429,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2406,7 +2446,7 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2415,6 +2455,11 @@ msgstr "" msgid "Found %d results for '" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, c-format +msgid "Found %x save files" +msgstr "" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2444,7 +2489,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "" @@ -2456,9 +2501,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "" @@ -2471,7 +2516,7 @@ msgstr "" msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "" @@ -2483,7 +2528,7 @@ msgstr "" msgid "GCI File(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "" @@ -2491,27 +2536,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Igra je vec pokrenuta!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Igra nije pokrenuta!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "" @@ -2519,7 +2564,7 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube " @@ -2528,16 +2573,16 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "" @@ -2551,7 +2596,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "" @@ -2560,9 +2605,9 @@ msgstr "" msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Nemacki " @@ -2571,11 +2616,11 @@ msgstr "Nemacki " msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Graficke opcije/podesavanja/konfiguracije..." @@ -2594,7 +2639,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "" @@ -2622,7 +2667,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "" @@ -2634,7 +2679,7 @@ msgstr "" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2646,7 +2691,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2676,7 +2721,7 @@ msgid "Home" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "" @@ -2685,11 +2730,11 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "" @@ -2697,12 +2742,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2711,11 +2756,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "" @@ -2731,11 +2776,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "" @@ -2747,7 +2792,7 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2779,10 +2824,15 @@ msgstr "" msgid "Import Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +msgid "Import Wii Save" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Kopiranje neuspesno " + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" "Imported file has gsc extension\n" @@ -2799,20 +2849,16 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 msgid "Increase Frame limit" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info " @@ -2832,7 +2878,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "" @@ -2840,7 +2886,7 @@ msgstr "" msgid "Insert name here.." msgstr "Ubaci ime ovde..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "" @@ -2848,39 +2894,40 @@ msgstr "" msgid "Install to Wii Menu" msgstr "" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "" @@ -2903,15 +2950,15 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Uvod" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" @@ -2941,7 +2988,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "" @@ -2957,13 +3004,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italianski " @@ -2971,16 +3018,16 @@ msgstr "Italianski " msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japanski " @@ -3003,8 +3050,8 @@ msgstr "" msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Korejski " @@ -3022,16 +3069,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3067,7 +3114,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "" @@ -3166,15 +3213,15 @@ msgstr "Ucitaj State Slot 8" msgid "Load State Slot 9" msgstr "Ucitaj State Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Ucitaj State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3190,10 +3237,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "" @@ -3223,11 +3266,11 @@ msgid "Logger Outputs" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "" @@ -3235,14 +3278,14 @@ msgstr "" msgid "M Button" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "" @@ -3256,11 +3299,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "" @@ -3291,7 +3334,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "" @@ -3301,7 +3344,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3320,7 +3363,7 @@ msgstr "" msgid "Menu" msgstr "Meni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "" @@ -3333,7 +3376,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "" @@ -3470,7 +3513,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3517,7 +3560,7 @@ msgstr "" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "" @@ -3543,7 +3586,7 @@ msgstr "" msgid "No recorded file" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "" @@ -3552,11 +3595,11 @@ msgstr "" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "" @@ -3564,17 +3607,17 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "" @@ -3620,7 +3663,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Izskljucen/o" @@ -3628,16 +3671,20 @@ msgstr "Izskljucen/o" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Otvori " @@ -3650,7 +3697,7 @@ msgstr "" msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Otvori fajl..." @@ -3676,6 +3723,16 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3697,7 +3754,7 @@ msgstr "" msgid "Other" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3707,7 +3764,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "" @@ -3715,7 +3772,7 @@ msgstr "" msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "" @@ -3744,21 +3801,21 @@ msgstr "" msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pauza " @@ -3771,7 +3828,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfektno " @@ -3781,9 +3838,9 @@ msgid "Perspective %d" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Pokreni " @@ -3795,7 +3852,7 @@ msgstr "Pokreni snimanje " msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "" @@ -3803,11 +3860,11 @@ msgstr "" msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "" @@ -3819,36 +3876,36 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "" @@ -3856,17 +3913,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3899,7 +3956,7 @@ msgstr "Profil" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "" @@ -3907,8 +3964,8 @@ msgstr "" msgid "Question" msgstr "Pitanje " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Izadji " @@ -3969,6 +4026,11 @@ msgstr "" msgid "Record" msgstr "" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Pokreni snimanje " + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "" @@ -3999,7 +4061,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "" @@ -4008,14 +4070,14 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "" @@ -4043,7 +4105,7 @@ msgstr "Rezultati " msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4061,13 +4123,12 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "" @@ -4080,7 +4141,7 @@ msgid "Safe" msgstr "Siguran " #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Snimaj" @@ -4141,28 +4202,28 @@ msgstr "Snimaj State Slot 8" msgid "Save State Slot 9" msgstr "Snimaj State Slot 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Snimaj state..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4184,7 +4245,7 @@ msgstr "Skeniranje za ISO fajlove " msgid "Scanning..." msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "" @@ -4200,7 +4261,7 @@ msgstr "" msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Trazi Subfoldere " @@ -4223,12 +4284,12 @@ msgstr "" msgid "Select" msgstr "Izaberi " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "" @@ -4247,19 +4308,19 @@ msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4312,7 +4373,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Isprati" @@ -4324,11 +4385,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4347,25 +4408,25 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +msgid "SetupWiiMem: Cant create setting file" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "" @@ -4373,23 +4434,27 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +msgid "Show Defaults" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "" @@ -4401,11 +4466,11 @@ msgstr "" msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "" @@ -4413,35 +4478,35 @@ msgstr "" msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "" @@ -4449,27 +4514,27 @@ msgstr "" msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4484,7 +4549,7 @@ msgstr "" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4515,7 +4580,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "" @@ -4530,7 +4595,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" @@ -4538,11 +4603,11 @@ msgstr "" msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4560,17 +4625,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "" @@ -4578,7 +4643,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "" @@ -4590,7 +4655,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "" @@ -4608,9 +4673,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "" @@ -4630,37 +4695,29 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Pokreni " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Pokreni &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Pokreni Sni&manje" @@ -4676,7 +4733,7 @@ msgstr "" msgid "State Saves" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "" @@ -4685,7 +4742,7 @@ msgid "Stick" msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr " Zaustavi" @@ -4711,16 +4768,16 @@ msgstr "" msgid "Subtract" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4728,18 +4785,18 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "" @@ -4768,13 +4825,13 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "" @@ -4794,7 +4851,7 @@ msgstr "" msgid "Texture Format Overlay" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "" @@ -4806,13 +4863,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -4860,29 +4917,29 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "" @@ -4891,17 +4948,17 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4913,7 +4970,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4929,7 +4986,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -4937,7 +4994,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4984,7 +5041,7 @@ msgstr "" msgid "Toggle Fog" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "" @@ -4994,11 +5051,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -5020,7 +5077,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "" @@ -5068,7 +5125,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "" @@ -5105,12 +5162,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5129,7 +5186,7 @@ msgstr "Updejt " msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5141,7 +5198,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "" @@ -5161,6 +5218,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5178,7 +5244,7 @@ msgstr "" msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "VBeam Speed Hack" msgstr "" @@ -5202,7 +5268,7 @@ msgstr "" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Video " @@ -5210,17 +5276,17 @@ msgstr "Video " msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Jacina zvuka " -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" @@ -5250,7 +5316,7 @@ msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Upozorenje - pogretanje ISO fajla u pogresan konzol mod!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5272,7 +5338,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5280,7 +5346,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5288,7 +5354,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5324,23 +5390,19 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5349,7 +5411,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "" @@ -5358,7 +5420,7 @@ msgstr "" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "" @@ -5366,7 +5428,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "" @@ -5390,14 +5452,14 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Radi..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5457,7 +5519,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "" @@ -5473,7 +5535,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5484,7 +5546,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5498,7 +5560,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "" @@ -5548,7 +5610,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "" @@ -5561,7 +5623,16 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +msgid "unknown message received" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/sv.po b/Languages/po/sv.po index 3d8f9a99e6..8633797f41 100644 --- a/Languages/po/sv.po +++ b/Languages/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-23 06:37-0500\n" "Last-Translator: DolphinPhoenix \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/dolphin-emu/" @@ -23,9 +23,9 @@ msgstr "" msgid " (too many to display)" msgstr "(för många att visa)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Spel: " @@ -42,7 +42,7 @@ msgstr "" "\"%s\" finns inte.\n" " Vill du skapa ett nytt 16MB minneskort?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" är en ogiltig GCM/ISO-fil, eller inte en GC/Wii-ISO." @@ -67,8 +67,8 @@ msgstr "%d prov" msgid "%d samples (quality level %d)" msgstr "%d prov (kvalitetsnivå %d)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s finns redan, vill du skriva över?" @@ -106,12 +106,17 @@ msgstr "" "Filen är inte tillräckligt stor för att vara en riktig minneskortsfil (0x%x " "bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s misslyckades att öppnas" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s misslyckades att öppnas" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s är en fil på 0 byte" @@ -121,7 +126,7 @@ msgstr "%s är en fil på 0 byte" msgid "%s is already compressed! Cannot compress it further." msgstr "%s är redan komprimerad! Kan inte komprimera den ytterligare." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s är för långt för filnamnet, maximalt antal tecken är 45" @@ -150,7 +155,7 @@ msgstr "%uFria block; %u fria mappingångar" msgid "&& AND" msgstr "&& OCH" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "&Om..." @@ -158,7 +163,7 @@ msgstr "&Om..." msgid "&Boot from DVD Drive..." msgstr "&Starta upp från DVD-enhet..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "&Brytpunkter" @@ -166,7 +171,7 @@ msgstr "&Brytpunkter" msgid "&Browse for ISOs..." msgstr "&Bläddra efter ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "&Fuskhanterare" @@ -190,11 +195,11 @@ msgstr "&Emulering" msgid "&File" msgstr "&Arkiv" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "Avancerad &bildruta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "&Helskärm" @@ -202,7 +207,7 @@ msgstr "&Helskärm" msgid "&Graphics Settings" msgstr "&Grafikinställningar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "&Hjälp" @@ -210,7 +215,7 @@ msgstr "&Hjälp" msgid "&Hotkey Settings" msgstr "&Kortkommandoinställningar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -222,11 +227,11 @@ msgstr "&Läs in snabbsparning" msgid "&Memcard Manager (GC)" msgstr "&Minneskorthanterare (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "&Minne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "&Öppna..." @@ -234,11 +239,11 @@ msgstr "&Öppna..." msgid "&Options" msgstr "A<ernativ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "&Spela" @@ -246,39 +251,39 @@ msgstr "&Spela" msgid "&Properties" msgstr "&Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "&Skrivskyddat läge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "&Uppdatera lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "&Listor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "&Återställ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Ljud" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "&Stoppa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "&Verktyg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "&Visa" @@ -367,7 +372,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -375,7 +380,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -383,8 +388,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Ett nätspelsfönster är redan öppet!!" @@ -402,6 +407,7 @@ msgstr "" "Du måste ansluta dina wiimotes manuellt." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 +#, fuzzy msgid "" "ALERT:\n" "\n" @@ -410,8 +416,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -436,13 +440,13 @@ msgstr "" "\n" "Värden måste ha angivit TCP-porten som öppen/vidarebefordrad!\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-fotlist" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR-koder" @@ -575,11 +579,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Lägg till" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Lägg till ActionReplay-kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Lägg till patch" @@ -587,9 +591,9 @@ msgstr "Lägg till patch" msgid "Add new pane" msgstr "Lägg till ny panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Lägg till..." @@ -641,36 +645,36 @@ msgstr "Justerar analoga kontrolltrycket som krävs för att aktivera knappar." msgid "Advanced" msgstr "Avancerat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Avancerade inställningar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alla GC/Wii-filer (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alla GC/Wii-bilder (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Alla GCM-filer för Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Alla snabbsparningar (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Alla ISO-filer för Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alla komprimerade ISO-filer för GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Alla filer (*.*)|*.*" @@ -698,7 +702,7 @@ msgstr "Apploader är i fel storlek...är det verkligen en apploader?" msgid "Apploader unable to load from file" msgstr "Det gick inte att läsa in apploader från fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -716,7 +720,7 @@ msgstr "" "\n" "Om du är osäker kan du välja (av)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabiska" @@ -725,7 +729,7 @@ msgstr "Arabiska" msgid "Are you sure you want to delete \"%s\"?" msgstr "Vill du verkligen raders \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -733,16 +737,16 @@ msgstr "" "Vill du verkligen ta bort dessa filer?\n" "De kommer att försvinna för alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Vill du verkligen radera denna fil? Den kommer att försvinna för alltid!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT (experimentell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "Bildförhållande:" @@ -751,12 +755,12 @@ msgstr "Bildförhållande:" msgid "At least one pane must remain open." msgstr "Åtminstone en panel måste vara öppen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Ljud" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Ljudbackend:" @@ -764,7 +768,7 @@ msgstr "Ljudbackend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fel uppstod när AO-enhet skulle öppnas.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Auto" @@ -803,7 +807,7 @@ msgstr "BP-register" msgid "Back" msgstr "Backsteg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Backendinställningar" @@ -821,7 +825,7 @@ msgstr "Bakgrundsindata" msgid "Backward" msgstr "Tillbaka" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Dålig headerfil" @@ -834,11 +838,11 @@ msgstr "" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Banner:" @@ -850,7 +854,7 @@ msgstr "Takt" msgid "Basic" msgstr "Grundläggande" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Grundläggande inställningar" @@ -879,7 +883,7 @@ msgid "Blue Right" msgstr "Blå höger" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Under" @@ -888,11 +892,11 @@ msgstr "Under" msgid "Bound Controls: %lu" msgstr "Bundna kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Trasig" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Bläddra" @@ -900,15 +904,15 @@ msgstr "Bläddra" msgid "Browse for a directory to add" msgstr "Bläddra efter en filmapp som ska läggas till" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Bläddra efter en ISO-sökväg..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Bläddra mapp för utdata" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Buffer:" @@ -918,7 +922,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Knappar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -942,7 +946,7 @@ msgstr "C-spak" msgid "CP reg" msgstr "CP-register" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "Processorns emulatormotor" @@ -966,7 +970,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "Kan inte hitta Wiimote med anslutningshandtaget %02x" @@ -981,9 +985,9 @@ msgstr "Kan inte läsa från DVD_Plugin - DVD-gränssnitt: Allvarligt fel" msgid "Cancel" msgstr "Avbryt" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "Kan inte öppna %s" @@ -992,7 +996,7 @@ msgstr "Kan inte öppna %s" msgid "Cannot unregister events with events pending" msgstr "Kan inte avregistrera händelser när händelser väntar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1003,7 +1007,7 @@ msgstr "" "%s\n" "är inte en giltig minneskortsfil för GameCube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1015,7 +1019,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalanska" @@ -1023,11 +1027,11 @@ msgstr "Katalanska" msgid "Center" msgstr "Centrum" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Byt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "Byt &skiva" @@ -1035,11 +1039,11 @@ msgstr "Byt &skiva" msgid "Change Disc" msgstr "Byt skiva" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Byt spel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1055,11 +1059,11 @@ msgstr "Ändrar tecken till parametern zFar (efter korrektion)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Ändrar tecken till parametern zNear (efter korrigering)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Detta kommer inte ha någon effekt om det ändras medan emulatorn körs!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Chatt" @@ -1075,39 +1079,39 @@ msgstr "Sök efter fusk" msgid "Cheats Manager" msgstr "Fuskhanterare" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Kontrollera partitionintegritet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Kontrollerar integritet..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Kinesiska (förenklad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Kinesiska (traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "Välj en DVD-filkatalog:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "Välj en mapp till NAND-rot:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Välj en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Välj en filkatalog att läggas till" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Välj en fil som ska öppnas" @@ -1115,7 +1119,7 @@ msgstr "Välj en fil som ska öppnas" msgid "Choose a memory card:" msgstr "Välj ett minneskort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1123,8 +1127,8 @@ msgstr "" "Välj fil som ska användas som apploader: (gäller endast skivor som är " "tillverkade från mappar)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Välj extraheringsmappen" @@ -1143,7 +1147,7 @@ msgstr "Klassisk" msgid "Clear" msgstr "Rensa" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1153,7 +1157,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Stäng" @@ -1178,7 +1182,7 @@ msgstr "Kommando" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Kommentar:" @@ -1190,12 +1194,12 @@ msgstr "Komprimera ISO..." msgid "Compress selected ISOs..." msgstr "Komprimera valda ISOs..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Komprimerar ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Konfig." @@ -1209,22 +1213,22 @@ msgstr "Konfigurera" msgid "Configure Control" msgstr "Konfigurera kontroll" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Konfigurera styrplattor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Konfigurera..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Bekräfta överskrivning av fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Bekräfta vid stopp" @@ -1233,17 +1237,17 @@ msgstr "Bekräfta vid stopp" msgid "Connect" msgstr "Anslut" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "Anslut USB-tangentbord" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "Anslut USB-tangentbord" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Anslut Wiimote %i" @@ -1264,7 +1268,7 @@ msgstr "Anslut Wiimote 3" msgid "Connect Wiimote 4" msgstr "Anslut Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Ansluter..." @@ -1284,7 +1288,7 @@ msgstr "Kontroll" msgid "Convert to GCI" msgstr "Konvertera till GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopiering misslyckades" @@ -1293,7 +1297,7 @@ msgstr "Kopiering misslyckades" msgid "Copy to Memcard %c" msgstr "Kopiera till minneskortet %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Kärna" @@ -1307,7 +1311,7 @@ msgstr "Kunde inte skapa %s" msgid "Could not initialize backend %s." msgstr "Kunde inte initiera backend %s." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1318,25 +1322,16 @@ msgstr "" "ingen GC/Wii-backup. Var god notera att originalskivor för GameCube och Wii " "inte kan läsas av de flesta PC DVD-läsare." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Kunde inte känna igen ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "Kunde inte spara %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Kunde inte konfigurera kontroller. Spelaren lämnade spelet eller så körs " -"spelet för tillfället!\n" -"(Att konfigurera kontroller när spelet körs stöds inte ännu)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1358,11 +1353,11 @@ msgstr "" "I så fall kan du behöva ställa in dina minneskortsplatser i inställningarna " "igen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunde inte öppna kommandot för tillägget 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1375,7 +1370,7 @@ msgstr "" msgid "Count:" msgstr "Räkna:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Land:" @@ -1415,12 +1410,12 @@ msgstr "" msgid "Crossfade" msgstr "Överbländning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "Den aktuella filmappen ändrades från %s till %s efter wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Anpassad projektionshackning" @@ -1428,11 +1423,11 @@ msgstr "Anpassad projektionshackning" msgid "Custom Projection Hack Settings" msgstr "Anpassade inställnignar för projektionhackning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Anpassa några ortografiska projektionsparametrar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tjeckiska" @@ -1444,36 +1439,37 @@ msgstr "D" msgid "D-Pad" msgstr "Styrplatta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP-emulatormotor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulation (snabb)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE-interpreterare (långsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE-omkompilator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "DSP på tillägnad tråd" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "DSP-inställningar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "DSP på tillägnad tråd" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD-rotkatalog:" @@ -1486,7 +1482,7 @@ msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" "DVDLowUnencryptedRead - Allvarligt fel: Misslyckades att läsa från volym" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1494,7 +1490,7 @@ msgstr "" msgid "Data Size" msgstr "Datastorlek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Datum:" @@ -1531,8 +1527,8 @@ msgstr "Avkomprimera ISO..." msgid "Decompress selected ISOs..." msgstr "Avkomprimera valda ISOs..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Avkomprimerar ISO" @@ -1545,7 +1541,7 @@ msgstr "Uppdatera spellista" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Standard-ISO:" @@ -1589,8 +1585,8 @@ msgstr "" msgid "Device" msgstr "Enhet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Enhetsinställningar" @@ -1602,7 +1598,7 @@ msgstr "Ring" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1669,7 +1665,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Skiva" @@ -1696,24 +1692,60 @@ msgstr "" msgid "Divide" msgstr "Dividera" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Vill du stoppa den aktuella emulationen?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II-dekoder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s grafikkonfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphins &webbsida" @@ -1729,12 +1761,12 @@ msgstr "Dolphin emulerad Wiimote-konfiguration" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontrollskonfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-filmer (*.dtm)" @@ -1742,7 +1774,7 @@ msgstr "Dolphin TAS-filmer (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote-konfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin på &Google Code" @@ -1762,12 +1794,12 @@ msgstr "" "Dolphin är inställd på att gömma alla spel. Dubbelklicka här för att visa " "alla spel..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin kunde inte slutföra den begärda handlingen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" @@ -1793,11 +1825,11 @@ msgstr "Laddade ned %lu koder. (Lade till %lu)" msgid "Drums" msgstr "Trummor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Dumpa ljud" @@ -1843,9 +1875,9 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Nederländska" @@ -1878,7 +1910,7 @@ msgstr "EUROPA" msgid "Early Memory Updates" msgstr "Tidiga minnesuppdateringar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Redigera" @@ -1890,16 +1922,20 @@ msgstr "Redigera Action Replay-kod" msgid "Edit Config" msgstr "Redigera konfig." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Redigera patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Redigera aktuellt perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Redigera..." @@ -1911,7 +1947,7 @@ msgstr "Effekt" msgid "Embedded Frame Buffer" msgstr "Inbäddad bildrutebuffer" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Emuleringstråd körs redan" @@ -1949,7 +1985,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulerad Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Emulationsnabbsparning:" @@ -1977,11 +2013,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Aktivera AR-loggning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Aktivera blocksammanfogning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Aktivera beräkning av Bounding Box" @@ -1989,27 +2025,27 @@ msgstr "Aktivera beräkning av Bounding Box" msgid "Enable Cache" msgstr "Aktivera cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Aktivera fusk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Aktivera dubbel kärna" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Aktivera dubbla kärnor (höjer prestandan)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Aktivera överhoppning av tomgångsloopar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Aktivera överhoppning av tomgångsloopar (höjer prestandan)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "Aktivera MMU" @@ -2017,7 +2053,7 @@ msgstr "Aktivera MMU" msgid "Enable Progressive Scan" msgstr "Aktivera Progressive scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Aktivera skärmsläckare" @@ -2025,7 +2061,7 @@ msgstr "Aktivera skärmsläckare" msgid "Enable Speaker Data" msgstr "Aktivera högtalardata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Aktivera bredbild" @@ -2048,7 +2084,7 @@ msgstr "" "\n" "Om du är osäker kan du välja 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2085,7 +2121,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2093,11 +2129,11 @@ msgstr "" "Aktivera detta för att snabba upp The Legend of Zelda: Twilight Princess. " "Inaktivera för NÅGOT ANNAT spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Aktiverar anpassat projektionshack" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." @@ -2105,22 +2141,13 @@ msgstr "" "Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Inte " "tillgänglig för OSX." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" "Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Endast " "OpenAL-backend." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Endast " -"OpenAL-backend. Kanske behöver byta namn på soft_oal.dll till OpenAL32.dll " -"för att det ska fungera." - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2133,7 +2160,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2155,9 +2182,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Engelska" @@ -2186,11 +2213,11 @@ msgstr "Samma" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Fel" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fel uppstod när valt språk lästes in. Byter tillbaka till systemstandard." @@ -2222,7 +2249,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Undantagshanterare - åtkomst under minnesutrymme. %08llx%08llx" @@ -2231,16 +2257,21 @@ msgstr "Undantagshanterare - åtkomst under minnesutrymme. %08llx%08llx" msgid "Execute" msgstr "Utför" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Exportera alla sparningar" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Exportering misslyckades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Exportera fil" @@ -2248,7 +2279,7 @@ msgstr "Exportera fil" msgid "Export Recording" msgstr "Exportera inspelning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Exportera inspelning..." @@ -2264,9 +2295,10 @@ msgstr "Exportera Wii-sparningar (experimentell)" msgid "Export all saves" msgstr "Exportera alla sparningar" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Exportering misslyckades, vill du försöka igen?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Exportering misslyckades" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2288,44 +2320,44 @@ msgstr "Extra parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra parameter som endast är användbar i ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Extraherar alla filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Extrahera apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "Extrahera DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Extrahera filkatalog..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Extrahera fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Extrahera partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "Extraherar %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Extraherar alla filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Extraherar filmapp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Extraherar..." @@ -2341,11 +2373,11 @@ msgstr "FIFO-spelare" msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST-storlek:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Misslyckades att ansluta!" @@ -2353,7 +2385,7 @@ msgstr "Misslyckades att ansluta!" msgid "Failed to download codes." msgstr "Misslyckades att ladda ned koder." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "Misslyckades att extrahera till %s!" @@ -2394,16 +2426,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "Misslyckades att läsa %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "Misslyckades att läsa banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "Misslyckades att läsa bk-header" @@ -2435,12 +2467,12 @@ msgstr "" "Misslyckades att läsa blockallokeringstabellen korrekt\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "Misslyckades att läsa data från fil %d" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "Misslyckades att läsa data från fil: %s" @@ -2461,7 +2493,7 @@ msgstr "" "Misslyckades att läsa mappen korrekt\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "Misslyckades att läsa header" @@ -2473,29 +2505,34 @@ msgstr "" "Misslyckades att läsa header korrekt\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "Misslyckades att skriva header för filen %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Misslyckades att läsa unikt ID från disk-bilden" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Misslyckades att skriva BT.DINF till SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Misslyckades att skriva bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "Misslyckades att läsa data från fil: %s" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "Misslyckades att skriva header för %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "Misslyckades att skriva header för filen %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Persiska" @@ -2507,11 +2544,11 @@ msgstr "Snabb" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snabb version av MMU. Fungerar inte för alla spel." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2519,7 +2556,7 @@ msgstr "" "Allvarlig desynkronisering. Avbryter Aborting uppspelning. (Fel i " "PlayWiimote: %u != %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo-spelare" @@ -2560,16 +2597,16 @@ msgstr "Filen känns inte igen som ett minneskort" msgid "File not compressed" msgstr "Filen är inte komprimerad" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Okänt öppet läge: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' är okänd! Kommer inte att öppnas!" @@ -2597,7 +2634,7 @@ msgstr "Tvinga 16:9" msgid "Force 4:3" msgstr "Tvinga 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Tvinga konsol som NTSC-J" @@ -2629,7 +2666,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2652,7 +2689,7 @@ msgstr "" msgid "Forward" msgstr "Framåt" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2661,6 +2698,11 @@ msgstr "" msgid "Found %d results for '" msgstr "HIttade %d resultar för '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "Kunde inte spara %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2690,7 +2732,7 @@ msgstr "Räckvidd för bildrutor" msgid "Frame S&kipping" msgstr "&Hoppa över bildrutor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Bildrutegräns:" @@ -2702,9 +2744,9 @@ msgstr "Bildrutor som ska spelas in" msgid "Free Look" msgstr "Fri vy" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Franska" @@ -2717,7 +2759,7 @@ msgstr "Greppband" msgid "From" msgstr "Från" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Helskärm" @@ -2729,7 +2771,7 @@ msgstr "Helskärmsupplösning:" msgid "GCI File(*.gci)" msgstr "GCI-fil (*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC-kontroll" @@ -2737,27 +2779,27 @@ msgstr "GC-kontroll" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "Spelets ID:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Spelet körs redan!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Spelet körs inte!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "Spelet hittades inte!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Spelspecifika inställningar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Spelkonfig." @@ -2765,7 +2807,7 @@ msgstr "Spelkonfig." msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube sparningsfiler (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "GameCube" @@ -2774,16 +2816,16 @@ msgid "Gamecube &Pad Settings" msgstr "Inställningar för GameCube-&kontroller" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minneskort (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Inställningar för GameCube-kontroller" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko-koder" @@ -2801,7 +2843,7 @@ msgstr "" "till mappen \"Sys\" och starta om Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Allmänt" @@ -2810,9 +2852,9 @@ msgstr "Allmänt" msgid "General Settings" msgstr "Allmänna inställningar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Tyska" @@ -2821,11 +2863,11 @@ msgstr "Tyska" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index är större än AR-kodlistans storlek %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Grafik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Grafikinställningar" @@ -2852,7 +2894,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta markerat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Grekiska" @@ -2880,7 +2922,7 @@ msgstr "Hackningar" msgid "Header checksum failed" msgstr "Kontrollsumma för header misslyckades" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebreiska" @@ -2892,7 +2934,7 @@ msgstr "Höjd" msgid "Help" msgstr "Hjälp" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2913,7 +2955,7 @@ msgstr "" "\n" "Adjö!\n" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2952,7 +2994,7 @@ msgid "Home" msgstr "Hem" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Värd" @@ -2961,11 +3003,11 @@ msgid "Hotkey Configuration" msgstr "Kortkommandokonfiguration" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Kortkommandon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Ungerska" @@ -2973,13 +3015,13 @@ msgstr "Ungerska" msgid "Hybrid Wiimote" msgstr "Hybrid-Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Försökte att hämta data från en okänd biljett: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2992,11 +3034,11 @@ msgstr "" "Titel-ID %016llx.\n" " Dolphin kommer troligtvis frysa sig nu" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dålig destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL-inställningar" @@ -3012,11 +3054,11 @@ msgstr "IR-pekare" msgid "IR Sensitivity:" msgstr "IR-känslighet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "ISO-filkatalog" @@ -3028,7 +3070,7 @@ msgstr "ITALIEN" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3073,9 +3115,15 @@ msgstr "" msgid "Import Save" msgstr "Importera sparningar" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Importering misslyckades, försöka igen?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Importera sparningar" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Exportering misslyckades" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3097,21 +3145,17 @@ msgstr "" "Den importerade filen har filändelsen sav\n" "men har inte en giltig header" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "I spelet" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "I spelet" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Bildrutegräns:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Info" @@ -3131,7 +3175,7 @@ msgstr "Sätt in" msgid "Insert Encrypted or Decrypted code here..." msgstr "Sätt in krypterad eller dekrypterad kod här..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "Sätt in SD-kort" @@ -3139,7 +3183,7 @@ msgstr "Sätt in SD-kort" msgid "Insert name here.." msgstr "Ange namn här..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "Installera WAD" @@ -3147,29 +3191,30 @@ msgstr "Installera WAD" msgid "Install to Wii Menu" msgstr "Installera till Wii-meny" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler anropade, man denna plattform stödjer inte det ännu." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "Installerar WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Integritetskontrollfel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Integritetskontroll slutförd" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Integritetskontroll slutförd. Inga fel har hittats." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3178,11 +3223,11 @@ msgstr "" "Integritetskontroll för partition %d misslyckades. Din dumpning är troligvis " "korrupt eller har blivit patchad inkorrekt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Gränssnitt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Gränssnittsinställningar" @@ -3207,15 +3252,15 @@ msgstr "Internt LZO-fel - lzo_init() misslyckades" msgid "Internal Resolution:" msgstr "Intern upplösning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "Interpreterare (RIKTIG långsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "Intro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ogiltig stolek (%x) eller magiskt ord (%x)" @@ -3248,7 +3293,7 @@ msgstr "" "%s\n" " Du behöver nog göra en redump för detta spel." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Ogiltig inspelningsfil" @@ -3264,13 +3309,13 @@ msgstr "Ogiltig söksträng (kunde inte konvertera till nummer)" msgid "Invalid search string (only even string lengths supported)" msgstr "Ogiltig söksträng (endast jämna stränglängder stöds)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Ogiltig snabbsparning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italienska" @@ -3278,16 +3323,16 @@ msgstr "Italienska" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT-kompilator (rekommenderas)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "Experimentell JITIL-kompilator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japanska" @@ -3313,8 +3358,8 @@ msgstr "Låt fönster vara överst" msgid "Key" msgstr "Tangent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Koreanska" @@ -3332,16 +3377,16 @@ msgstr "L-knapp" msgid "L-Analog" msgstr "L-analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Språk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "Latens:" @@ -3384,7 +3429,7 @@ msgstr "" msgid "Less Than" msgstr "Mindre än" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "Begränsa efter bildrutefrekvens" @@ -3483,15 +3528,15 @@ msgstr "Läs in snabbsparningsspår 8" msgid "Load State Slot 9" msgstr "Läs in snabbsparningsspår 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Läs in snabbsparning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Läs in Wii-systemmeny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Läs in Wii-systemmeny %d%c" @@ -3510,10 +3555,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Läs in föregående värden från hackmönster som är tillgängliga." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Lokal" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Logg" @@ -3547,11 +3588,11 @@ msgid "Logger Outputs" msgstr "Loggningsutgångar" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Loggning" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Förlorade anslutning till server!" @@ -3559,7 +3600,7 @@ msgstr "Förlorade anslutning till server!" msgid "M Button" msgstr "M-knapp" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3568,7 +3609,7 @@ msgstr "" "MD5 misspassar\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "Hastighetshack för MMU" @@ -3582,11 +3623,11 @@ msgstr "MadCatz Gameshark-filer (*.gcs)" msgid "Main Stick" msgstr "Huvudspak" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "Skapar-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Skapare:" @@ -3623,7 +3664,7 @@ msgid "Memory Byte" msgstr "Minnesbyte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Minneskort" @@ -3635,7 +3676,7 @@ msgstr "" "Minneskorthanterare - VARNING: Gör en säkerhetskopiering innan du använder " "detta, bör fungera men kan fördärva saker!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3660,7 +3701,7 @@ msgstr "Minneskortets filstorlek stämmer inte överens med headerstorleken" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mikr" @@ -3673,7 +3714,7 @@ msgstr "Min" msgid "Misc" msgstr "Övrigt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Övriga inställningar" @@ -3822,7 +3863,7 @@ msgstr "NP Tabb" msgid "NP Up" msgstr "NP Upp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3869,7 +3910,7 @@ msgstr "Inga ISOs eller WADS hittades" msgid "No audio output" msgstr "Inget utdata för ljud" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Ingen bannerfil hittades för titeln \"%s\"" @@ -3895,7 +3936,7 @@ msgstr "Inga fria ingångar till mappindex" msgid "No recorded file" msgstr "Ingen inspelad fil" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Ingen sparningsmapp hittades för titeln %s" @@ -3904,11 +3945,11 @@ msgstr "Ingen sparningsmapp hittades för titeln %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norsk bokmål" @@ -3916,17 +3957,17 @@ msgstr "Norsk bokmål" msgid "Not Equal" msgstr "Inte samma" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Inte angiven" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "Varken en Wii-sparning eller ett läsningsfel för headerfilstorleken %x" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Inte ansluten" @@ -3972,7 +4013,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Räckvidd för objekt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Av" @@ -3980,16 +4021,20 @@ msgstr "Av" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "Visningsmeddelanden på skärmen" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Endast %d block tillgängliga" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Öppna" @@ -4002,7 +4047,7 @@ msgstr "Öppna &sökvägsmappen" msgid "Open Wii &save folder" msgstr "Öppnar sparningsmappen för Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Öppna fil..." @@ -4028,6 +4073,16 @@ msgstr "OpenCL-texturdekodare" msgid "OpenMP Texture Decoder" msgstr "OpenMP-texturdekodare" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4052,7 +4107,7 @@ msgstr "" msgid "Other" msgstr "Övrigt" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4064,7 +4119,7 @@ msgstr "" msgid "Output" msgstr "Utdata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Spe&la upp inspelning..." @@ -4072,7 +4127,7 @@ msgstr "Spe&la upp inspelning..." msgid "Pad" msgstr "Kontroll" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Kontroll" @@ -4101,21 +4156,21 @@ msgstr "Parametrar" msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Sökvägar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Pausa" @@ -4128,7 +4183,7 @@ msgstr "Pausa vid slutet av filmen" msgid "Per-Pixel Lighting" msgstr "Ljus per bildpunkt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Perfekt" @@ -4138,9 +4193,9 @@ msgid "Perspective %d" msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Spela" @@ -4152,7 +4207,7 @@ msgstr "Spela upp inspelning" msgid "Play/Pause" msgstr "Spela/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Spelbar" @@ -4160,11 +4215,11 @@ msgstr "Spelbar" msgid "Playback Options" msgstr "Uppspelningsalternativ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Spelare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Var god bekräfta..." @@ -4176,36 +4231,36 @@ msgstr "Var god skapa ett perspektiv innan du sparar" msgid "Plus-Minus" msgstr "Plus-minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polska" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Port 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portugisiska" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portugisiska (brasiliansk)" @@ -4213,17 +4268,17 @@ msgstr "Portugisiska (brasiliansk)" msgid "Post-Processing Effect:" msgstr "Efterprocesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "För tidigt filmslut i PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "För tidigt filmslut i PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "För tidigt filmslut i PlayWiimote. %u > %u" @@ -4256,7 +4311,7 @@ msgstr "Profil" msgid "Properties" msgstr "Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Töm cache" @@ -4264,8 +4319,8 @@ msgstr "Töm cache" msgid "Question" msgstr "Fråga" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Avsluta" @@ -4326,6 +4381,11 @@ msgstr "Verkliga Wiimotes" msgid "Record" msgstr "Spela in" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Inspelningsinställningar" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Inspelningsinformation" @@ -4361,7 +4421,7 @@ msgstr "" "Om du är osäker kan du välja Ingen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Uppdatera" @@ -4370,14 +4430,14 @@ msgstr "Uppdatera" msgid "Refresh List" msgstr "Uppdatera lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Uppdatera spellista" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Ta bort" @@ -4408,7 +4468,7 @@ msgstr "Resultat" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "Revision:" @@ -4426,15 +4486,15 @@ msgstr "Höger spak" msgid "Rumble" msgstr "Vibration" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "Kör DSP HLE och LLE på en tillägnad tråd (rekommenderas inte; kan orsaka " "ljudbuggar med HLE och fryser sig med LLE)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Ryska" @@ -4447,7 +4507,7 @@ msgid "Safe" msgstr "Säker" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Spara" @@ -4508,28 +4568,28 @@ msgstr "Spara snabbsparningsspår 8" msgid "Save State Slot 9" msgstr "Spara snabbsparningsspår 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Spara snabbsparning..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Spara som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Spara komprimerad GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Spara aktuellt perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Spara avkomprimerad GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Snabbsparningens film %s är korrupt. Filminspelningen stoppas..." @@ -4551,7 +4611,7 @@ msgstr "Söker efter ISOs" msgid "Scanning..." msgstr "Skannar..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Skärmdump" @@ -4567,7 +4627,7 @@ msgstr "Sök" msgid "Search Filter" msgstr "Sökfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Sök undermappar" @@ -4590,12 +4650,12 @@ msgstr "Sektion %s hittades inte i SYSCONF" msgid "Select" msgstr "Välj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Spara inspelningsfilen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Välj en Wii WAD-fil som ska installeras" @@ -4617,19 +4677,19 @@ msgstr "Välj en sparningsfil som ska importeras" msgid "Select floating windows" msgstr "Välj flytande fönster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Öppna fil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Välj snabbsparning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Välj snabbsparning att läsa in" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Välj snabbsparning att spara" @@ -4708,7 +4768,7 @@ msgstr "" "\n" "Om du är osäker kan du använda OpenGL." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Skicka" @@ -4720,11 +4780,11 @@ msgstr "Position av Sensor Bar:" msgid "Separator" msgstr "Avskiljare" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbiriska" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serieport 1 - Detta är porten som enheter, t.ex. nätadaptern, använder" @@ -4745,7 +4805,7 @@ msgstr "" "SetARCode_IsActive: Indexet är större än storleken på listan över AR-koder " "%lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." @@ -4753,19 +4813,20 @@ msgstr "" "Anger latensen (i millisekunder). Högre värden kan reducera ljudknaster. " "Endast OpenAL backend." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Inställningar..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Kan inte hitta filinställningar" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Skakning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Kort namn:" @@ -4773,23 +4834,28 @@ msgstr "Kort namn:" msgid "Shoulder Buttons" msgstr "Avtyckarknappar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Visa &kommandotolk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Visa &logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Visa &statusfält" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Visa &verktygsfält" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Standard" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Visa drivrutiner" @@ -4801,11 +4867,11 @@ msgstr "Visa regioner för EFB-kopior" msgid "Show FPS" msgstr "Visa bildrutefrekvens" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Visa Frankrike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "Visa GameCube" @@ -4813,35 +4879,35 @@ msgstr "Visa GameCube" msgid "Show Input Display" msgstr "Visa indata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "Visa Italien" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Visa JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Visa Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Visa språk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Visa logg&konfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "Visa PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Visa plattformar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Visa regioner" @@ -4849,27 +4915,27 @@ msgstr "Visa regioner" msgid "Show Statistics" msgstr "Visa statistik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Visa Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Visa USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "Visa WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Visa Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Visa en bekräftelsedialog innan ett spel stoppas." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4888,7 +4954,7 @@ msgstr "Visa första blocket" msgid "Show lag counter" msgstr "Visa laggräknare" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4926,7 +4992,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Visa okänd" @@ -4944,7 +5010,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Vertikal Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Förenklad kinesiska" @@ -4952,11 +5018,11 @@ msgstr "Förenklad kinesiska" msgid "Size" msgstr "Storlek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "Hoppa över BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "Hoppa över rensning av DCBZ " @@ -4981,17 +5047,17 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Spår %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Spår A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Spår B" @@ -4999,7 +5065,7 @@ msgstr "Spår B" msgid "Snapshot" msgstr "Ögonblicksbild" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Programrenderare" @@ -5016,7 +5082,7 @@ msgstr "" "Vill du verkligen aktivera programvarurendering? Om du är osäker kan du " "välja 'Nej'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Ljudinställningar" @@ -5034,9 +5100,9 @@ msgstr "Skapandet av ljudbuffer misslyckades: %s" msgid "Space" msgstr "Mellanrum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spanska" @@ -5064,37 +5130,29 @@ msgstr "" "\n" "Om du är osäker kan du välja 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Snabba upp disköverförningshastigheten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Fyrkantsspak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Standardkontroll" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "Starta &nätspel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "&Börja spela in" @@ -5110,7 +5168,7 @@ msgstr "Snabbsparning" msgid "State Saves" msgstr "Snabbsparningar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "Styrhjul" @@ -5119,7 +5177,7 @@ msgid "Stick" msgstr "Spak" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Stoppa" @@ -5150,16 +5208,16 @@ msgstr "Slagskena" msgid "Subtract" msgstr "Subtrahera" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Lyckades exportera fil till %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Lyckades importera sparningsfiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5167,11 +5225,11 @@ msgstr "" msgid "Swing" msgstr "Svinga" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "Synkronisera grafikprocessortråd" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" @@ -5180,8 +5238,8 @@ msgstr "" "slumpartade frysningar när läget \"Dubbla kärnor\" används. (PÅ = " "kompatibel, AV = snabb)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Systemspråk:" @@ -5210,13 +5268,13 @@ msgstr "Tabell vänster" msgid "Table Right" msgstr "Tabell höger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Ta en skärmdump" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5236,7 +5294,7 @@ msgstr "Textur-cache" msgid "Texture Format Overlay" msgstr "Lägg över texturformat" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD har installerats utan problem." @@ -5248,13 +5306,13 @@ msgstr "Adressen är ogiltig" msgid "The checksum was successfully fixed" msgstr "Kontrollsumman fixades utan problem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Valda filkatalogen finns redan i listan" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5310,7 +5368,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Sparningen du försöker kopiera har en ogiltig filstorlek" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5318,23 +5376,23 @@ msgstr "" "Det valda språket stöds inte av ditt system. Ändrar tillbaka till " "systemstandard." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Serverns och klientens nätspelsversioner är inkompatibla!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Servern är full" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Servern svarade: Spelet körs för tillfället!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Servern skickade ett okänt felmeddelande!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Den valda filen \"%s\" finns inte" @@ -5343,11 +5401,11 @@ msgstr "Den valda filen \"%s\" finns inte" msgid "The value is invalid" msgstr "Värdet är felaktigt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Tema:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5355,7 +5413,7 @@ msgstr "" "Det måste finnas en biljett för 00000001/00000002. Din nanddump är " "förmodlingen ofullständig." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5371,7 +5429,7 @@ msgstr "" "Denna Action Replay-simulator stödjer inte koder som ändrar Action Replay " "själv." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Detta kan orsaka fartminskningar i Wii-menyn och vissa spel." @@ -5395,7 +5453,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -5407,7 +5465,7 @@ msgstr "" "Ljud för att strypa användningen av DSP (kan fixa ljudklickningar men kan " "även orsaka konstant brus beroende på spelet)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5461,7 +5519,7 @@ msgstr "EFB-kopior" msgid "Toggle Fog" msgstr "Markera/avmarkera alla loggtyper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Skifta mellan helskärm- och fönsterläge" @@ -5471,11 +5529,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Ovan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Traditionell kinesiska" @@ -5499,7 +5557,7 @@ msgstr "" "Försöker att läsa från ogiltig SYSCONF\n" "Wiimote bt ids är inte tillgänglig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turkiska" @@ -5552,7 +5610,7 @@ msgstr "" "dekrypterad kod. Se till att den är riktigt skriven.\n" "Vill du ignorera denna rad och fortsätta tolka resten?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Odefinerad %i" @@ -5589,12 +5647,12 @@ msgstr "Okänd kommando 0x%08x" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Okänd tillträdestyp %i i SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Tog emot ett okänt meddelande med id: %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" @@ -5614,7 +5672,7 @@ msgstr "Uppdatera" msgid "Upright Wiimote" msgstr "Upprätt Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Använd EuRGB60-läge (PAL60)" @@ -5626,7 +5684,7 @@ msgstr "Använd helskärm" msgid "Use Hex" msgstr "Använd hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Använd panikhanterare" @@ -5651,6 +5709,15 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5673,7 +5740,7 @@ msgstr "Hjälpprogram" msgid "V-Sync" msgstr "V-synk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "VBeam Speed Hack" msgstr "Hastighetshack för VBeam" @@ -5697,7 +5764,7 @@ msgstr "Avlusningsnivå" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Video" @@ -5705,17 +5772,17 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Volym" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-installation misslyckades: Ett fel uppstod när %s skulle skapas" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" "WAD-installation misslyckades: Ett fel uppstod när biljett skulle skapas" @@ -5750,7 +5817,7 @@ msgstr "Varning - startar ELF i fel konsolläge!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Varning - startar ISO i fel konsolläge!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5775,7 +5842,7 @@ msgstr "" "och har samma namn som en fil på ditt minneskort\n" "Vill du fortsätta?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5787,7 +5854,7 @@ msgstr "" "fortsätter, eller läsa in denna snabbsparning med skrivskyddat läge " "inaktiverat." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5799,7 +5866,7 @@ msgstr "" "snabbsparning med skrivskyddat läge inaktiverat. Annars kan du få en " "desynkronisering." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5850,23 +5917,19 @@ msgstr "Bredbildshack" msgid "Width" msgstr "Bredd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii-konsol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii nandrot:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Importera Wii-sparningar" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-sparningsfiler (*.bin)|*.bin" @@ -5875,7 +5938,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kunde inte läsa från fil" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5884,7 +5947,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote ansluten" @@ -5892,7 +5955,7 @@ msgstr "Wiimote ansluten" msgid "Wiimote Motor" msgstr "Wiimote-motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Inställningar för Wiimote" @@ -5916,14 +5979,14 @@ msgstr "Fönster höger" msgid "Word Wrap" msgstr "Radbytning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Arbetar..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "Skriv minneskort (GC)" @@ -5988,7 +6051,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Du kan inte stänga paneler som har sidor inuti sig." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Du måste välja ett spel!!" @@ -6004,7 +6067,7 @@ msgstr "Du måste ange en giltig decimal, hexadecimal eller oktalt värde." msgid "You must enter a valid profile name." msgstr "Du måste ange ett giltigt profilnamn." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Du måste starta om Dolphin för att ändringarna ska kunna träda i kraft." @@ -6019,7 +6082,7 @@ msgstr "" "Vill du stoppa nu för att fixa problemet?\n" "Om du väljer \"nej\" kan ljudet bli förvrängt." -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -6038,7 +6101,7 @@ msgstr "" "Den borde vara 0x%04x (but is 0x%04llx)\n" "Vill du generera en ny?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP-hack" @@ -6105,7 +6168,7 @@ msgstr "" "\n" "Om du är osäker kan du lämna detta omarkerat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6118,7 +6181,17 @@ msgstr "iCacheJIT: Läser opkod från %x. Var god rapportera detta." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Tog emot ett okänt meddelande med id: %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerade -1 i applikationkörningen!" @@ -6149,9 +6222,28 @@ msgstr "| ELLER" #~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" #~ msgstr "Kan inte hitta Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Kunde inte konfigurera kontroller. Spelaren lämnade spelet eller så körs " +#~ "spelet för tillfället!\n" +#~ "(Att konfigurera kontroller när spelet körs stöds inte ännu)" + #~ msgid "Enable Hotkeys" #~ msgstr "Aktivera " +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. " +#~ "Endast OpenAL-backend. Kanske behöver byta namn på soft_oal.dll till " +#~ "OpenAL32.dll för att det ska fungera." + +#~ msgid "Export failed, try again?" +#~ msgstr "Exportering misslyckades, vill du försöka igen?" + #~ msgid "Failed to Listen!!" #~ msgstr "Misslyckades att lyssna!!" @@ -6170,12 +6262,21 @@ msgstr "| ELLER" #~ msgid "Hacked Buffer Upload" #~ msgstr "Hackad bufferuppladdning" +#~ msgid "Import failed, try again?" +#~ msgstr "Importering misslyckades, försöka igen?" + +#~ msgid "In-Game" +#~ msgstr "I spelet" + #~ msgid "Last Overwritten State" #~ msgstr "Senast överskrivna snabbsparning" #~ msgid "Last Saved State" #~ msgstr "Senast sparade snabbsparning" +#~ msgid "Local" +#~ msgstr "Lokal" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Återanslut Wiimote när en snabbsparning läser in" @@ -6194,3 +6295,6 @@ msgstr "| ELLER" #~ "specifikationer och kan orsaka en del större buggar.\n" #~ "\n" #~ "Om du är osäker kan du lämna detta omarkerat." + +#~ msgid "Wii Save Import" +#~ msgstr "Importera Wii-sparningar" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 3652aa34c2..c6c5de5e96 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: mustafacan \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/dolphin-emu/" @@ -24,9 +24,9 @@ msgstr "" msgid " (too many to display)" msgstr "(Göstermek için çok fazla)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr "Oyun :" @@ -43,7 +43,7 @@ msgstr "" "\"%s\" bulunamadı.\n" "16MB'lık yeni bir hafıza kartı oluşturulsun mu?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" @@ -70,8 +70,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s zaten var, üzerine yazılsın mı?" @@ -108,12 +108,17 @@ msgstr "" "%s hafıza kartı olarak yüklenemedi. \n" "Dosya geçerli bir hafıza kartı dosyası olabilmek için çok küçük (0x%x bayt)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "%s açılamadı" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "%s açılamadı" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s dosyasının boyutu 0 bayt'tır." @@ -123,7 +128,7 @@ msgstr "%s dosyasının boyutu 0 bayt'tır." msgid "%s is already compressed! Cannot compress it further." msgstr "%s zaten sıkıştırılmış! Tekrar sıkıştırmayı denemeyin!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s adı çok uzun, izin verilen en fazla 45 karakterdir." @@ -152,7 +157,7 @@ msgstr "%u Boş Blok; %u Boş Dizin Girişi" msgid "&& AND" msgstr "&& VE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "Hakkında... (&A)" @@ -160,7 +165,7 @@ msgstr "Hakkında... (&A)" msgid "&Boot from DVD Drive..." msgstr "DVD Sürücüden Önyükle... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "Kesme noktaları (&B)" @@ -168,7 +173,7 @@ msgstr "Kesme noktaları (&B)" msgid "&Browse for ISOs..." msgstr "Kalıplara Gözat... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "Hile Yöneti&cisi" @@ -192,11 +197,11 @@ msgstr "&Emülasyon" msgid "&File" msgstr "Dosya (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "Gelişmiş Kareleme (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "Tam Ekran (&F)" @@ -204,7 +209,7 @@ msgstr "Tam Ekran (&F)" msgid "&Graphics Settings" msgstr "&Görüntü Ayarları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "Yardım (&H)" @@ -212,7 +217,7 @@ msgstr "Yardım (&H)" msgid "&Hotkey Settings" msgstr "Tuş ayarları (&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -224,11 +229,11 @@ msgstr "Durumu Yük&le" msgid "&Memcard Manager (GC)" msgstr "GC Hafıza Kartı Yönetici (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "Hafıza (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "Aç...(&O)" @@ -236,11 +241,11 @@ msgstr "Aç...(&O)" msgid "&Options" msgstr "Seçenekler (&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "Duraklat (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "Oynat (&P)" @@ -248,39 +253,39 @@ msgstr "Oynat (&P)" msgid "&Properties" msgstr "Özellikler (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "Salt okunu&r mod" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "Listeyi Yenile (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "Kayıtla&r" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "Sıfı&rla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "&Ses" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "Durdur (&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "Araçlar (&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "Görüntü (&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "Görünüm (&V)" @@ -369,7 +374,7 @@ msgstr "" msgid "" msgstr "<Çözünürlük bulunamadı>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "" @@ -377,7 +382,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -385,8 +390,8 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "Bir NetPlay penceresi zaten açık!" @@ -411,8 +416,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -436,13 +439,13 @@ msgstr "" "\n" "TCP bağlantı noktanızı barındırıcıya yönlendirmelisiniz!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR Kodları" @@ -572,11 +575,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "Yama Ekle" @@ -584,9 +587,9 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "Ekle..." @@ -640,36 +643,36 @@ msgstr "" msgid "Advanced" msgstr "Gelişmiş" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "Gelişmiş Ayarlar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" @@ -697,7 +700,7 @@ msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" msgid "Apploader unable to load from file" msgstr "Apploader dosyadan yüklenemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "Apploader:" @@ -715,7 +718,7 @@ msgstr "" "\n" "Emin değilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arapça" @@ -724,7 +727,7 @@ msgstr "Arapça" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" dosyasını silmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -732,17 +735,17 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -751,12 +754,12 @@ msgstr "En-boy Oranı:" msgid "At least one pane must remain open." msgstr "En az bir bölme açık kalmalıdır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" @@ -764,7 +767,7 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "Otomatik" @@ -803,7 +806,7 @@ msgstr "BP kaydı" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "Çözücü Ayarları" @@ -821,7 +824,7 @@ msgstr "Arkaplanda Giriş" msgid "Backward" msgstr "Geri" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "Kötü Dosya Başı" @@ -834,11 +837,11 @@ msgstr "" msgid "Banner" msgstr "Afiş" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "Afiş Ayrıntıları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "Afiş:" @@ -850,7 +853,7 @@ msgstr "Çubuk" msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -879,7 +882,7 @@ msgid "Blue Right" msgstr "Mavi Sağ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Alt" @@ -888,11 +891,11 @@ msgstr "Alt" msgid "Bound Controls: %lu" msgstr "Bağlı Denetimler: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "Bozuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "Gözat..." @@ -900,15 +903,15 @@ msgstr "Gözat..." msgid "Browse for a directory to add" msgstr "Eklemek için bir klasöre gözat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "Bir kalıp konumu için gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "Tampon:" @@ -918,7 +921,7 @@ msgstr "Tampon:" msgid "Buttons" msgstr "Düğmeler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -940,7 +943,7 @@ msgstr "C Çubuğu" msgid "CP reg" msgstr "CP kaydı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" @@ -963,7 +966,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -978,9 +981,9 @@ msgstr "" msgid "Cancel" msgstr "İptal" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "%s açılamadı." @@ -989,7 +992,7 @@ msgstr "%s açılamadı." msgid "Cannot unregister events with events pending" msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1000,7 +1003,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası değil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1012,7 +1015,7 @@ msgstr "" msgid "Caps Lock" msgstr "Büyük Harf Kilidi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalanca" @@ -1020,11 +1023,11 @@ msgstr "Katalanca" msgid "Center" msgstr "Merkez" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "Değiştir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "&Diski Değiştir" @@ -1032,11 +1035,11 @@ msgstr "&Diski Değiştir" msgid "Change Disc" msgstr "Diski Değiştir" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "Oyunu Değiştir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1052,12 +1055,12 @@ msgstr "zFar Parametresinin işaretini değiştirir (düzeltme sonrası)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "zNear Parametresinin işaretini değiştirir (düzeltme sonrası)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Emülatör çalışırken değiştirirseniz herhangi bir etkisini göremezsiniz!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "Sohbet" @@ -1073,39 +1076,39 @@ msgstr "Hile Arama" msgid "Cheats Manager" msgstr "Hile Yöneticisi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "Bölüm Düzgünlüğünü Denetle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "Düzgünlük denetleniyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1113,7 +1116,7 @@ msgstr "Açmak için bir dosya seçin" msgid "Choose a memory card:" msgstr "Bir hafıza kartı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1121,8 +1124,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "Genişletmek için bir klasör seçin" @@ -1141,7 +1144,7 @@ msgstr "Klasik" msgid "Clear" msgstr "Temizle" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1151,7 +1154,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "Kapat" @@ -1176,7 +1179,7 @@ msgstr "Komut" msgid "Comment" msgstr "Yorum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "Yorum:" @@ -1188,12 +1191,12 @@ msgstr "Kalıbı sıkıştır..." msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "Yapılandırma" @@ -1207,22 +1210,22 @@ msgstr "Yapılandır" msgid "Configure Control" msgstr "Denetimleri Yapılandır" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "Kolları Yapılandır" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "Dosyanın Üzerine Yazmaya İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "Durdurma Onayı İste" @@ -1231,17 +1234,17 @@ msgstr "Durdurma Onayı İste" msgid "Connect" msgstr "Bağlan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "USB Klavye Bağla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "USB Klavye Bağla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote'u Bağla : %i" @@ -1262,7 +1265,7 @@ msgstr "Wiimote 3'ü Bağla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü Bağla" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "Bağlanıyor..." @@ -1282,7 +1285,7 @@ msgstr "Denetim" msgid "Convert to GCI" msgstr "GCI'ya dönüştür" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "Kopyalama başarısız." @@ -1291,7 +1294,7 @@ msgstr "Kopyalama başarısız." msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "Çekirdek" @@ -1305,7 +1308,7 @@ msgstr "%s oluşturulamadı." msgid "Could not initialize backend %s." msgstr "Çözücü %s başlatılamadı." -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1316,24 +1319,16 @@ msgstr "" "Lütfen bilgisayarların çoğunun gerçek GameCube veya Wii disklerini " "okuyamadıklarını unutmayın." -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Kalıp dosyası %s tanınamadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "%s kaydedilemedi." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Kollar ayarlanamadı. Oyuncu ayrıldı veya oyun şu anda çalışıyor! \n" -"(Oyunlar çalışırken kolların ayarlanması henüz desteklenmemektedir)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1347,11 +1342,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1364,7 +1359,7 @@ msgstr "" msgid "Count:" msgstr "Sayı:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "Ülke:" @@ -1404,12 +1399,12 @@ msgstr "" msgid "Crossfade" msgstr "Geçişli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "Özel Görüntüleme Hilesi" @@ -1417,11 +1412,11 @@ msgstr "Özel Görüntüleme Hilesi" msgid "Custom Projection Hack Settings" msgstr "Özel Görüntüleme Hilesi Ayarları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleştir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Çekçe" @@ -1433,36 +1428,36 @@ msgstr "D" msgid "D-Pad" msgstr "Yön Tuşları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Yorumlayıcı (Çok Yavaş)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD Kök Dizini:" @@ -1474,7 +1469,7 @@ msgstr "DVDLowRead - Kritik Hata: Birimden okuma başarısız." msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Kritik Hata: Birimden okuma başarısız." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1482,7 +1477,7 @@ msgstr "" msgid "Data Size" msgstr "Veri Boyutu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "Tarih:" @@ -1519,8 +1514,8 @@ msgstr "Kalıbı genişlet..." msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları genişlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "Kalıp genişletiliyor..." @@ -1533,7 +1528,7 @@ msgstr "Oyun Listesini Yenile" msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "Varsayılan kalıp:" @@ -1576,8 +1571,8 @@ msgstr "" msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1589,7 +1584,7 @@ msgstr "Kadran" msgid "Direct3D11" msgstr "DirectX 10/11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "DirectX 9" @@ -1656,7 +1651,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "Disk" @@ -1683,24 +1678,60 @@ msgstr "" msgid "Divide" msgstr "Böl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Görüntü Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sitesi" @@ -1716,12 +1747,12 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1729,7 +1760,7 @@ msgstr "Dolphin TAS Filmleri (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "&Google Code'da Dolphin" @@ -1749,12 +1780,12 @@ msgstr "" "Dolphin şu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " "oyunları görebilirsiniz." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin istenen işlemi gerçekleştiremedi." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1781,11 +1812,11 @@ msgstr "%lu kod indirildi. (%lu eklendi.)" msgid "Drums" msgstr "Davullar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "Sesi Dök" @@ -1832,9 +1863,9 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Flemenkçe" @@ -1866,7 +1897,7 @@ msgstr "AVRUPA" msgid "Early Memory Updates" msgstr "Erken Hafıza Güncellemeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "Düzen" @@ -1878,16 +1909,20 @@ msgstr "Action Replay Kodunu Düzenle" msgid "Edit Config" msgstr "Yapılandırmayı Düzenle" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "Yamayı Düzenle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "Şu anki perspektifi düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "Düzenle..." @@ -1899,7 +1934,7 @@ msgstr "Etki" msgid "Embedded Frame Buffer" msgstr "Gömülü Çerçeve Tamponu" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "Emülasyon İşlem Birimi zaten çalışıyor." @@ -1937,7 +1972,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Taklit Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "Emülasyon Durumu:" @@ -1965,11 +2000,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Geçmişine İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "Blok Birleşimine İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" @@ -1977,27 +2012,27 @@ msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" msgid "Enable Cache" msgstr "Ön Belleğe İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "Hilelere İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "Çift Çekirdeğe İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "Çift Çekirdeğe İzin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "Boşta Atlamaya İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "Boşta Atlamaya İzin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "MMU'ya İzin Ver" @@ -2005,7 +2040,7 @@ msgstr "MMU'ya İzin Ver" msgid "Enable Progressive Scan" msgstr "Progresif Taramaya İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna İzin Ver" @@ -2013,7 +2048,7 @@ msgstr "Ekran Koruyucusuna İzin Ver" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "Geniş Ekrana İzin Ver" @@ -2035,7 +2070,7 @@ msgstr "" "\n" "Emin değilseniz, 1x seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2073,7 +2108,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2081,27 +2116,21 @@ msgstr "" "The Legend of Zelda: Twilight Princess oyununu hızlandırır. Diğer tüm " "oyunlarda iptal edin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini Etkinleştirir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2114,7 +2143,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2136,9 +2165,9 @@ msgstr "" msgid "End" msgstr "Son" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "İngilizce" @@ -2167,11 +2196,11 @@ msgstr "Eşit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "Hata" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." @@ -2202,7 +2231,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Özel durum işleyicisi - bellek alanı altında erişim. %08llx%08llx" @@ -2211,16 +2239,21 @@ msgstr "Özel durum işleyicisi - bellek alanı altında erişim. %08llx%08llx" msgid "Execute" msgstr "Yürüt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "Tüm Kayıtları Ver" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "Verme başarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "Dosya Ver" @@ -2228,7 +2261,7 @@ msgstr "Dosya Ver" msgid "Export Recording" msgstr "Çekimi Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "Çekimi Ver..." @@ -2244,9 +2277,10 @@ msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" msgid "Export all saves" msgstr "Tüm Kayıtları Ver" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "Verme başarısız, tekrar dene?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "Verme başarısız." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2268,44 +2302,44 @@ msgstr "İlave Parametre" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "İlave Parametre sadece \"Metroid: Other M\" oyununda kullanışlıdır." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "Tüm Dosyaları Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "Apploader'i Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "DOL'ü Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "Konumu Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "Dosyayı Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "Bölüntüyü Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "%s Genişletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "Tüm Dosyalar Genişletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "Konum Genişletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "Genişletiliyor..." @@ -2321,11 +2355,11 @@ msgstr "FIFO Oynatıcısı" msgid "FRANCE" msgstr "FRANSA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST Boyutu:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "Bağlantı başarısız!" @@ -2333,7 +2367,7 @@ msgstr "Bağlantı başarısız!" msgid "Failed to download codes." msgstr "Kod indirme başarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye genişletme başarısız!" @@ -2373,16 +2407,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "%s okunamadı" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "banner.bin okunamadı." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2413,12 +2447,12 @@ msgstr "" "Blok Ayırma Tablosu doğru okunamadı.\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "%d dosyasından veri okunamadı." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2439,7 +2473,7 @@ msgstr "" "Konum doğru okunamadı\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2451,29 +2485,34 @@ msgstr "" "Başlık doğru okunamadı\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "%d dosyası için başlık yazılamadı." + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Disk kalıbının Unique ID'si okunamadı." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "BT.DINF 'den SYSCONF 'a yazma başarısız." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "bkhdr yazılamadı." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "%d dosyasından veri okunamadı." + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "%s için başlık yazılamadı." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "%d dosyası için başlık yazılamadı." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "Farsça" @@ -2485,11 +2524,11 @@ msgstr "Hızlı" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz." -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2497,7 +2536,7 @@ msgstr "" "Kritik karışıklık. Oynatma durduruluyor. (PlayWiimote'da hata: %u != %u, " "bayt %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "Fifo Oynatıcısı" @@ -2538,16 +2577,16 @@ msgstr "Dosya bir hafıza kartı olarak tanınamadı." msgid "File not compressed" msgstr "Dosya sıkıştırılmadı." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" @@ -2575,7 +2614,7 @@ msgstr "16:9 'a zorla" msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olmaya Zorla" @@ -2607,7 +2646,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2629,7 +2668,7 @@ msgstr "" msgid "Forward" msgstr "İleri" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2638,6 +2677,11 @@ msgstr "" msgid "Found %d results for '" msgstr "Bunun için %d sonuçlarını bul: '" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "%s kaydedilemedi." + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2667,7 +2711,7 @@ msgstr "Çerçeve Aralığı" msgid "Frame S&kipping" msgstr "Çerçeve Atlama(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "Çerçeve Sınırı:" @@ -2679,9 +2723,9 @@ msgstr "Çekilecek Çerçeveler" msgid "Free Look" msgstr "Serbest Bakış" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "Fransızca" @@ -2694,7 +2738,7 @@ msgstr "Perdeler" msgid "From" msgstr "Buradan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "Tam Ekran" @@ -2706,7 +2750,7 @@ msgstr "Tam Ekran Çözünürlüğü:" msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC Kolu" @@ -2714,27 +2758,27 @@ msgstr "GC Kolu" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "Oyun ID'si:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "Oyun zaten çalışıyor!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "Oyun çalışmıyor!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "Oyuna Özel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "Oyun Yapılandırması" @@ -2742,7 +2786,7 @@ msgstr "Oyun Yapılandırması" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "GameCube" @@ -2751,16 +2795,16 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "GameCube Kolu Ayarları" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko Kodları" @@ -2778,7 +2822,7 @@ msgstr "" "kullanmayı deneyebilirsiniz.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "Genel" @@ -2787,9 +2831,9 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "Almanca" @@ -2798,11 +2842,11 @@ msgstr "Almanca" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Ana sayfa kod liste boyutundan (%lu) daha büyük." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "Görüntü Ayarları" @@ -2826,7 +2870,7 @@ msgstr "" "\n" "Emin değilseniz, işaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Yunanca" @@ -2854,7 +2898,7 @@ msgstr "Hack'ler" msgid "Header checksum failed" msgstr "Başlık sağlama hatası" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "İbranice" @@ -2866,7 +2910,7 @@ msgstr "Yükseklik" msgid "Help" msgstr "Yardım" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2878,7 +2922,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2917,7 +2961,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "Barındırma" @@ -2926,11 +2970,11 @@ msgid "Hotkey Configuration" msgstr "Kısayol Tuşu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "Tuşlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Macarca" @@ -2938,12 +2982,12 @@ msgstr "Macarca" msgid "Hybrid Wiimote" msgstr "Karışık Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Bilinmeyen biletten veri alma denemesi: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2952,11 +2996,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL Ayarları" @@ -2972,11 +3016,11 @@ msgstr "Kızılötesi İşaretleyici" msgid "IR Sensitivity:" msgstr "Kızılötesi Hassasiyeti:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "Kalıp Konumları" @@ -2988,7 +3032,7 @@ msgstr "İTALYA" msgid "Icon" msgstr "Simge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3032,9 +3076,15 @@ msgstr "" msgid "Import Save" msgstr "Kayıt Al" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "Alma başarısız,tekrar dene?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "Kayıt Al" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "Verme başarısız." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3056,21 +3106,17 @@ msgstr "" "Alınan dosya sav uzantısına sahip\n" "ama başlığı düzgün değil." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "Oyun İçi" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "Oyun-İçi" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "Çerçeve Sınırı:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "Bilgi" @@ -3090,7 +3136,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Şifreli veya şifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3098,7 +3144,7 @@ msgstr "SD Kart Ekle" msgid "Insert name here.." msgstr "Adı buraya yazın..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "WAD Kur" @@ -3106,30 +3152,31 @@ msgstr "WAD Kur" msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu " "desteklemiyor." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "Düzgünlük Denetleme Hatası" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "Düzgünlük denetlemesi tamamlandı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "Düzgünlük denetlemesi tamamlandı. Hata bulunmadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3138,11 +3185,11 @@ msgstr "" "Bölüntü %d için düzgünlük denetlemesi başarısız. Dökümünüz hasar görmüş veya " "yanlış yamanmış olabilir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "Arabirim Ayarları" @@ -3167,15 +3214,15 @@ msgstr "İç LZO Hatası - lzo_init() başarısız." msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "İntro" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Yanlış boyut (%x) veya Sihirli kelime (%x)" @@ -3208,7 +3255,7 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" @@ -3224,13 +3271,13 @@ msgstr "Geçersiz arama dizesi (sayıya dönüştürülemedi)" msgid "Invalid search string (only even string lengths supported)" msgstr "Geçersiz arama dizesi (sadece düz dize uzunluğu destekleniyor)" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Hatalı durum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "İtalyanca" @@ -3238,16 +3285,16 @@ msgstr "İtalyanca" msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japonca" @@ -3273,8 +3320,8 @@ msgstr "Pencereyi üstte tut" msgid "Key" msgstr "Tuş" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Korece" @@ -3292,16 +3339,16 @@ msgstr "L Düğmesi" msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "Dil:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3344,7 +3391,7 @@ msgstr "" msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "FPS Sınırlaması" @@ -3443,15 +3490,15 @@ msgstr "Durumu Yükle : 8" msgid "Load State Slot 9" msgstr "Durumu Yükle : 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "Durumu Yükle..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3470,10 +3517,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Bu oyun için kullanılabilir önayar varsa buradan seçiniz." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "Yerel" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "Geçmiş" @@ -3503,11 +3546,11 @@ msgid "Logger Outputs" msgstr "Geçmiş Çıkışı" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "Geçmiş" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "Sunucu bağlantısı kayboldu!" @@ -3515,7 +3558,7 @@ msgstr "Sunucu bağlantısı kayboldu!" msgid "M Button" msgstr "M Düğmesi" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3524,7 +3567,7 @@ msgstr "" "MD5 eşleşmiyor\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" @@ -3538,11 +3581,11 @@ msgstr "MadCatz Gameshark dosyaları(*.gcs)" msgid "Main Stick" msgstr "Ana Çubuk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "Yapımcı ID'si:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "Yapımcı:" @@ -3573,7 +3616,7 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3585,7 +3628,7 @@ msgstr "" "Hafıza Kartı Yöneticisi Uyarısı-Kullanmadan önce yedekleme yapın, " "düzeltilmiş olması gerekiyor ama bozuk şeyler olabilir." -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3610,7 +3653,7 @@ msgstr "Hafıza kartı dosya boyutu başlık boyutuyla eşleşmiyor" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mikrofon" @@ -3623,7 +3666,7 @@ msgstr "En az" msgid "Misc" msgstr "Çeşitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "Çeşitli Ayarlar" @@ -3771,7 +3814,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3818,7 +3861,7 @@ msgstr "Kalıp bulunamadı" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "Başlık %s için afiş dosyası bulunamadı" @@ -3844,7 +3887,7 @@ msgstr "Boş dizin indeks girişi yok" msgid "No recorded file" msgstr "Çekilmiş Dosya Yok" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "Başlık %s için kayıt klasörü bulunamadı" @@ -3853,11 +3896,11 @@ msgstr "Başlık %s için kayıt klasörü bulunamadı" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norveççe (Bokmaal Lehçesi)" @@ -3865,17 +3908,17 @@ msgstr "Norveççe (Bokmaal Lehçesi)" msgid "Not Equal" msgstr "Eşit Değil" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "Ayarlanmamış" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "Bağlı değil" @@ -3921,7 +3964,7 @@ msgstr "Nesne" msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "Kapalı" @@ -3929,16 +3972,20 @@ msgstr "Kapalı" msgid "Offset:" msgstr "Uzantı:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "Sadece %d blok kullanılabilir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "Aç" @@ -3951,7 +3998,7 @@ msgstr "Dosya konumunu aç (&C)" msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "Dosya aç..." @@ -3977,6 +4024,16 @@ msgstr "OpenCL Doku Çözücü" msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -4002,7 +4059,7 @@ msgstr "" msgid "Other" msgstr "Diğer" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -4014,7 +4071,7 @@ msgstr "" msgid "Output" msgstr "Çıkış" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "Çekimi Oynat... (&L)" @@ -4022,7 +4079,7 @@ msgstr "Çekimi Oynat... (&L)" msgid "Pad" msgstr "Kol" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "Kol" @@ -4051,21 +4108,21 @@ msgstr "Parametreler" msgid "Partition %i" msgstr "Bölüntü %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "Yollar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "Duraklat" @@ -4078,7 +4135,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "Mükemmel" @@ -4088,9 +4145,9 @@ msgid "Perspective %d" msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "Oynat" @@ -4102,7 +4159,7 @@ msgstr "Çekimi Oynat" msgid "Play/Pause" msgstr "Oynat/Duraklat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "Oynanabilir" @@ -4110,11 +4167,11 @@ msgstr "Oynanabilir" msgid "Playback Options" msgstr "Oynatma Seçenekleri" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "Oyuncular" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4126,36 +4183,36 @@ msgstr "Kaydetmeden önce lütfen bir perspektif oluşturun" msgid "Plus-Minus" msgstr "Artı-Eksi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "Bağ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "Bağ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "Bağ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "Bağ. Nok. 4:" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "Bağ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" @@ -4163,17 +4220,17 @@ msgstr "Portekizce (Brezilya)" msgid "Post-Processing Effect:" msgstr "Geç İşleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayController'da erken kayıt bitişi. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimote'da erken kayıt bitişi. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimote'da erken kayıt bitişi. %u > %u" @@ -4206,7 +4263,7 @@ msgstr "Profil" msgid "Properties" msgstr "Özellikler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "Önbelleği Temizle" @@ -4214,8 +4271,8 @@ msgstr "Önbelleği Temizle" msgid "Question" msgstr "Soru" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "Çık" @@ -4276,6 +4333,11 @@ msgstr "Gerçek Wiimote'lar" msgid "Record" msgstr "Çek" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "Çekim Seçenekleri" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "Çekim Bilgisi" @@ -4311,7 +4373,7 @@ msgstr "" "Emin değilseniz, hiçbiri seçin." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "Yenile" @@ -4320,14 +4382,14 @@ msgstr "Yenile" msgid "Refresh List" msgstr "Listeyi Yenile" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "Kaldır" @@ -4358,7 +4420,7 @@ msgstr "Sonuçlar" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4376,13 +4438,12 @@ msgstr "Sağ Çubuk" msgid "Rumble" msgstr "Gümbürtü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Rusça" @@ -4395,7 +4456,7 @@ msgid "Safe" msgstr "Güvenli" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "Kaydet" @@ -4456,28 +4517,28 @@ msgstr "Durumu Kaydet : 8" msgid "Save State Slot 9" msgstr "Durumu Kaydet : 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "Durumu Kaydet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "Şu anki perspektifi kaydet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "Genişletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." @@ -4499,7 +4560,7 @@ msgstr "Kalıplar taranıyor" msgid "Scanning..." msgstr "Taranıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "Ekran Görüntüsü" @@ -4515,7 +4576,7 @@ msgstr "Ara" msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" @@ -4538,12 +4599,12 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4565,19 +4626,19 @@ msgstr "Almak için bir kayıt dosyası seçin" msgid "Select floating windows" msgstr "Sabit olmayan pencereyi seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4643,7 +4704,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "Gönder" @@ -4655,11 +4716,11 @@ msgstr "Sensör Çubuk Konumu:" msgid "Separator" msgstr "Bölücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4679,25 +4740,26 @@ msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Anasayfa, kod listesi boyutu %lu dan daha büyük." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Ayarlar..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem: Ayar dosyası bulunamadı" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "Sallama" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "Kısa İsim:" @@ -4705,23 +4767,28 @@ msgstr "Kısa İsim:" msgid "Shoulder Buttons" msgstr "Shoulder Düğmeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "Konsolu Göster (&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "Geçmişi Göster (&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "Durum Çubuğunu Gö&ster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "Araç Çubuğunu Gös&ter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "Varsayılan" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "Aygıtları Göster" @@ -4733,11 +4800,11 @@ msgstr "EFB Bölge Kopyalamasını Göster" msgid "Show FPS" msgstr "Kare Sayısını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "Fransızları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "GameCube'leri Göster" @@ -4745,35 +4812,35 @@ msgstr "GameCube'leri Göster" msgid "Show Input Display" msgstr "Görüntü Girişini Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "İtalyanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "Japonları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "Korelileri Göster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "Gösterme Dili:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "Geçmiş Yapılandırmasını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "PAL'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "Platformları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "Bölgeleri Göster" @@ -4781,27 +4848,27 @@ msgstr "Bölgeleri Göster" msgid "Show Statistics" msgstr "İstatistikleri Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "Tayvanlıları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "Amerikanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "WAD'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "Wii'leri Göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "Oyunu durdurmadan önce onay kutusu görüntüle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4819,7 +4886,7 @@ msgstr "İlk bloğu göster" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4854,7 +4921,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "Bilinmeyenleri göster" @@ -4872,7 +4939,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Basitleştirilmiş Çince" @@ -4880,11 +4947,11 @@ msgstr "Basitleştirilmiş Çince" msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4907,17 +4974,17 @@ msgstr "" "doğruluğunu artırmayı deneyin.\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "Slot B" @@ -4925,7 +4992,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Enstantene" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "Yazılımsal Yorumlayıcı" @@ -4941,7 +5008,7 @@ msgstr "" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin değilseniz, " "'Hayır' seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "Ses Ayarları" @@ -4959,9 +5026,9 @@ msgstr "Ses tamponu oluşturulamadı: %s" msgid "Space" msgstr "Boşluk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "İspanyolca" @@ -4989,37 +5056,29 @@ msgstr "" "\n" "Emin değilseniz, 640x528'i seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "Disk Aktarım Oranını Hızlandır" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Kare Çubuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Başlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "&NetPlay'i Başlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "Çekimi Başlat (&C)" @@ -5035,7 +5094,7 @@ msgstr "Durum" msgid "State Saves" msgstr "Durum Kayıtları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "" @@ -5044,7 +5103,7 @@ msgid "Stick" msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "Durdur" @@ -5075,16 +5134,16 @@ msgstr "Tıngırtı" msgid "Subtract" msgstr "Çıkarma" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "Dosya %s 'ye başarıyla verildi" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "Kayıt dosyaları başarıyla alındı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5092,18 +5151,18 @@ msgstr "" msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "Sistem Dili:" @@ -5132,13 +5191,13 @@ msgstr "Tablo Sol" msgid "Table Right" msgstr "Tablo Sağ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5158,7 +5217,7 @@ msgstr "Doku Ön Belleği" msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD Başarıyla yüklendi." @@ -5170,13 +5229,13 @@ msgstr "Adres geçersiz" msgid "The checksum was successfully fixed" msgstr "Sağlama başarıyla düzeltildi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5232,7 +5291,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Kopyalamayı denediğiniz kaydın boyutu hatalı" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5240,23 +5299,23 @@ msgstr "" "Seçilen dili sisteminiz desteklememektedir. Sistem varsayılanına geri " "dönülüyor." -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "Sunucu ve istemcinin NetPlay sürümleri uyumlu değil!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "Sunucu dolu!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "Sunucu yanıtı: oyun şu anda çalışıyor!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "Sunucu bilinmeyen bir hata mesajı gönderdi!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "Belirtilen dosya \"%s\" bulunamadı" @@ -5265,11 +5324,11 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "Değer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "Tema:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5277,7 +5336,7 @@ msgstr "" "Burada 00000001/00000002 için bir bilet olmalıdır. NAND dökümünüz " "tamamlanmamış olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5292,7 +5351,7 @@ msgid "" msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaşlamaya neden olabilir." @@ -5315,7 +5374,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5327,7 +5386,7 @@ msgstr "" "ile Ses hızlandırıcısı kullanın. (Ses takılmalarını düzeltebilir, ancak " "(oyuna bağlı olarak) sürekli gürültüye de neden olabilir.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5381,7 +5440,7 @@ msgstr "EFB Kopyaları" msgid "Toggle Fog" msgstr "Tüm Geçmiş Türlerini Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" @@ -5391,11 +5450,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Üst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Geleneksel Çince" @@ -5419,7 +5478,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut değil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Türkçe" @@ -5472,7 +5531,7 @@ msgstr "" "kod olarak ayrıştırılamadı. Kodu doğru yazdığınızdan emin olun.\n" "Bu satırı yoksayıp ayrıştırmaya devam etmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "Belirsiz %i" @@ -5509,12 +5568,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "SYSCONF içinde bilinmeyen giriş türü %i (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Şu ID ile bilinmeyen mesaj alındı : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" @@ -5533,7 +5592,7 @@ msgstr "Güncelle" msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" @@ -5545,7 +5604,7 @@ msgstr "Tam Ekran Kullan" msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" @@ -5569,6 +5628,15 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5591,7 +5659,7 @@ msgstr "Gereçler" msgid "V-Sync" msgstr "Dikey Eşitleme" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU Hız Hilesi" @@ -5616,7 +5684,7 @@ msgstr "Duyuru/Hata/Uyarı" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "Görüntü" @@ -5624,17 +5692,17 @@ msgstr "Görüntü" msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "Ses" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD kurulumu başarısız: %s oluşturmada hata" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "WAD kurulumu başarısız: Ticket oluşturma hatası." @@ -5668,7 +5736,7 @@ msgstr "Uyarı - ELF yanlış konsol modunda başlatılıyor!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Uyarı - Kalıp yanlış konsol modunda başlatılıyor!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5693,7 +5761,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5705,7 +5773,7 @@ msgstr "" "veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi " "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaşayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5717,7 +5785,7 @@ msgstr "" "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " "senkronizasyon sorunu yaşayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5768,23 +5836,19 @@ msgstr "Geniş Ekran Hilesi" msgid "Width" msgstr "Genişlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "Wii Kaydı Al" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5793,7 +5857,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Dosyadan okuma başarısız" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5802,7 +5866,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote Bağlandı" @@ -5810,7 +5874,7 @@ msgstr "Wiimote Bağlandı" msgid "Wiimote Motor" msgstr "Wiimote Motoru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wiimote ayarları" @@ -5834,14 +5898,14 @@ msgstr "Pencereleri Sağa Döşe" msgid "Word Wrap" msgstr "Heceleme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "Çalışıyor..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5901,7 +5965,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Sayfalı bölmeleri kapatamazsınız." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "Bir oyun seçmelisiniz!!" @@ -5917,7 +5981,7 @@ msgstr "Doğru bir sekizlik,onluk veya onaltılık değer girmelisiniz." msgid "You must enter a valid profile name." msgstr "Geçerli bir profil ismi girmelisiniz." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Değişikliğin etkili olması için Dolphin'i yeniden başlatmalısınız." @@ -5928,7 +5992,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5947,7 +6011,7 @@ msgstr "" "0x%04x olmalıdır (sizinki: 0x%04llx) \n" "Yenisini oluşturmak ister misiniz?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP Hilesi" @@ -6013,7 +6077,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6026,7 +6090,17 @@ msgstr "iCacheJIT: %x 'den işlem kodu okunuyor. Lütfen bildirin." msgid "s" msgstr "s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Şu ID ile bilinmeyen mesaj alındı : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -6045,9 +6119,19 @@ msgstr "| VEYA" #~ msgid "Accurate VBeam emulation" #~ msgstr "Doğru VBeam Emülasyonu" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Kollar ayarlanamadı. Oyuncu ayrıldı veya oyun şu anda çalışıyor! \n" +#~ "(Oyunlar çalışırken kolların ayarlanması henüz desteklenmemektedir)" + #~ msgid "Enable Hotkeys" #~ msgstr "Kısayol Tuşlarına İzin Ver" +#~ msgid "Export failed, try again?" +#~ msgstr "Verme başarısız, tekrar dene?" + #~ msgid "Failed to Listen!!" #~ msgstr "Dinleme başarısız!" @@ -6069,12 +6153,21 @@ msgstr "| VEYA" #~ "Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. " #~ "(Açık = Uyumlu, Kapalı = Hızlı)" +#~ msgid "Import failed, try again?" +#~ msgstr "Alma başarısız,tekrar dene?" + +#~ msgid "In-Game" +#~ msgstr "Oyun-İçi" + #~ msgid "Last Overwritten State" #~ msgstr "Son Üzerine Yazılan Durum" #~ msgid "Last Saved State" #~ msgstr "Son Kayıtlı Durum" +#~ msgid "Local" +#~ msgstr "Yerel" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "Durum yüklemesinde Wiimote'u yeniden bağla" @@ -6083,3 +6176,6 @@ msgstr "| VEYA" #~ msgid "Skip Dest. Alpha Pass" #~ msgstr "Hedef Alpha Geçişini Atla" + +#~ msgid "Wii Save Import" +#~ msgstr "Wii Kaydı Al" diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index a4d14ff611..3d89c53066 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-14 02:35+0000\n" "Last-Translator: Sentret_C \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/dolphin-" @@ -25,9 +25,9 @@ msgstr "" msgid " (too many to display)" msgstr " (要显示的项目太多)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " 游戏 : " @@ -44,7 +44,7 @@ msgstr "" "\"%s\" 不存在.\n" " 创建一个新的 16MB 记忆卡?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" 不是一个有效的 GCM/ISO 文件, 或者不是一个 GC/Wii 镜像." @@ -69,8 +69,8 @@ msgstr "%d个样本" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s 已经存在,覆盖吗?" @@ -107,12 +107,17 @@ msgstr "" "未能作为存储卡打开%s \n" "相对于有效的记忆卡文件,该文件太小 (0x%x 字节)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "打开 %s 失败" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "打开 %s 失败" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr " %s 是一个零字节文件" @@ -122,7 +127,7 @@ msgstr " %s 是一个零字节文件" msgid "%s is already compressed! Cannot compress it further." msgstr "%s 已经被压缩过! 不能对它再进行压缩了." -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s 作为文件名太长,最大字符数为45" @@ -151,7 +156,7 @@ msgstr "%u 空闲区块; %u 空闲目录项目" msgid "&& AND" msgstr "&& 与" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "关于(&A)..." @@ -159,7 +164,7 @@ msgstr "关于(&A)..." msgid "&Boot from DVD Drive..." msgstr "从光驱启动(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "断点(&B)" @@ -167,7 +172,7 @@ msgstr "断点(&B)" msgid "&Browse for ISOs..." msgstr "浏览镜像(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "作弊码管理器(&C)" @@ -191,11 +196,11 @@ msgstr "模拟(&E)" msgid "&File" msgstr "文件(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "帧数步进(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "切换全屏(&F)" @@ -203,7 +208,7 @@ msgstr "切换全屏(&F)" msgid "&Graphics Settings" msgstr "图形设置(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "帮助(&H)" @@ -211,7 +216,7 @@ msgstr "帮助(&H)" msgid "&Hotkey Settings" msgstr "热键设置(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "即时编译器(&J)" @@ -223,11 +228,11 @@ msgstr "载入状态(&L)" msgid "&Memcard Manager (GC)" msgstr "GC存储卡管理器(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "内存(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "打开(&O)..." @@ -235,11 +240,11 @@ msgstr "打开(&O)..." msgid "&Options" msgstr "选项(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "暂停游戏(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "开始游戏(&P)" @@ -247,39 +252,39 @@ msgstr "开始游戏(&P)" msgid "&Properties" msgstr "属性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "只读模式(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "刷新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "重置游戏(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "声音(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "停止游戏(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "视频(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "视图(&V)" @@ -368,7 +373,7 @@ msgstr "<在这里插入名称>" msgid "" msgstr "<未找到分辨率>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "<无>" @@ -376,7 +381,7 @@ msgstr "<无>" msgid "" msgstr "<按任意键>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<系统>" @@ -384,8 +389,8 @@ msgstr "<系统>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "网上对战窗口已经打开!!" @@ -412,8 +417,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -435,13 +438,13 @@ msgstr "" "\n" "您必须设置TCP端口转发以成为主机!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-基板" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "动作回放代码" @@ -562,11 +565,11 @@ msgstr "适配器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "添加动作回放代码" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "添加补丁" @@ -574,9 +577,9 @@ msgstr "添加补丁" msgid "Add new pane" msgstr "添加新面板" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "添加..." @@ -628,36 +631,36 @@ msgstr "调整激活按钮所需的模拟控制压力。" msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "高级设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "所有存档状态 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "所有 Wii 镜像文件 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii 镜像文件 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" @@ -685,7 +688,7 @@ msgstr "应用程序载入器大小错误...这真是一个应用程序载入器 msgid "Apploader unable to load from file" msgstr "应用程序载入器不能从文件载入" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "应用载入器:" @@ -700,7 +703,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "阿拉伯语" @@ -709,7 +712,7 @@ msgstr "阿拉伯语" msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定要删除 \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -717,15 +720,15 @@ msgstr "" "请确认真的要删除这些文件?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "您确定想要删除这个文件?这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "Arm JIT(实验性)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "宽高比:" @@ -734,12 +737,12 @@ msgstr "宽高比:" msgid "At least one pane must remain open." msgstr "必须有一个窗口保持打开" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "音频后端:" @@ -747,7 +750,7 @@ msgstr "音频后端:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "自动" @@ -786,7 +789,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "后端设置" @@ -804,7 +807,7 @@ msgstr "后台输入" msgid "Backward" msgstr "Backward" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "无效文件头" @@ -817,11 +820,11 @@ msgstr "" msgid "Banner" msgstr "标志" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "标志详细信息" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "标志:" @@ -833,7 +836,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "基本设置" @@ -862,7 +865,7 @@ msgid "Blue Right" msgstr "蓝 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "底部" @@ -871,11 +874,11 @@ msgstr "底部" msgid "Bound Controls: %lu" msgstr "绑定控制器: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "损坏" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "浏览" @@ -883,15 +886,15 @@ msgstr "浏览" msgid "Browse for a directory to add" msgstr "浏览要添加的目录" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "浏览镜像目录" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "浏览输出目录" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "缓冲区:" @@ -901,7 +904,7 @@ msgstr "缓冲区:" msgid "Buttons" msgstr "按键" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -923,7 +926,7 @@ msgstr "C-摇杆" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" @@ -945,7 +948,7 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -960,9 +963,9 @@ msgstr "" msgid "Cancel" msgstr "取消" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "不能打开 %s" @@ -971,7 +974,7 @@ msgstr "不能打开 %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时不能反注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -982,7 +985,7 @@ msgstr "" "%s\n" "不是有效的Gamecube存储卡文件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -994,7 +997,7 @@ msgstr "" msgid "Caps Lock" msgstr "大写锁定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "加泰罗尼亚语" @@ -1002,11 +1005,11 @@ msgstr "加泰罗尼亚语" msgid "Center" msgstr "中心" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "切换" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "切换光盘(&D)..." @@ -1014,11 +1017,11 @@ msgstr "切换光盘(&D)..." msgid "Change Disc" msgstr "切换光盘" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "切换游戏" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1034,11 +1037,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "模拟器正在运行时改动将不会生效!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "聊天" @@ -1054,39 +1057,39 @@ msgstr "作弊码搜索" msgid "Cheats Manager" msgstr "金手指管理" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "检查分区完整性" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "完整性检查中..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "繁体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "选择一个NAND根目录:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "选择一个默认镜像:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "选择一个要添加的目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "选择要打开的文件" @@ -1094,7 +1097,7 @@ msgstr "选择要打开的文件" msgid "Choose a memory card:" msgstr "选择一个存储卡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1102,8 +1105,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1122,7 +1125,7 @@ msgstr "经典" msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1130,7 +1133,7 @@ msgstr "游戏运行时与客户端连接断开!!NetPlay已禁用。您必 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "关闭" @@ -1155,7 +1158,7 @@ msgstr "命令" msgid "Comment" msgstr "注释" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "注释:" @@ -1167,12 +1170,12 @@ msgstr "压缩镜像..." msgid "Compress selected ISOs..." msgstr "压缩所选镜像..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "压缩镜像中" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "设置" @@ -1186,22 +1189,22 @@ msgstr "设置" msgid "Configure Control" msgstr "设置面板" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "设置手柄" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "停止时确认" @@ -1210,17 +1213,17 @@ msgstr "停止时确认" msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "连接 USB 键盘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "连接 Wiimote %i" @@ -1241,7 +1244,7 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "连接中..." @@ -1261,7 +1264,7 @@ msgstr "控制" msgid "Convert to GCI" msgstr "转换到 GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "复制失败" @@ -1270,7 +1273,7 @@ msgstr "复制失败" msgid "Copy to Memcard %c" msgstr "复制到内存卡 %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "核心" @@ -1284,7 +1287,7 @@ msgstr "不能创建 %s" msgid "Could not initialize backend %s." msgstr "不能初始化后端 %s" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1294,24 +1297,16 @@ msgstr "" "不能读取\"%s\"。驱动器里没有光盘或不是GC/Wii备份。请注意大多数PC DVD驱动器不" "能读取原始的Gamecube与Wii光盘。" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "不能识别 ISO 文件 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "不能保存 %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1331,11 +1326,11 @@ msgstr "" "您是否是在移动模拟器目录后收到这个消息?\n" "如果这样,您可能需要在选项中重新指定您的存储卡位置。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "找不到扩展名'ini'的打开命令!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1348,7 +1343,7 @@ msgstr "" msgid "Count:" msgstr "数量:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "国家:" @@ -1387,12 +1382,12 @@ msgstr "" msgid "Crossfade" msgstr "淡入淡出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "自定义投影修正" @@ -1400,11 +1395,11 @@ msgstr "自定义投影修正" msgid "Custom Projection Hack Settings" msgstr "自定义投影修正设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影参数" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "捷克语" @@ -1416,36 +1411,37 @@ msgstr "D" msgid "D-Pad" msgstr "方向键" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "音频 LLE 重编译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "在专门的线程上模拟DSP" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#, fuzzy +msgid "DSPLLE on Separate Thread" +msgstr "在专门的线程上模拟DSP" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD 根目录:" @@ -1457,7 +1453,7 @@ msgstr "DVDLowRead - 致命错误:读取卷失败" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - 致命错误:读取卷失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1465,7 +1461,7 @@ msgstr "" msgid "Data Size" msgstr "数据大小" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "日期:" @@ -1502,8 +1498,8 @@ msgstr "解压缩镜像..." msgid "Decompress selected ISOs..." msgstr "解压缩所选镜像..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "解压缩镜像中" @@ -1516,7 +1512,7 @@ msgstr "刷新游戏列表" msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "默认镜像:" @@ -1560,8 +1556,8 @@ msgstr "" msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "设备设置" @@ -1573,7 +1569,7 @@ msgstr "Dial" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1639,7 +1635,7 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "光盘" @@ -1666,24 +1662,60 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "您确定是否停止当前模拟?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "杜比定向逻辑II解码器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s 图形设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin 网站(&W)" @@ -1699,12 +1731,12 @@ msgstr "Dolphin模拟Wii遥控器配置" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC手柄设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1712,7 +1744,7 @@ msgstr "Dolphin TAS 电影 (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wii遥控器配置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Google Code上的Dolphin(&G)" @@ -1728,12 +1760,12 @@ msgid "" "games..." msgstr "Dolphin 当前设置了隐藏所有游戏. 双击这里显示所有游戏..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin未能完成请求的操作。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1758,11 +1790,11 @@ msgstr "已下载 %lu 代码(已添加 %lu)" msgid "Drums" msgstr "鼓" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "转储音频" @@ -1808,9 +1840,9 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "荷兰语" @@ -1841,7 +1873,7 @@ msgstr "欧版" msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "编辑" @@ -1853,16 +1885,20 @@ msgstr "编辑动作回放代码" msgid "Edit Config" msgstr "编辑设置" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "编辑补丁" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "编辑当前外观" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "编辑..." @@ -1874,7 +1910,7 @@ msgstr "效果" msgid "Embedded Frame Buffer" msgstr "嵌入式帧缓冲 (EFB)" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "模拟线程已经在运行" @@ -1911,7 +1947,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模拟Wii遥控器" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "模拟器状态: " @@ -1938,11 +1974,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "启用动作回放记录" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "启用区块合并" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1950,27 +1986,27 @@ msgstr "" msgid "Enable Cache" msgstr "启用缓存" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "启用作弊" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "启用多核处理" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "启用多核处理(加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "启用空闲步进" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "启用空闲步进(加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "启用 MMU" @@ -1978,7 +2014,7 @@ msgstr "启用 MMU" msgid "Enable Progressive Scan" msgstr "启用逐行扫描" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "" @@ -1986,7 +2022,7 @@ msgstr "" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "启用宽屏" @@ -2008,7 +2044,7 @@ msgstr "" "\n" "如果没有把握,请选择1x。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2041,35 +2077,27 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "启用此项以提速《塞尔达传说:黄昏公主》。运行任何其它游戏时请禁用此项。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "启用自定义投影修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "启用杜比定向逻辑II模拟5.1环绕声。不适用于OSX。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "启用杜比定向逻辑II模拟5.1环绕声。仅适用于OpenAL后端。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" -"启用杜比定向逻辑II模拟5.1环绕声。仅适用于OpenAL后端。可能需要将soft_oal.dll重" -"命名为OpenAL32.dll以生效。" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -2082,7 +2110,7 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2102,9 +2130,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "英语" @@ -2133,11 +2161,11 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "错误" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "加载选定语言错误。正在退回系统默认。" @@ -2167,7 +2195,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "Exception handler - access below memory space. %08llx%08llx" @@ -2176,16 +2203,21 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "执行" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "导出所有存档" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "导出失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "导出文件" @@ -2193,7 +2225,7 @@ msgstr "导出文件" msgid "Export Recording" msgstr "导出录制" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "导出录制..." @@ -2209,9 +2241,10 @@ msgstr "导出 Wii 存档 (实验性)" msgid "Export all saves" msgstr "导出所有存档" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "导出失败,需要重试吗?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "导出失败" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2233,44 +2266,44 @@ msgstr "外部参数" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "仅用于《银河战士:另一个M》的额外参数。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "提取所有文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "提取 Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "提取 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "提取目录..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "提取文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "提取分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "正在提取 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "提取所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "提取目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "提取中..." @@ -2286,11 +2319,11 @@ msgstr "" msgid "FRANCE" msgstr "法国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST 大小:" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "连接失败!" @@ -2298,7 +2331,7 @@ msgstr "连接失败!" msgid "Failed to download codes." msgstr "下载代码失败." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "提取到 %s 失败!" @@ -2337,16 +2370,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "读取 %s 失败" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "读取 banner.bin 失败" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2377,12 +2410,12 @@ msgstr "" "未能正确读取区块分配表\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "从文件 %d 读取数据失败" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2403,7 +2436,7 @@ msgstr "" "正确的读取目录失败\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2415,29 +2448,34 @@ msgstr "" "正确的读取头失败\n" "(0x000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "写入文件头失败 %d" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "Failed to read unique ID from disc image" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "Failed to write BT.DINF to SYSCONF" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "Failed to write bkhdr" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "从文件 %d 读取数据失败" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "写入文件头到 %s 失败" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "写入文件头失败 %d" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "波斯语" @@ -2449,17 +2487,17 @@ msgstr "快速" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU快速版本。 不是对所有游戏都有效。" -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "致命的不同步。回放中止。(Error in PlayWiimote: %u != %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "" @@ -2500,16 +2538,16 @@ msgstr "文件不能被识别成内存卡" msgid "File not compressed" msgstr "文件不是已压缩文件" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 未知打开模式 : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! 不能打开!" @@ -2537,7 +2575,7 @@ msgstr "强制 16:9" msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "" @@ -2569,7 +2607,7 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2588,7 +2626,7 @@ msgstr "" msgid "Forward" msgstr "Forward" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2597,6 +2635,11 @@ msgstr "" msgid "Found %d results for '" msgstr "找到了 '的%d个结果" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "不能保存 %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2626,7 +2669,7 @@ msgstr "帧范围" msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "帧数限制:" @@ -2638,9 +2681,9 @@ msgstr "录制帧数" msgid "Free Look" msgstr "自由视点" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "法语" @@ -2653,7 +2696,7 @@ msgstr "Frets" msgid "From" msgstr "从" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "全屏" @@ -2665,7 +2708,7 @@ msgstr "全屏分辨率:" msgid "GCI File(*.gci)" msgstr "GCI 文件(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC手柄" @@ -2673,27 +2716,27 @@ msgstr "GC手柄" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "游戏 ID:" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "游戏已经运行!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "游戏没有运行!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "游戏没有找到!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "游戏特殊设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "游戏配置" @@ -2701,7 +2744,7 @@ msgstr "游戏配置" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube存档文件(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2710,16 +2753,16 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 内存卡 (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Gamecube 手柄设置" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko 代码" @@ -2733,7 +2776,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "常规" @@ -2742,9 +2785,9 @@ msgstr "常规" msgid "General Settings" msgstr "常规设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "德语" @@ -2753,11 +2796,11 @@ msgstr "德语" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "图形" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "图形设置" @@ -2781,7 +2824,7 @@ msgstr "" "\n" "如果没有把握,请勾选此项。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "希腊语" @@ -2809,7 +2852,7 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "希伯来语" @@ -2821,7 +2864,7 @@ msgstr "高度" msgid "Help" msgstr "帮助" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2833,7 +2876,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2872,7 +2915,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "主机" @@ -2881,11 +2924,11 @@ msgid "Hotkey Configuration" msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "匈牙利语" @@ -2893,12 +2936,12 @@ msgstr "匈牙利语" msgid "Hybrid Wiimote" msgstr "混合Wii遥控器" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2907,11 +2950,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL 设置" @@ -2927,11 +2970,11 @@ msgstr "IR 指针" msgid "IR Sensitivity:" msgstr "红外灵敏度:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "镜像详细信息" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "镜像目录" @@ -2943,7 +2986,7 @@ msgstr "意大利" msgid "Icon" msgstr "图标" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2984,9 +3027,15 @@ msgstr "" msgid "Import Save" msgstr "导入存档" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "导入失败,要重试吗?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "导入存档" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "导出失败" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3008,21 +3057,17 @@ msgstr "" "导入的文件有一个 sav 扩展名\n" "但是它没有正确的文件头" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "进游戏" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "进游戏" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "帧数限制:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "信息" @@ -3042,7 +3087,7 @@ msgstr "插入" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里插入加密的或者解密的代码..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "插入SD卡" @@ -3050,7 +3095,7 @@ msgstr "插入SD卡" msgid "Insert name here.." msgstr "在这里插入名称..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "安装 WAD" @@ -3058,40 +3103,41 @@ msgstr "安装 WAD" msgid "Install to Wii Menu" msgstr "安装到Wii菜单" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "正在安装 WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "完整性校验失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "完整性校验完成" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "完整性校验完成。没有发现错误。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "分区%d完整性校验失败。您的dump很可能已损坏或补丁错误。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "界面" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "界面设置" @@ -3116,15 +3162,15 @@ msgstr "内部 LZO 错误 - lzo_init() 失败" msgid "Internal Resolution:" msgstr "内部分辨率:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "解释器(非常慢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "片头" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "无效大小(%x) 或 魔字(%x)" @@ -3157,7 +3203,7 @@ msgstr "" "%s\n" "您可能需要重新转储此游戏。" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "无效录制文件" @@ -3173,13 +3219,13 @@ msgstr "无效的搜索字串(无法转换成数字)" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "Invalid state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "意大利语" @@ -3187,16 +3233,16 @@ msgstr "意大利语" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "JIT 重编译器(推荐)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性重编译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "日语" @@ -3222,8 +3268,8 @@ msgstr "前端显示" msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "韩语" @@ -3241,16 +3287,16 @@ msgstr "L 键" msgid "L-Analog" msgstr "L-摇杆" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "延迟:" @@ -3293,7 +3339,7 @@ msgstr "" msgid "Less Than" msgstr "小于" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "" @@ -3392,15 +3438,15 @@ msgstr "载入存档插槽 8" msgid "Load State Slot 9" msgstr "载入存档插槽 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "载入状态..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "加载Wii系统菜单" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "加载Wii系统菜单 %d%c" @@ -3419,10 +3465,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "本地" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "日志" @@ -3456,11 +3498,11 @@ msgid "Logger Outputs" msgstr "记录输出" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "记录中" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "丢失服务器连接!" @@ -3468,7 +3510,7 @@ msgstr "丢失服务器连接!" msgid "M Button" msgstr "M 键" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3477,7 +3519,7 @@ msgstr "" "MD5 不匹配\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU 速度破解" @@ -3491,11 +3533,11 @@ msgstr "MadCatz Gameshark 文件(*.gcs)" msgid "Main Stick" msgstr "主摇杆" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "制作者ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "制作者:" @@ -3530,7 +3572,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "内存卡" @@ -3540,7 +3582,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3565,7 +3607,7 @@ msgstr "存储卡文件大小与文件头大小不匹配" msgid "Menu" msgstr "菜单" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "Mic" @@ -3578,7 +3620,7 @@ msgstr "最小" msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "其它设置" @@ -3722,7 +3764,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3769,7 +3811,7 @@ msgstr "未找到镜像或者WAD" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "没有找到标题为 %s 的标志文件" @@ -3795,7 +3837,7 @@ msgstr "没有空闲目录索引项目" msgid "No recorded file" msgstr "没有已录制文件" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "No save folder found for title %s" @@ -3804,11 +3846,11 @@ msgstr "No save folder found for title %s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "无" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "书面挪威语" @@ -3816,17 +3858,17 @@ msgstr "书面挪威语" msgid "Not Equal" msgstr "不等于" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "未设置" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "未连接" @@ -3872,7 +3914,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "关闭" @@ -3880,16 +3922,20 @@ msgstr "关闭" msgid "Offset:" msgstr "偏移量:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "屏幕显示消息(OSD)" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "只有 %d 区块有效" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "打开" @@ -3902,7 +3948,7 @@ msgstr "打开包含文件夹(&C)" msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "打开文件..." @@ -3928,6 +3974,16 @@ msgstr "OpenCL纹理解码器" msgid "OpenMP Texture Decoder" msgstr "OpenMP纹理解码器" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3953,7 +4009,7 @@ msgstr "" msgid "Other" msgstr "其他" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3965,7 +4021,7 @@ msgstr "" msgid "Output" msgstr "输出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "播放录制(&L)..." @@ -3973,7 +4029,7 @@ msgstr "播放录制(&L)..." msgid "Pad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "手柄" @@ -4002,21 +4058,21 @@ msgstr "参数" msgid "Partition %i" msgstr "分区 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "补丁" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "路径" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "暂停" @@ -4029,7 +4085,7 @@ msgstr "在影片末尾暂停" msgid "Per-Pixel Lighting" msgstr "逐像素照明" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "完美" @@ -4039,9 +4095,9 @@ msgid "Perspective %d" msgstr "视角%d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "开始" @@ -4053,7 +4109,7 @@ msgstr "播放录制" msgid "Play/Pause" msgstr "开始/暂停" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "可以玩" @@ -4061,11 +4117,11 @@ msgstr "可以玩" msgid "Playback Options" msgstr "回放选项" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "请确认..." @@ -4077,36 +4133,36 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "端口 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "端口 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "端口 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "端口 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "端口 :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "葡萄牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "葡萄牙语(巴西)" @@ -4114,17 +4170,17 @@ msgstr "葡萄牙语(巴西)" msgid "Post-Processing Effect:" msgstr "后处理效果:" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4157,7 +4213,7 @@ msgstr "配置" msgid "Properties" msgstr "属性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "清除缓存" @@ -4165,8 +4221,8 @@ msgstr "清除缓存" msgid "Question" msgstr "询问" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "退出" @@ -4227,6 +4283,11 @@ msgstr "真实Wii遥控器" msgid "Record" msgstr "录制" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "录制选项" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "录制信息" @@ -4262,7 +4323,7 @@ msgstr "" "如果没有把握,选择“无”。" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "刷新" @@ -4271,14 +4332,14 @@ msgstr "刷新" msgid "Refresh List" msgstr "刷新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "刷新游戏列表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "移除" @@ -4309,7 +4370,7 @@ msgstr "结果" msgid "Return" msgstr "回车" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4327,15 +4388,15 @@ msgstr "右摇杆" msgid "Rumble" msgstr "震动" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#, fuzzy msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" "在一个专门的线程上运行DSP HLE和LLE(不推荐:用于HLE时可能产生声音差错,用于" "LLE时可能导致卡机)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "俄语" @@ -4348,7 +4409,7 @@ msgid "Safe" msgstr "安全" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "保存" @@ -4409,28 +4470,28 @@ msgstr "存档插槽 8" msgid "Save State Slot 9" msgstr "存档插槽 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "保存状态..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "另存为..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "保存压缩的GCM/镜像" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "保存当前视角" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "保存解压缩的GCM/镜像" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." @@ -4452,7 +4513,7 @@ msgstr "扫描镜像中" msgid "Scanning..." msgstr "扫描中..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "截图" @@ -4468,7 +4529,7 @@ msgstr "搜索" msgid "Search Filter" msgstr "搜索过滤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "搜索子目录" @@ -4491,12 +4552,12 @@ msgstr "未在SYSCONF中找到部分%s" msgid "Select" msgstr "选择" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "选择录制文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "选择要安装的 Wii WAD 文件" @@ -4517,19 +4578,19 @@ msgstr "选择要导入的存档" msgid "Select floating windows" msgstr "选择浮动窗口" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "选择要载入的文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "选择要载入的状态" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "选择要保存的状态" @@ -4604,7 +4665,7 @@ msgstr "" "\n" "如果没有把握,请选择OpenGL。" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "发送" @@ -4616,11 +4677,11 @@ msgstr "传感器栏位置" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "串行端口 1 - 这是网络适配器等设备使用的端口" @@ -4639,25 +4700,26 @@ msgstr "设置为默认内存卡 %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "设置延迟(以毫秒计)。较高的值或将减少音频噼啪声。仅适用于OpenAL后端。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "设置..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "安装Wii内存: 不能找到设置文件" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "震动" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "短名称:" @@ -4665,23 +4727,28 @@ msgstr "短名称:" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "显示控制台(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "显示日志(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "显示状态栏(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "显示工具栏(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "默认" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "显示驱动器" @@ -4693,11 +4760,11 @@ msgstr "显示EFB复制范围" msgid "Show FPS" msgstr "显示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "显示法国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "显示 GameCube" @@ -4705,35 +4772,35 @@ msgstr "显示 GameCube" msgid "Show Input Display" msgstr "显示输入显示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "显示意大利" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "显示日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "显示韩国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "显示语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "显示日志设置(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "显示PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "显示平台" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "显示国家" @@ -4741,27 +4808,27 @@ msgstr "显示国家" msgid "Show Statistics" msgstr "显示统计数据" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "显示台湾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "显示美国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "显示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "显示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "停止游戏时显示确认对话框" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4779,7 +4846,7 @@ msgstr "显示第一区块" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4815,7 +4882,7 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "显示未知" @@ -4833,7 +4900,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "简体中文" @@ -4841,11 +4908,11 @@ msgstr "简体中文" msgid "Size" msgstr "大小" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "跳过BIOS" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4863,17 +4930,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "插槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "插槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "插槽 B" @@ -4881,7 +4948,7 @@ msgstr "插槽 B" msgid "Snapshot" msgstr "截图" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "软件渲染器" @@ -4896,7 +4963,7 @@ msgstr "" "该项仅当用于调试目的时有所帮助。\n" "您真的想要启用软件渲染吗?如果没有把握,请选择“否”。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "声音设置" @@ -4914,9 +4981,9 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "西班牙语" @@ -4941,37 +5008,29 @@ msgstr "" "能将越高。\n" "如果没有把握,请选择640x528。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "提升光盘传输率" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "方块键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "标准控制器" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "开始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "开始网络对战(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "开始录制(&C)" @@ -4987,7 +5046,7 @@ msgstr "状态" msgid "State Saves" msgstr "状态存档" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "方向盘" @@ -4996,7 +5055,7 @@ msgid "Stick" msgstr "摇杆" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "停止" @@ -5026,16 +5085,16 @@ msgstr "Strum" msgid "Subtract" msgstr "Subtract" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "成功导出文件到 %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "成功导入存档文件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -5043,18 +5102,18 @@ msgstr "" msgid "Swing" msgstr "摇摆" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "同步GPU线程" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "同步GPU与CPU线程以帮助防止双核模式下的偶发卡死。(开=兼容,关=快速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "系统语言:" @@ -5083,13 +5142,13 @@ msgstr "Table Left" msgid "Table Right" msgstr "Table Right" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "屏幕截图" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" @@ -5109,7 +5168,7 @@ msgstr "纹理缓存" msgid "Texture Format Overlay" msgstr "纹理格式覆盖" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD 安装成功" @@ -5121,13 +5180,13 @@ msgstr "地址无效" msgid "The checksum was successfully fixed" msgstr "校检和成功修复" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "选择的目录已经存在于列表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -5180,29 +5239,29 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "您正在试图复制的存档文件大小无效" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "您的系统不支持选定的语言。正在退回系统默认。" -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "服务器与客户端的NetPlay版本不兼容!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "服务器已满!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "服务器回应:游戏正在运行!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "服务器发送了一个未知错误消息!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "指定的文件 \"%s\" 不存在" @@ -5211,11 +5270,11 @@ msgstr "指定的文件 \"%s\" 不存在" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "主题:" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5223,7 +5282,7 @@ msgstr "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5237,7 +5296,7 @@ msgid "" "Replay itself." msgstr "此动作回放模拟器不支持修改动作回放本身的代码。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "这会导致Wii Menu和一些游戏减速。" @@ -5259,7 +5318,7 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 #, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " @@ -5270,7 +5329,7 @@ msgstr "" "如果设置的帧数限制高于游戏的全速(NTSC:60, PAL:50)。选择“音频”以使用DSP限制速" "度(可能修正咔嗒声但也可能导致持续的噪音,因游戏而异)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5322,7 +5381,7 @@ msgstr "EFB副本" msgid "Toggle Fog" msgstr "切换所有日志类型" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "切换全屏" @@ -5332,11 +5391,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "繁体中文" @@ -5360,7 +5419,7 @@ msgstr "" "正在尝试从无效的SYSCONF中读取\n" "Wiimote bt ids将不可用" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "土耳其语" @@ -5411,7 +5470,7 @@ msgstr "" "正确。\n" "是否忽略此行继续分析?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "未定义的 %i" @@ -5448,12 +5507,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "Unknown entry type %i in SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "Unknown message received with id : %d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" @@ -5472,7 +5531,7 @@ msgstr "更新" msgid "Upright Wiimote" msgstr "直握 Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 模式 (PAL60)" @@ -5484,7 +5543,7 @@ msgstr "全屏显示" msgid "Use Hex" msgstr "使用十六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "使用警告程序" @@ -5508,6 +5567,15 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5529,7 +5597,7 @@ msgstr "实用扩展" msgid "V-Sync" msgstr "垂直同步" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU 速度破解" @@ -5554,7 +5622,7 @@ msgstr "详细" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "视频" @@ -5562,17 +5630,17 @@ msgstr "视频" msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "音量" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD 安装失败: 创建 %s 错误" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" @@ -5606,7 +5674,7 @@ msgstr "Warning - starting ELF in wrong console mode!" msgid "Warning - starting ISO in wrong console mode!" msgstr "Warning - starting ISO in wrong console mode!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5629,7 +5697,7 @@ msgstr "" "%s\n" "要继续吗?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5637,7 +5705,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5645,7 +5713,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5681,23 +5749,19 @@ msgstr "宽屏破解" msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii控制台" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "Wii NAND 根目录:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "导入 Wii 存档" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5706,7 +5770,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: 不能从文件读取" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wii遥控器" @@ -5715,7 +5779,7 @@ msgstr "Wii遥控器" msgid "Wiimote %i" msgstr "Wii遥控器 %i" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wii遥控器已连接" @@ -5723,7 +5787,7 @@ msgstr "Wii遥控器已连接" msgid "Wiimote Motor" msgstr "Wiimote 马达" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wii遥控器设置" @@ -5747,14 +5811,14 @@ msgstr "窗口右侧" msgid "Word Wrap" msgstr "自动换行" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "工作中..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5819,7 +5883,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "You can't close panes that have pages in them." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "您必须选择一个游戏!!" @@ -5835,7 +5899,7 @@ msgstr "您必须输入一个十进制或者十六进制值." msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的配置文件名称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "您必须重新启动Dolphin以使改动生效。 " @@ -5849,7 +5913,7 @@ msgstr "" "是否要现在停止以处理这个问题?\n" "如果选择“否”,声音可能会出现混乱。" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5868,7 +5932,7 @@ msgstr "" "正确的大小为 0x%04x (但您的是 0x%04llx)\n" "是否要生成一个新的?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP 破解" @@ -5933,7 +5997,7 @@ msgstr "" "\n" "如果没有把握,请不要勾选此项。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "应用程序载入器 (.img)" @@ -5946,7 +6010,17 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." msgid "s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "Unknown message received with id : %d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5976,9 +6050,26 @@ msgstr "| 或" #~ "\n" #~ "如果没有把握,请不要勾选此项。" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" + #~ msgid "Enable Hotkeys" #~ msgstr "启用热键" +#~ msgid "" +#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +#~ msgstr "" +#~ "启用杜比定向逻辑II模拟5.1环绕声。仅适用于OpenAL后端。可能需要将soft_oal." +#~ "dll重命名为OpenAL32.dll以生效。" + +#~ msgid "Export failed, try again?" +#~ msgstr "导出失败,需要重试吗?" + #~ msgid "Failed to Listen!!" #~ msgstr "监听失败!!" @@ -5998,12 +6089,21 @@ msgstr "| 或" #~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" #~ msgstr "如果帧率不稳定,此选项可能有所帮助 (ON = 兼容, OFF = 快速)" +#~ msgid "Import failed, try again?" +#~ msgstr "导入失败,要重试吗?" + +#~ msgid "In-Game" +#~ msgstr "进游戏" + #~ msgid "Last Overwritten State" #~ msgstr "最后覆盖状态" #~ msgid "Last Saved State" #~ msgstr "最后保存状态" +#~ msgid "Local" +#~ msgstr "本地" + #~ msgid "Reconnect Wiimote on State Loading" #~ msgstr "读取状态时重连Wii遥控器" @@ -6012,3 +6112,6 @@ msgstr "| 或" #~ msgid "Skip Dest. Alpha Pass" #~ msgstr "忽略目标Alpha通道" + +#~ msgid "Wii Save Import" +#~ msgstr "导入 Wii 存档" diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 3f601cf917..5d60a06a81 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 09:30-0500\n" +"POT-Creation-Date: 2013-09-09 06:28-0500\n" "PO-Revision-Date: 2013-04-04 08:13+0000\n" "Last-Translator: delroth \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/dolphin-" @@ -23,9 +23,9 @@ msgstr "" msgid " (too many to display)" msgstr " (要顯示的項目太多)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:519 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:556 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:291 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:521 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid " Game : " msgstr " 遊戲:" @@ -42,7 +42,7 @@ msgstr "" "\"%s\" 不存在。\n" " 是否建立新的 16MB 記憶卡?" -#: Source/Core/Core/Src/CoreParameter.cpp:136 +#: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" 為無效的 GCM/ISO 檔案,或非 GC/Wii ISO。" @@ -67,8 +67,8 @@ msgstr "" msgid "%d samples (quality level %d)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" msgstr "%s 已經存在,是否覆寫?" @@ -99,12 +99,17 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" msgstr "開啟 %s 失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352 +#: Source/Core/Core/Src/x64MemTools.cpp:182 +#, fuzzy, c-format +msgid "%s failed: kr=%x" +msgstr "開啟 %s 失敗" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" msgstr "%s 為 0 位元的檔案" @@ -114,7 +119,7 @@ msgstr "%s 為 0 位元的檔案" msgid "%s is already compressed! Cannot compress it further." msgstr "%s 已經被壓縮過了!無法再次進行壓縮。" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" msgstr "%s 做為檔名太長了,最多允許 45 個位元" @@ -143,7 +148,7 @@ msgstr "剩餘 %u 個區塊;剩餘 %u 個目錄項目" msgid "&& AND" msgstr "和(&&)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." msgstr "關於(&A)..." @@ -151,7 +156,7 @@ msgstr "關於(&A)..." msgid "&Boot from DVD Drive..." msgstr "從 DVD 光碟機啟動(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" msgstr "中斷點(&B)" @@ -159,7 +164,7 @@ msgstr "中斷點(&B)" msgid "&Browse for ISOs..." msgstr "瀏覽 ISO 檔(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" msgstr "作弊檔管理器(&C)" @@ -183,11 +188,11 @@ msgstr "模擬器(&E)" msgid "&File" msgstr "檔案(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:341 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" msgstr "畫格步進(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" msgstr "全螢幕(&F)" @@ -195,7 +200,7 @@ msgstr "全螢幕(&F)" msgid "&Graphics Settings" msgstr "影像設定(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:302 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" msgstr "說明(&H)" @@ -203,7 +208,7 @@ msgstr "說明(&H)" msgid "&Hotkey Settings" msgstr "快捷鍵設定(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" msgstr "&JIT" @@ -215,11 +220,11 @@ msgstr "讀取進度(&L)" msgid "&Memcard Manager (GC)" msgstr "GC 記憶卡管理器(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:236 msgid "&Memory" msgstr "記憶卡(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:321 msgid "&Open..." msgstr "開啟(&O)..." @@ -227,11 +232,11 @@ msgstr "開啟(&O)..." msgid "&Options" msgstr "選項(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Pause" msgstr "暫停(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:334 msgid "&Play" msgstr "執行(&P)" @@ -239,39 +244,39 @@ msgstr "執行(&P)" msgid "&Properties" msgstr "屬性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:354 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" msgstr "唯讀模式(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:325 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" msgstr "更新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" msgstr "重新啟動(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:237 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" msgstr "聲音(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" msgstr "停止(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:239 msgid "&Video" msgstr "影像(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 msgid "&View" msgstr "檢視(&V)" @@ -360,7 +365,7 @@ msgstr "<插入名稱>" msgid "" msgstr "<無解析度設定>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "" msgstr "<無>" @@ -368,7 +373,7 @@ msgstr "<無>" msgid "" msgstr "<按任意鍵>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<系統>" @@ -376,8 +381,8 @@ msgstr "<系統>" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:234 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:267 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:233 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" msgstr "已經開啟一個網路對戰視窗!!" @@ -402,8 +407,6 @@ msgid "" " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" -" - Manually set the exact number of controllers to be used to [Standard " -"Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -425,13 +428,13 @@ msgstr "" "\n" "您必須至主機的 TCP 埠口進行設定!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" msgstr "AR 代碼" @@ -550,11 +553,11 @@ msgstr "配接器:" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" msgstr "新增修正" @@ -562,9 +565,9 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增面版" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "Add..." msgstr "新增..." @@ -615,36 +618,36 @@ msgstr "調整模擬搖桿控制壓力需要活動的按鈕。" msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" msgstr "進階設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1464 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1478 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "所有即時存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1191 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1211 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:106 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" @@ -672,7 +675,7 @@ msgstr "程式讀取器為錯誤的大小...它是程式讀取器嗎?" msgid "Apploader unable to load from file" msgstr "程式讀取器無法從檔案中讀取" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" msgstr "程式讀取器:" @@ -687,7 +690,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -696,7 +699,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "是否確認刪除 \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1016 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -704,15 +707,15 @@ msgstr "" "是否真的要刪除這些檔案?\n" "刪了之後就回不來了哦!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1007 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是否真的要刪除這些檔案?刪了之後就回不來了哦!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "Aspect Ratio:" msgstr "畫面比例:" @@ -721,12 +724,12 @@ msgstr "畫面比例:" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個面板。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" msgstr "聲音" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" msgstr "聲音裝置:" @@ -734,7 +737,7 @@ msgstr "聲音裝置:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon:開啟 AO 裝置出錯。\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Auto" msgstr "自動" @@ -770,7 +773,7 @@ msgstr "" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" msgstr "裝置設定" @@ -788,7 +791,7 @@ msgstr "背景輸入" msgid "Backward" msgstr "向後" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" msgstr "損壞的檔頭" @@ -801,11 +804,11 @@ msgstr "" msgid "Banner" msgstr "橫幅" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537 msgid "Banner Details" msgstr "圖示明細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 msgid "Banner:" msgstr "橫幅:" @@ -817,7 +820,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Basic Settings" msgstr "基本設定" @@ -846,7 +849,7 @@ msgid "Blue Right" msgstr "藍 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "下方" @@ -855,11 +858,11 @@ msgstr "下方" msgid "Bound Controls: %lu" msgstr "綁定控制器:%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" msgstr "破損" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" msgstr "瀏覽" @@ -867,15 +870,15 @@ msgstr "瀏覽" msgid "Browse for a directory to add" msgstr "瀏覽要新增的資料夾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." msgstr "瀏覽 ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1083 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" msgstr "瀏覽輸出的資料夾" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:348 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:347 msgid "Buffer:" msgstr "緩衝:" @@ -885,7 +888,7 @@ msgstr "緩衝:" msgid "Buttons" msgstr "按鈕" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." @@ -907,7 +910,7 @@ msgstr "C-搖桿" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" @@ -924,7 +927,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1877 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" msgstr "" @@ -939,9 +942,9 @@ msgstr "" msgid "Cancel" msgstr "取消" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171 -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" msgstr "無法開啟 %s" @@ -950,7 +953,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1068 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -958,7 +961,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1098 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -970,7 +973,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -978,11 +981,11 @@ msgstr "" msgid "Center" msgstr "中心" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:590 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:587 msgid "Change" msgstr "更改" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:322 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." msgstr "更換光碟(&D)..." @@ -990,11 +993,11 @@ msgstr "更換光碟(&D)..." msgid "Change Disc" msgstr "更換光碟" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:582 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:579 msgid "Change Game" msgstr "更換遊戲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1010,11 +1013,11 @@ msgstr "更改 zFar 參數符號 (在修正後)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "更改 zNear 參數的符號 (在修正後)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "更改此選項在模擬器執行時沒有效果!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:317 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" msgstr "聊天" @@ -1030,39 +1033,39 @@ msgstr "尋找作弊代碼" msgid "Cheats Manager" msgstr "作弊代碼管理器" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" msgstr "選擇一個 DVD 根目錄:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" msgstr "選擇一個預設 ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1228 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" msgstr "選擇一個要添加的資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1055 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" msgstr "選擇一個要開啟的檔案" @@ -1070,14 +1073,14 @@ msgstr "選擇一個要開啟的檔案" msgid "Choose a memory card:" msgstr "選擇一個記憶卡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "選擇作為程式讀取器的檔案:(僅用於來讀取 光碟的目錄結構)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:783 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" msgstr "選擇提取的資料夾存放位置" @@ -1096,7 +1099,7 @@ msgstr "Classic" msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/NetPlayServer.cpp:265 +#: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." @@ -1104,7 +1107,7 @@ msgstr "在遊戲執行時客戶端斷開連接!!網路對戰已經被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587 msgid "Close" msgstr "關閉" @@ -1129,7 +1132,7 @@ msgstr "命令" msgid "Comment" msgstr "註釋" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 msgid "Comment:" msgstr "註釋:" @@ -1141,12 +1144,12 @@ msgstr "壓縮 ISO..." msgid "Compress selected ISOs..." msgstr "壓縮選擇的 ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" msgstr "正在壓縮 ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" msgstr "設定" @@ -1160,22 +1163,22 @@ msgstr "設定" msgid "Configure Control" msgstr "設定控制器" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:328 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:609 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:327 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:606 msgid "Configure Pads" msgstr "設定控制器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1123 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1151 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1221 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 msgid "Confirm File Overwrite" msgstr "確認檔案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" msgstr "" @@ -1184,17 +1187,17 @@ msgstr "" msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #, fuzzy msgid "Connect Balance Board" msgstr "連接 USB 鍵盤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" msgstr "連接 USB 鍵盤" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" msgstr "連接 Wiimote %i" @@ -1215,7 +1218,7 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:658 +#: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." msgstr "正在連接..." @@ -1235,7 +1238,7 @@ msgstr "控制器" msgid "Convert to GCI" msgstr "轉換為 GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:376 +#: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" msgstr "複製失敗" @@ -1244,7 +1247,7 @@ msgstr "複製失敗" msgid "Copy to Memcard %c" msgstr "複製至記憶卡 %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" msgstr "核心" @@ -1258,7 +1261,7 @@ msgstr "無法建立 %s" msgid "Could not initialize backend %s." msgstr "無法初始化 backend %s。" -#: Source/Core/Core/Src/CoreParameter.cpp:131 +#: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format msgid "" "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " @@ -1269,24 +1272,16 @@ msgstr "" "請注意,原始的 Gamecube 及 Wii 光碟在大多數的 PC DVD 光碟機中是無法被正常讀取" "的。" -#: Source/Core/Core/Src/CoreParameter.cpp:286 +#: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "無法識別 ISO 檔案 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" msgstr "無法儲存 %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 -msgid "" -"Could not set pads. The player left or the game is currently running!\n" -"(setting pads while the game is running is not yet supported)" -msgstr "" -"無法設置控制器。有玩家存留或者遊戲正在執行!\n" -"(還不支援在遊戲執行時設定控制器)" - #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" @@ -1300,11 +1295,11 @@ msgid "" "options." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1152 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" msgstr "找不到副檔名 'ini' 的開啟命令!" -#: Source/Core/Core/Src/BootManager.cpp:152 +#: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1317,7 +1312,7 @@ msgstr "" msgid "Count:" msgstr "數量:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 msgid "Country:" msgstr "國別:" @@ -1354,12 +1349,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" msgstr "自訂投影修正" @@ -1367,11 +1362,11 @@ msgstr "自訂投影修正" msgid "Custom Projection Hack Settings" msgstr "自訂投影修正設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影參數。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Czech" @@ -1383,36 +1378,36 @@ msgstr "" msgid "D-Pad" msgstr "十字方向鍵" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP" msgstr "聲音" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "DSP LLE recompiler" msgstr "DSP LLE 重編譯器 (慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 -msgid "DSP on Dedicated Thread" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:468 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 msgid "DSP settings" msgstr "聲音設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +msgid "DSPLLE on Separate Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" msgstr "DVD 根:" @@ -1424,7 +1419,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" msgstr "" @@ -1432,7 +1427,7 @@ msgstr "" msgid "Data Size" msgstr "資料大小" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Date:" msgstr "日期:" @@ -1469,8 +1464,8 @@ msgstr "解壓 ISO..." msgid "Decompress selected ISOs..." msgstr "解壓選擇的 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" msgstr "ISO 解壓中" @@ -1483,7 +1478,7 @@ msgstr "更新遊戲列表" msgid "Default" msgstr "預設值" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" msgstr "預設的 ISO:" @@ -1527,8 +1522,8 @@ msgstr "" msgid "Device" msgstr "裝置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:786 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" msgstr "裝置設定" @@ -1540,7 +1535,7 @@ msgstr "Dial" msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:126 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140 msgid "Direct3D9" msgstr "Direct3D9" @@ -1592,7 +1587,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" msgstr "光碟" @@ -1616,24 +1611,60 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1035 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" msgstr "您要停止目前的模擬嗎?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:899 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" msgstr "Dolphin" +#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21 +#, c-format +msgid "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s 影像設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" msgstr "Dolphin 官網(&W)" @@ -1649,12 +1680,12 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:727 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1662,7 +1693,7 @@ msgstr "Dolphin TAS 影片 (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote 設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:299 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" msgstr "Dolphin SVN (&G)" @@ -1678,12 +1709,12 @@ msgid "" "games..." msgstr "Dolphin 目前被設定為隱藏所有遊戲。按兩下這裡顯示所有遊戲..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " @@ -1708,11 +1739,11 @@ msgstr "已下載 %lu 條代碼。 (已添加 %lu 條)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:649 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dump Audio" msgstr "轉儲聲音" @@ -1749,9 +1780,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Dutch" @@ -1780,7 +1811,7 @@ msgstr "EUROPE" msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" msgstr "編輯" @@ -1792,16 +1823,20 @@ msgstr "編輯 ActionReplay 代碼" msgid "Edit Config" msgstr "編輯 ini 設定檔" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +msgid "Edit Local Overrides" +msgstr "" + #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" msgstr "編輯修正" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:484 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" msgstr "編輯目前版式" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." msgstr "編輯..." @@ -1813,7 +1848,7 @@ msgstr "效果" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:188 +#: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" msgstr "模擬器線程已經執行中" @@ -1840,7 +1875,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " msgstr "模擬狀態:" @@ -1862,11 +1897,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "開啟 AR 日誌" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" msgstr "開啟塊合併" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1874,27 +1909,27 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" msgstr "開啟作弊" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" msgstr "開啟略過空閒" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" msgstr "開啟略過空閒 (加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" msgstr "開啟 MMU" @@ -1902,7 +1937,7 @@ msgstr "開啟 MMU" msgid "Enable Progressive Scan" msgstr "開啟逐行掃瞄" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" msgstr "" @@ -1910,7 +1945,7 @@ msgstr "" msgid "Enable Speaker Data" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" msgstr "開啟寬螢幕" @@ -1927,7 +1962,7 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1953,33 +1988,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "開啟此選項將加速塞爾達傳說:曙光公主,請勿在其它遊戲中使用。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" - #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enables progressive scan if supported by the emulated software.\n" @@ -1988,7 +2017,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2005,9 +2034,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "English" @@ -2036,11 +2065,11 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" msgstr "錯誤" -#: Source/Core/DolphinWX/Src/Main.cpp:412 +#: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "讀取選擇的語系出錯。返回使用系統預設值。" @@ -2068,7 +2097,6 @@ msgid "Euphoria" msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 -#: Source/Core/Core/Src/x64MemTools.cpp:209 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" msgstr "處理異常 - 存取下列記憶體空間。 %08llx%08llx" @@ -2077,16 +2105,21 @@ msgstr "處理異常 - 存取下列記憶體空間。 %08llx%08llx" msgid "Execute" msgstr "執行" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#, fuzzy +msgid "Export All Wii Saves" +msgstr "匯出所有存檔" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" msgstr "匯出失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" msgstr "匯出檔案" @@ -2094,7 +2127,7 @@ msgstr "匯出檔案" msgid "Export Recording" msgstr "匯出錄像" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." msgstr "匯出錄像..." @@ -2110,9 +2143,10 @@ msgstr "匯出 Wii 存檔 (實驗性)" msgid "Export all saves" msgstr "匯出所有存檔" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72 -msgid "Export failed, try again?" -msgstr "匯出失敗,要重試嗎?" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 +#, fuzzy +msgid "Export failed" +msgstr "匯出失敗" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2134,44 +2168,44 @@ msgstr "額外參數" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "僅在 ''銀河戰士:另一個 M'' 中有效的額外參數。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." msgstr "提取所有檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." msgstr "提取程式讀取器..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." msgstr "提取 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." msgstr "提取資料夾..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." msgstr "提取檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." msgstr "提取分割區..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:740 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format msgid "Extracting %s" msgstr "%s 提取中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" msgstr "所有檔案提取中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:723 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" msgstr "資料夾提取中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:726 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." msgstr "提取中..." @@ -2187,11 +2221,11 @@ msgstr "" msgid "FRANCE" msgstr "FRANCE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" msgstr "FST 大小" -#: Source/Core/Core/Src/NetPlayClient.cpp:141 +#: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" msgstr "連接失敗!" @@ -2199,7 +2233,7 @@ msgstr "連接失敗!" msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:862 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format msgid "Failed to extract to %s!" msgstr "提取至 %s 失敗!" @@ -2231,16 +2265,16 @@ msgid "" "might crash unexpectedly!" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:771 +#: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" msgstr "讀取 banner.bin 失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" msgstr "" @@ -2268,12 +2302,12 @@ msgstr "" "讀取正確的塊分配表失敗\n" "(0x6000-0x7FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 #, c-format msgid "Failed to read data from file %d" msgstr "從檔案 %d 讀取數據失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" msgstr "" @@ -2294,7 +2328,7 @@ msgstr "" "讀取正確的目錄失敗\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" msgstr "" @@ -2306,29 +2340,34 @@ msgstr "" "讀取正確的頭部失敗\n" "(0x0000-0x1FFF)" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 +#, fuzzy, c-format +msgid "Failed to read header for file %d" +msgstr "檔案 %d 寫入檔頭失敗" + #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" msgstr "從光碟中讀取唯一的 ID 失敗" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:103 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" msgstr "寫入 BT.DINF 至 SYSCONF 失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" msgstr "寫入 bkhdr 失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 +#, fuzzy, c-format +msgid "Failed to write data to file: %s" +msgstr "從檔案 %d 讀取數據失敗" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format msgid "Failed to write header for %s" msgstr "檔案 %s 寫入檔頭失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251 -#, c-format -msgid "Failed to write header for file %d" -msgstr "檔案 %d 寫入檔頭失敗" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" msgstr "" @@ -2340,17 +2379,17 @@ msgstr "快速" msgid "Fast Depth Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。可能無法在所有遊戲上執行。" -#: Source/Core/Core/Src/Movie.cpp:1028 +#: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:201 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" msgstr "" @@ -2391,16 +2430,16 @@ msgstr "檔案未被識別為一張記憶卡" msgid "File not compressed" msgstr "檔案未壓縮" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO:未知開啟模式: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1145 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' 未知! 無法開啟!" @@ -2428,7 +2467,7 @@ msgstr "強制 16:9" msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" msgstr "" @@ -2452,7 +2491,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2471,7 +2510,7 @@ msgstr "" msgid "Forward" msgstr "向前" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:157 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" msgstr "" @@ -2480,6 +2519,11 @@ msgstr "" msgid "Found %d results for '" msgstr "" +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 +#, fuzzy, c-format +msgid "Found %x save files" +msgstr "無法儲存 %s" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" @@ -2509,7 +2553,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "畫格省略(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:559 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 msgid "Framelimit:" msgstr "畫格速限制:" @@ -2521,9 +2565,9 @@ msgstr "" msgid "Free Look" msgstr "自由視點" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "French" msgstr "French" @@ -2536,7 +2580,7 @@ msgstr "Frets" msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" msgstr "全螢幕" @@ -2548,7 +2592,7 @@ msgstr "" msgid "GCI File(*.gci)" msgstr "GCI 檔案(*.gci)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" msgstr "GC 控制器" @@ -2556,27 +2600,27 @@ msgstr "GC 控制器" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" msgstr "遊戲 ID :" -#: Source/Core/Core/Src/NetPlayClient.cpp:411 +#: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" msgstr "遊戲正在執行!" -#: Source/Core/Core/Src/NetPlayClient.cpp:570 +#: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" msgstr "遊戲未執行!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:420 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" msgstr "遊戲規格設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" msgstr "遊戲設定" @@ -2584,7 +2628,7 @@ msgstr "遊戲設定" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" msgstr "Gamecube" @@ -2593,16 +2637,16 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1059 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 記憶卡 (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" msgstr "Gamecube 控制器設定" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 msgid "Gecko Codes" msgstr "Gecko 代碼" @@ -2616,7 +2660,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203 msgid "General" msgstr "一般" @@ -2625,9 +2669,9 @@ msgstr "一般" msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "German" msgstr "German" @@ -2636,11 +2680,11 @@ msgstr "German" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode:索引大於 ar 代碼列表大小 %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" msgstr "影像" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:467 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" msgstr "影像設定" @@ -2659,7 +2703,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" msgstr "Greek" @@ -2687,7 +2731,7 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hebrew" msgstr "Hebrew" @@ -2699,7 +2743,7 @@ msgstr "高度" msgid "Help" msgstr "說明" -#: Source/Core/DolphinWX/Src/Main.cpp:229 +#: Source/Core/DolphinWX/Src/Main.cpp:241 msgid "" "Hi,\n" "\n" @@ -2711,7 +2755,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:220 +#: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" "Hi,\n" "\n" @@ -2747,7 +2791,7 @@ msgid "Home" msgstr "Home" #: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:144 msgid "Host" msgstr "主機" @@ -2756,11 +2800,11 @@ msgid "Hotkey Configuration" msgstr "快捷鍵設定" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" msgstr "快捷鍵" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" msgstr "Hungarian" @@ -2768,12 +2812,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "混合 Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS:試圖取得資料從未知的標簽: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not " @@ -2782,11 +2826,11 @@ msgid "" " Dolphin will likely hang now." msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - 損毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" msgstr "IPL 設定" @@ -2802,11 +2846,11 @@ msgstr "IR 指示器" msgid "IR Sensitivity:" msgstr "IR 靈敏度:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520 msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" msgstr "ISO 資料夾" @@ -2818,7 +2862,7 @@ msgstr "ITALY" msgid "Icon" msgstr "圖示" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2850,9 +2894,15 @@ msgstr "" msgid "Import Save" msgstr "匯入存檔" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48 -msgid "Import failed, try again?" -msgstr "匯入失敗,是否重試?" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#, fuzzy +msgid "Import Wii Save" +msgstr "匯入存檔" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 +#, fuzzy +msgid "Import failed" +msgstr "匯出失敗" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -2874,21 +2924,17 @@ msgstr "" "匯入的檔案有 sav 副檔名\n" "但是沒有正確的檔頭" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "In Game" msgstr "遊戲中" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:620 -msgid "In-Game" -msgstr "遊戲中" - #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #, fuzzy msgid "Increase Frame limit" msgstr "畫格速限制:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Info" msgstr "訊息" @@ -2908,7 +2954,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡插入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" msgstr "插入 SD 卡" @@ -2916,7 +2962,7 @@ msgstr "插入 SD 卡" msgid "Insert name here.." msgstr "在這裡插入名稱.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:198 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" msgstr "安裝 WAD" @@ -2924,39 +2970,40 @@ msgstr "安裝 WAD" msgid "Install to Wii Menu" msgstr "安裝至 Wii 選單" -#: Source/Core/Core/Src/x64MemTools.cpp:246 +#: Source/Core/Core/Src/x64MemTools.cpp:288 +#: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler,但是這個平台尚未支援此功能。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1371 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." msgstr "正在安裝 WAD 至 Wii 選單..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:920 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:926 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:925 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:917 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" msgstr "界面設定" @@ -2981,15 +3028,15 @@ msgstr "內部 LZO 錯誤 - lzo_init() 失敗" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" msgstr "標題" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" msgstr "無效大小(%x) 或 Magic word (%x)" @@ -3022,7 +3069,7 @@ msgstr "" "%s\n" " 可能需要重新轉儲這個遊戲。" -#: Source/Core/Core/Src/Movie.cpp:714 +#: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" msgstr "無效的錄像檔" @@ -3038,13 +3085,13 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:511 +#: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" msgstr "無效的狀態" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Italian" msgstr "Italian" @@ -3052,16 +3099,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Japanese" msgstr "Japanese" @@ -3084,8 +3131,8 @@ msgstr "" msgid "Key" msgstr "鍵" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Korean" msgstr "Korean" @@ -3103,16 +3150,16 @@ msgstr "L 鈕" msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:592 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" msgstr "語系:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:416 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" msgstr "" @@ -3155,7 +3202,7 @@ msgstr "" msgid "Less Than" msgstr "小於" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" msgstr "" @@ -3254,15 +3301,15 @@ msgstr "讀取儲存格 8" msgid "Load State Slot 9" msgstr "讀取儲存格 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." msgstr "讀取進度檔..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1406 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" msgstr "讀取 Wii 系統選單 (%d%c)" @@ -3278,10 +3325,6 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "讀取可用的修正設定預設檔" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:618 -msgid "Local" -msgstr "本地" - #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" msgstr "記錄" @@ -3311,11 +3354,11 @@ msgid "Logger Outputs" msgstr "記錄輸出" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/Frame.cpp:318 +#: Source/Core/DolphinWX/Src/Frame.cpp:320 msgid "Logging" msgstr "日誌" -#: Source/Core/Core/Src/NetPlayClient.cpp:339 +#: Source/Core/Core/Src/NetPlayClient.cpp:323 msgid "Lost connection to server!" msgstr "遺失與伺服器的連接" @@ -3323,7 +3366,7 @@ msgstr "遺失與伺服器的連接" msgid "M Button" msgstr "M 鈕" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format msgid "" "MD5 mismatch\n" @@ -3332,7 +3375,7 @@ msgstr "" "MD5 不符合\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" msgstr "MMU 速度修正" @@ -3346,11 +3389,11 @@ msgstr "MadCatz Gameshark 檔案(*.gcs)" msgid "Main Stick" msgstr "主搖桿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" msgstr "廠商 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495 msgid "Maker:" msgstr "廠商:" @@ -3381,7 +3424,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "Memory Card" msgstr "記憶卡" @@ -3391,7 +3434,7 @@ msgid "" "could mangle stuff!" msgstr "記憶卡管理器警告-在使用前請先備份,以防止出現損毀時無法復原!" -#: Source/Core/Core/Src/CoreParameter.cpp:368 +#: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3416,7 +3459,7 @@ msgstr "" msgid "Menu" msgstr "選單" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" msgstr "麥克風" @@ -3429,7 +3472,7 @@ msgstr "" msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788 msgid "Misc Settings" msgstr "其它設定" @@ -3566,7 +3609,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37 msgid "Name:" @@ -3613,7 +3656,7 @@ msgstr "找不到 ISO 或 WAD" msgid "No audio output" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" msgstr "找不到標題 %s 的圖示檔案" @@ -3639,7 +3682,7 @@ msgstr "沒有剩餘的目錄索引項目" msgid "No recorded file" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" msgstr "找不到標題 %s 的存檔資料夾" @@ -3648,11 +3691,11 @@ msgstr "找不到標題 %s 的存檔資料夾" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:626 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:614 msgid "None" msgstr "無" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3660,17 +3703,17 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "不相等" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" msgstr "未設定" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:657 +#: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" msgstr "未連接" @@ -3716,7 +3759,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" msgstr "關閉" @@ -3724,16 +3767,20 @@ msgstr "關閉" msgid "Offset:" msgstr "偏移:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:300 +msgid "Online &Documentation" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format msgid "Only %d blocks available" msgstr "僅 %d 個區塊可用" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 msgid "Open" msgstr "開啟" @@ -3746,7 +3793,7 @@ msgstr "開啟內容資料夾(&C)" msgid "Open Wii &save folder" msgstr "開啟 Wii 存檔資料夾(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." msgstr "開啟檔案..." @@ -3772,6 +3819,16 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +msgid "" +"Opens the default (read-only) configuration for this game in an external " +"text editor." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 +msgid "Opens the user specified overrides in an external text editor." +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 msgid "Options" @@ -3797,7 +3854,7 @@ msgstr "" msgid "Other" msgstr "" -#: Source/Core/Core/Src/NetPlayClient.cpp:275 +#: Source/Core/Core/Src/NetPlayClient.cpp:259 msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." @@ -3807,7 +3864,7 @@ msgstr "其它客戶端在遊戲執行時連接埠口!!已關閉網路對戰 msgid "Output" msgstr "輸出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." msgstr "播放錄像(&L)..." @@ -3815,7 +3872,7 @@ msgstr "播放錄像(&L)..." msgid "Pad" msgstr "控制器" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:628 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:621 msgid "Pad " msgstr "控制器" @@ -3844,21 +3901,21 @@ msgstr "參數" msgid "Partition %i" msgstr "分割區 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:842 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" msgstr "路徑" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1632 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1633 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 msgid "Pause" msgstr "暫停" @@ -3871,7 +3928,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" msgstr "完美" @@ -3881,9 +3938,9 @@ msgid "Perspective %d" msgstr "版式 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1641 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1642 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653 msgid "Play" msgstr "執行" @@ -3895,7 +3952,7 @@ msgstr "播放錄像" msgid "Play/Pause" msgstr "執行/暫停" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" msgstr "可玩" @@ -3903,11 +3960,11 @@ msgstr "可玩" msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:323 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1036 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." msgstr "請確認..." @@ -3919,36 +3976,36 @@ msgstr "請在儲存前建立一個新的透檢視" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 1" msgstr "埠口 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 2" msgstr "埠口 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Port 3" msgstr "埠口 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Port 4" msgstr "埠口 4" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:137 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:136 msgid "Port :" msgstr "埠口:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -3956,17 +4013,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:918 +#: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1037 +#: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1014 +#: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3999,7 +4056,7 @@ msgstr "設定檔" msgid "Properties" msgstr "屬性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" msgstr "清理快取" @@ -4007,8 +4064,8 @@ msgstr "清理快取" msgid "Question" msgstr "問題" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:170 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:338 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:169 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:337 msgid "Quit" msgstr "離開" @@ -4069,6 +4126,11 @@ msgstr "" msgid "Record" msgstr "" +#: Source/Core/DolphinWX/Src/NetWindow.cpp:357 +#, fuzzy +msgid "Record input" +msgstr "播放錄像" + #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" msgstr "" @@ -4099,7 +4161,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958 msgid "Refresh" msgstr "更新" @@ -4108,14 +4170,14 @@ msgstr "更新" msgid "Refresh List" msgstr "更新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:458 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Refresh game list" msgstr "更新遊戲列表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "Remove" msgstr "移除" @@ -4143,7 +4205,7 @@ msgstr "結果" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" msgstr "" @@ -4161,13 +4223,12 @@ msgstr "右 搖桿" msgid "Rumble" msgstr "震動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "" -"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause " -"audio glitches with HLE and freezes with LLE)." +"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" msgstr "Russian" @@ -4180,7 +4241,7 @@ msgid "Safe" msgstr "安全" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980 msgid "Save" msgstr "儲存" @@ -4241,28 +4302,28 @@ msgstr "儲存至儲存格 8" msgid "Save State Slot 9" msgstr "儲存至儲存格 1" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." msgstr "另存進度..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." msgstr "另存為..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:483 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" msgstr "儲存目前版式" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:780 +#: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是損毀的,影片錄製停止..." @@ -4284,7 +4345,7 @@ msgstr "正在掃瞄 ISO" msgid "Scanning..." msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" msgstr "截圖" @@ -4300,7 +4361,7 @@ msgstr "" msgid "Search Filter" msgstr "搜索篩選" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Search Subfolders" msgstr "搜尋子資料夾" @@ -4323,12 +4384,12 @@ msgstr "項目 %s 在 SYSCONF 中找不到" msgid "Select" msgstr "選擇" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:723 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1133 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:725 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" msgstr "選擇已錄製的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" msgstr "選擇要安裝的 Wii WAD" @@ -4347,19 +4408,19 @@ msgstr "選擇要匯入的存檔" msgid "Select floating windows" msgstr "選擇浮動視窗" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:616 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:618 msgid "Select the file to load" msgstr "選擇要讀取的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" msgstr "選擇存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "選擇要讀取的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1476 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "選擇要儲存的進度" @@ -4412,7 +4473,7 @@ msgid "" "If unsure, use OpenGL." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:310 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" msgstr "傳送" @@ -4424,11 +4485,11 @@ msgstr "傳感器位置:" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "埠口 1 - 這是類似於網卡等裝置使用的埠口。" @@ -4447,25 +4508,26 @@ msgstr "設定為預設記憶卡 %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive:索引大於 ar 代碼列表大小 %lu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "設定..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209 -msgid "SetupWiiMem: Cant find setting file" +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 +#, fuzzy +msgid "SetupWiiMem: Cant create setting file" msgstr "SetupWiiMem:無法找到設定檔" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" msgstr "搖晃" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 msgid "Short Name:" msgstr "短名:" @@ -4473,23 +4535,28 @@ msgstr "短名:" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" msgstr "顯示控制台(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:218 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" msgstr "顯示日誌視窗(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show &Statusbar" msgstr "顯示狀態欄(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" msgstr "顯示工具列(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#, fuzzy +msgid "Show Defaults" +msgstr "預設值" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" msgstr "顯示裝置" @@ -4501,11 +4568,11 @@ msgstr "" msgid "Show FPS" msgstr "顯示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:274 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show France" msgstr "顯示 France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:260 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:261 msgid "Show GameCube" msgstr "顯示 GameCube" @@ -4513,35 +4580,35 @@ msgstr "顯示 GameCube" msgid "Show Input Display" msgstr "輸入顯示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" msgstr "顯示 Italy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show JAP" msgstr "顯示 JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show Korea" msgstr "顯示 Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" msgstr "顯示語系:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:219 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" msgstr "日誌記錄設定(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" msgstr "顯示 PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 msgid "Show Platforms" msgstr "顯示平台" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 msgid "Show Regions" msgstr "顯示區域" @@ -4549,27 +4616,27 @@ msgstr "顯示區域" msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Taiwan" msgstr "顯示 Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 msgid "Show USA" msgstr "顯示 USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:262 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Wad" msgstr "顯示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:258 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wii" msgstr "顯示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Show a confirmation box before stopping a game." msgstr "在停止遊戲後顯示一個確認框。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4587,7 +4654,7 @@ msgstr "顯示第一個區塊" msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4618,7 +4685,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" msgstr "顯示 未知" @@ -4633,7 +4700,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "橫握 Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4641,11 +4708,11 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "大小" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" msgstr "" @@ -4663,17 +4730,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:401 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:389 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" msgstr "插槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707 msgid "Slot B" msgstr "插槽 B" @@ -4681,7 +4748,7 @@ msgstr "插槽 B" msgid "Snapshot" msgstr "截圖" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45 msgid "Software Renderer" msgstr "" @@ -4693,7 +4760,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" msgstr "聲音設定" @@ -4711,9 +4778,9 @@ msgstr "聲音緩衝建立失敗:%s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Spanish" msgstr "Spanish" @@ -4733,37 +4800,29 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" msgstr "加速光碟傳輸率" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 -msgid "" -"Speed up vertex streaming by using unsafe OpenGL code. Enabling this option " -"might cause heavy glitches or even crash the emulator.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" msgstr "標準控制器" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:37 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:25 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:344 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:343 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" msgstr "開始網路對戰(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" msgstr "開始錄製(&C)" @@ -4779,7 +4838,7 @@ msgstr "狀態" msgid "State Saves" msgstr "即時存檔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" msgstr "" @@ -4788,7 +4847,7 @@ msgid "Stick" msgstr "搖桿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:462 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171 msgid "Stop" msgstr "停止" @@ -4814,16 +4873,16 @@ msgstr "Strum" msgid "Subtract" msgstr "減少" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format msgid "Successfully exported file to %s" msgstr "成功匯出檔案至 %s" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89 msgid "Successfully imported save files" msgstr "成功匯入存檔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" msgstr "" @@ -4831,18 +4890,18 @@ msgstr "" msgid "Swing" msgstr "揮舞" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" msgstr "系統語系:" @@ -4871,13 +4930,13 @@ msgstr "Table 左" msgid "Table Right" msgstr "Table 右" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:464 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" msgstr "截取畫面" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" msgstr "" @@ -4897,7 +4956,7 @@ msgstr "" msgid "Texture Format Overlay" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:220 +#: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" msgstr "WAD 已經安裝成功" @@ -4909,13 +4968,13 @@ msgstr "位址無效" msgid "The checksum was successfully fixed" msgstr "校驗已經被成功修復" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1235 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "The chosen directory is already in the list" msgstr "選取的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219 #, c-format msgid "" "The file %s already exists.\n" @@ -4965,29 +5024,29 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "您嘗試複製的檔案有一個無效的檔案大小" -#: Source/Core/DolphinWX/Src/Main.cpp:419 +#: Source/Core/DolphinWX/Src/Main.cpp:431 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "選擇的語系不支援您的系統。將使用系統預設值。" -#: Source/Core/Core/Src/NetPlayClient.cpp:107 +#: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "伺服器與客戶端的網路對戰版本不兼容!" -#: Source/Core/Core/Src/NetPlayClient.cpp:104 +#: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" msgstr "伺服器已滿!" -#: Source/Core/Core/Src/NetPlayClient.cpp:110 +#: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" msgstr "伺服器回應:遊戲目前正在執行!" -#: Source/Core/Core/Src/NetPlayClient.cpp:113 +#: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" msgstr "伺服器發生了一個未知錯誤訊息!" -#: Source/Core/Core/Src/CoreParameter.cpp:113 +#: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" msgstr "指定的檔案 \"%s\" 不存在" @@ -4996,17 +5055,17 @@ msgstr "指定的檔案 \"%s\" 不存在" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "必須有 00000001/00000002 的標簽。這個 NAND dump 可能是不完整的。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5020,7 +5079,7 @@ msgid "" "Replay itself." msgstr "Action replay 模擬器不支援被 Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "這可能會使 Wii Menu 和部分遊戲降速。" @@ -5036,7 +5095,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " @@ -5044,7 +5103,7 @@ msgid "" "noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5096,7 +5155,7 @@ msgstr "全選/全部取消" msgid "Toggle Fog" msgstr "全選/全部取消" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:463 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" msgstr "切換全螢幕" @@ -5106,11 +5165,11 @@ msgid "Toggle IR" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -5134,7 +5193,7 @@ msgstr "" "嘗試讀取從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" msgstr "Turkish" @@ -5182,7 +5241,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:428 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format msgid "Undefined %i" msgstr "未指定 %i" @@ -5219,12 +5278,12 @@ msgstr "" msgid "Unknown entry type %i in SYSCONF (%s@%x)!" msgstr "未知的登錄類型 %i 於 SYSCONF (%s@%x)!" -#: Source/Core/Core/Src/NetPlayClient.cpp:312 +#: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" msgstr "接收到帶有未知 id 的錯誤訊息:%d" -#: Source/Core/Core/Src/NetPlayServer.cpp:478 +#: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家!" @@ -5243,7 +5302,7 @@ msgstr "更新" msgid "Upright Wiimote" msgstr "直握 Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:765 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 模式 (PAL60)" @@ -5255,7 +5314,7 @@ msgstr "" msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" msgstr "顯示錯誤提示" @@ -5275,6 +5334,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +msgid "" +"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no " +"known problems on supported GPUs, but it will cause severe stability and " +"graphical issues otherwise.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" @@ -5292,7 +5360,7 @@ msgstr "工具" msgid "V-Sync" msgstr "垂直同步" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 #, fuzzy msgid "VBeam Speed Hack" msgstr "MMU 速度修正" @@ -5317,7 +5385,7 @@ msgstr "事件" msgid "Vertex Streaming Hack" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" msgstr "影像" @@ -5325,17 +5393,17 @@ msgstr "影像" msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 msgid "Volume" msgstr "音量" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installation 失敗:錯誤於建立 %s" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" msgstr "" @@ -5365,7 +5433,7 @@ msgstr "警告 - ELF 啟動於錯誤的主機模式!" msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - ISO 啟動於錯誤的主機模式!" -#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" @@ -5389,7 +5457,7 @@ msgstr "" "以及在您記憶卡中 相同檔案名的檔案\n" "要繼續嗎?" -#: Source/Core/Core/Src/Movie.cpp:823 +#: Source/Core/Core/Src/Movie.cpp:837 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5397,7 +5465,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:840 +#: Source/Core/Core/Src/Movie.cpp:854 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5405,7 +5473,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:850 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5441,23 +5509,19 @@ msgstr "寬螢幕修正" msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:832 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -msgid "Wii Save Import" -msgstr "匯入 Wii 存檔" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1317 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5466,7 +5530,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD:無法從檔案中讀取" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" msgstr "Wiimote" @@ -5475,7 +5539,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:659 +#: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5483,7 +5547,7 @@ msgstr "Wiimote 已連接" msgid "Wiimote Motor" msgstr "Wiimote 馬達" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:470 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" msgstr "Wiimote 設定" @@ -5507,14 +5571,14 @@ msgstr "視窗 右" msgid "Word Wrap" msgstr "自動換行" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1372 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Working..." msgstr "執行中..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:354 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" msgstr "" @@ -5574,7 +5638,7 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "您不能關閉有頁面的面板。" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:240 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" msgstr "您必須選擇一個遊戲!!" @@ -5590,7 +5654,7 @@ msgstr "您必須輸入一個有效的十進制,十六進制或八進制的數 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔名稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:924 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." msgstr "您必須重新啟動 Dolphin 使更改生效。" @@ -5601,7 +5665,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:169 +#: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" @@ -5620,7 +5684,7 @@ msgstr "" "應該是 0x%04x (而非 0x%04llx)\n" "是否要建立新的檔案?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" msgstr "ZTP 修正" @@ -5670,7 +5734,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" msgstr "程式讀取器 (.img)" @@ -5683,7 +5747,17 @@ msgstr "iCacheJIT:從 %x 中讀取 Opcode 。請回報。" msgid "s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155 +#: Source/Core/Core/Src/x64MemTools.cpp:242 +#, c-format +msgid "unknown flavor %d (expected %d)" +msgstr "" + +#: Source/Core/Core/Src/x64MemTools.cpp:236 +#, fuzzy +msgid "unknown message received" +msgstr "接收到帶有未知 id 的錯誤訊息:%d" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程式執行時!" @@ -5702,9 +5776,19 @@ msgstr "| 或" #~ msgid "Accurate VBeam emulation" #~ msgstr "精確的 VBeam 模擬" +#~ msgid "" +#~ "Could not set pads. The player left or the game is currently running!\n" +#~ "(setting pads while the game is running is not yet supported)" +#~ msgstr "" +#~ "無法設置控制器。有玩家存留或者遊戲正在執行!\n" +#~ "(還不支援在遊戲執行時設定控制器)" + #~ msgid "Enable Hotkeys" #~ msgstr "開啟快捷鍵" +#~ msgid "Export failed, try again?" +#~ msgstr "匯出失敗,要重試嗎?" + #~ msgid "Failed to Listen!!" #~ msgstr "監聽失敗!!" @@ -5718,11 +5802,23 @@ msgstr "| 或" #~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" #~ msgstr "開啟記憶體管理單元,某些遊戲需要。(ON = 兼容、OFF = 快速)" +#~ msgid "Import failed, try again?" +#~ msgstr "匯入失敗,是否重試?" + +#~ msgid "In-Game" +#~ msgstr "遊戲中" + #~ msgid "Last Overwritten State" #~ msgstr "最後覆蓋的進度" #~ msgid "Last Saved State" #~ msgstr "最後使用的進度" +#~ msgid "Local" +#~ msgstr "本地" + #~ msgid "Set" #~ msgstr "設定" + +#~ msgid "Wii Save Import" +#~ msgstr "匯入 Wii 存檔" From 380b780dd195498bc6d3e614256dd8f0f70143a8 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 9 Sep 2013 18:44:21 +0200 Subject: [PATCH 111/267] Leak an object when quitting Dolphin to try and fix issue 6546 --- Source/Core/DolphinWX/Src/Frame.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 9c76cd5420..8a4c7d5c1d 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -389,8 +389,6 @@ CFrame::~CFrame() #endif ClosePages(); - - delete m_Mgr; } bool CFrame::RendererIsFullscreen() From e29de302a61137328fc89a3c3e662ef84ce928c5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 9 Sep 2013 18:49:10 +0200 Subject: [PATCH 112/267] Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose --- Source/Core/DolphinWX/Src/Frame.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 8a4c7d5c1d..321cd5fda0 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -387,8 +387,6 @@ CFrame::~CFrame() #if defined(HAVE_XRANDR) && HAVE_XRANDR delete m_XRRConfig; #endif - - ClosePages(); } bool CFrame::RendererIsFullscreen() @@ -474,6 +472,7 @@ void CFrame::OnClose(wxCloseEvent& event) m_LogWindow = NULL; } + ClosePages(); // Uninit m_Mgr->UnInit(); From cd7f787627f3cb89ac285619b83c803fe9c8f64c Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 9 Sep 2013 23:21:56 +0200 Subject: [PATCH 113/267] ogl: also restore logic op for util shaders --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 1839bca68a..5c4073fb0f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1633,6 +1633,9 @@ void Renderer::ResetAPIState() glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE); glDisable(GL_BLEND); +#ifndef USE_GLES3 + glDisable(GL_COLOR_LOGIC_OP); +#endif glDepthMask(GL_FALSE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } @@ -1646,6 +1649,7 @@ void Renderer::RestoreAPIState() SetColorMask(); SetDepthMode(); SetBlendMode(true); + SetLogicOpMode(); VertexShaderManager::SetViewportChanged(); #ifndef USE_GLES3 From 70130aeac35b4a8ee65fe3d0aa2d7a535e9bcde2 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 9 Sep 2013 16:48:14 -0500 Subject: [PATCH 114/267] Remove the REQUIRED option from the cmake pkg-config check for GLEW so that cmake doesn't fail if a shared library is not found, and falls back to the version in the externals. --- CMakeTests/FindGLEW.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeTests/FindGLEW.cmake b/CMakeTests/FindGLEW.cmake index cb1e09021a..4861292558 100644 --- a/CMakeTests/FindGLEW.cmake +++ b/CMakeTests/FindGLEW.cmake @@ -20,7 +20,7 @@ macro(test_glew) endmacro() if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND) - pkg_search_module(GLEW REQUIRED glew>=1.8) + pkg_search_module(GLEW glew>=1.8) endif() if(GLEW_FOUND) From a3ef35a1bf00b5a0dedc41e7670ba58d48cd8291 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 9 Sep 2013 22:38:09 -0400 Subject: [PATCH 115/267] [Android] Fix a bug where the video backend would not load correctly. --- .../src/org/dolphinemu/dolphinemu/settings/UserPreferences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index 08d6ee2021..b29a91a63c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -37,7 +37,7 @@ public final class UserPreferences editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3")); editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True")); - editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer")); + editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer")); editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True")); editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True")); From 4add0f55e046c4fd2943e96da127b4940543ac84 Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 9 Sep 2013 23:33:42 -0400 Subject: [PATCH 116/267] Fix SDIO HLE writing garbage to memory. When servicing a write-register request, it wrote the contents to the register offset plus 0x8d070000, which corresponds to the actual hardware registers, presumably in case the application wanted to read them directly rather than with a read-register request. WriteToHardware doesn't handle cached writes to registers, so it decided the address was RAM, applied RAM_MASK, and happily wrote the register contents to 0x81070000, causing random corruption. Since the PPC does not normally have access to those registers, there is no reason to be doing this in the first place. Use a member to store these values instead. (Also add a proper DoState.) --- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp | 46 ++++++++++++++++--- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h | 10 ++-- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp index 68b38633ac..c422bd7960 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp @@ -22,6 +22,19 @@ CWII_IPC_HLE_Device_sdio_slot0::CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, co , m_Card(NULL) {} +void CWII_IPC_HLE_Device_sdio_slot0::DoState(PointerWrap& p) +{ + DoStateShared(p); + if (p.GetMode() == PointerWrap::MODE_READ) + { + OpenInternal(); + } + p.Do(m_Status); + p.Do(m_BlockLength); + p.Do(m_BusWidth); + p.Do(m_Registers); +} + void CWII_IPC_HLE_Device_sdio_slot0::EventNotify() { if ((SConfig::GetInstance().m_WiiSDCard && m_event.type == EVENT_INSERT) || @@ -34,10 +47,8 @@ void CWII_IPC_HLE_Device_sdio_slot0::EventNotify() } } -bool CWII_IPC_HLE_Device_sdio_slot0::Open(u32 _CommandAddress, u32 _Mode) +void CWII_IPC_HLE_Device_sdio_slot0::OpenInternal() { - INFO_LOG(WII_IPC_SD, "Open"); - const std::string filename = File::GetUserPath(D_WIIUSER_IDX) + "sd.raw"; m_Card.Open(filename, "r+b"); if (!m_Card) @@ -53,8 +64,16 @@ bool CWII_IPC_HLE_Device_sdio_slot0::Open(u32 _CommandAddress, u32 _Mode) ERROR_LOG(WII_IPC_SD, "Could not open SD Card image or create a new one, are you running from a read-only directory?"); } } +} + +bool CWII_IPC_HLE_Device_sdio_slot0::Open(u32 _CommandAddress, u32 _Mode) +{ + INFO_LOG(WII_IPC_SD, "Open"); + + OpenInternal(); Memory::Write_U32(GetDeviceID(), _CommandAddress + 0x4); + memset(m_Registers, 0, sizeof(m_Registers)); m_Active = true; return true; } @@ -96,20 +115,26 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress) DEBUG_LOG(WII_IPC_SD, "IOCTL_WRITEHCR 0x%08x - 0x%08x", reg, val); + if (reg >= 0x200) + { + DEBUG_LOG(WII_IPC_SD, "IOCTL_WRITEHCR out of range"); + break; + } + if ((reg == HCR_CLOCKCONTROL) && (val & 1)) { // Clock is set to oscillate, enable bit 1 to say it's stable - Memory::Write_U32(val | 2, SDIO_BASE + reg); + m_Registers[reg] = val | 2; } else if ((reg == HCR_SOFTWARERESET) && val) { // When a reset is specified, the register gets cleared - Memory::Write_U32(0, SDIO_BASE + reg); + m_Registers[reg] = 0; } else { // Default to just storing the new value - Memory::Write_U32(val, SDIO_BASE + reg); + m_Registers[reg] = val; } } break; @@ -117,9 +142,16 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress) case IOCTL_READHCR: { u32 reg = Memory::Read_U32(BufferIn); - u32 val = Memory::Read_U32(SDIO_BASE + reg); + if (reg >= 0x200) + { + DEBUG_LOG(WII_IPC_SD, "IOCTL_READHCR out of range"); + break; + } + + u32 val = m_Registers[reg]; DEBUG_LOG(WII_IPC_SD, "IOCTL_READHCR 0x%08x - 0x%08x", reg, val); + // Just reading the register Memory::Write_U32(val, BufferOut); } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h index 74ffe13410..e7a323228d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h @@ -15,6 +15,8 @@ public: CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName); + virtual void DoState(PointerWrap& p); + bool Open(u32 _CommandAddress, u32 _Mode); bool Close(u32 _CommandAddress, bool _bForce); bool IOCtl(u32 _CommandAddress); @@ -24,11 +26,6 @@ public: private: - enum - { - SDIO_BASE = 0x8d070000, - }; - // SD Host Controller Registers enum { @@ -119,11 +116,14 @@ private: u32 m_BlockLength; u32 m_BusWidth; + u32 m_Registers[0x200/4]; + File::IOFile m_Card; u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize, u32 BufferIn2, u32 BufferInSize2, u32 _BufferOut, u32 BufferOutSize); + void OpenInternal(); }; #endif From 2d492bdc4f062551ebc8acc54f53169d4fb7d5d5 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 10 Sep 2013 01:04:29 -0700 Subject: [PATCH 117/267] Revert "Leak an object when quitting Dolphin to try and fix issue 6546" This reverts commit 380b780dd195498bc6d3e614256dd8f0f70143a8. Revert "Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose" This reverts commit e29de302a61137328fc89a3c3e662ef84ce928c5. --- Source/Core/DolphinWX/Src/Frame.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 321cd5fda0..9c76cd5420 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -387,6 +387,10 @@ CFrame::~CFrame() #if defined(HAVE_XRANDR) && HAVE_XRANDR delete m_XRRConfig; #endif + + ClosePages(); + + delete m_Mgr; } bool CFrame::RendererIsFullscreen() @@ -472,7 +476,6 @@ void CFrame::OnClose(wxCloseEvent& event) m_LogWindow = NULL; } - ClosePages(); // Uninit m_Mgr->UnInit(); From 484130049da613470add1fd6902891ea093854f5 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 10 Sep 2013 03:14:21 -0700 Subject: [PATCH 118/267] On windows, ignore WM_QUERYENDSESSION and close upon WM_ENDSESSION. The messages can come through CFrame::MSWWindowProc and the wxApp implementation, so make sure to catch both. Fixes issue 6546. --- Source/Core/DolphinWX/Src/Frame.cpp | 15 +++++++++++++++ Source/Core/DolphinWX/Src/Main.cpp | 11 +++++++++++ Source/Core/DolphinWX/Src/Main.h | 1 + 3 files changed, 27 insertions(+) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 9c76cd5420..b54438b905 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -539,9 +539,24 @@ void CFrame::OnResize(wxSizeEvent& event) WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { if (WM_SYSCOMMAND == nMsg && (SC_SCREENSAVE == wParam || SC_MONITORPOWER == wParam)) + { return 0; + } + else if (nMsg == WM_QUERYENDSESSION) + { + // Indicate that the application will be able to close + return 1; + } + else if (nMsg == WM_ENDSESSION) + { + // Actually trigger the close now + Close(true); + return 0; + } else + { return wxFrame::MSWWindowProc(nMsg, wParam, lParam); + } } #endif diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index f904ceb0f6..30593ac637 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -71,6 +71,8 @@ IMPLEMENT_APP(DolphinApp) BEGIN_EVENT_TABLE(DolphinApp, wxApp) EVT_TIMER(wxID_ANY, DolphinApp::AfterInit) + EVT_QUERY_END_SESSION(DolphinApp::OnEndSession) + EVT_END_SESSION(DolphinApp::OnEndSession) END_EVENT_TABLE() #include @@ -433,6 +435,15 @@ void DolphinApp::InitLanguageSupport() } } +void DolphinApp::OnEndSession(wxCloseEvent& event) +{ + // Close if we've recieved wxEVT_END_SESSION (ignore wxEVT_QUERY_END_SESSION) + if (!event.CanVeto()) + { + main_frame->Close(true); + } +} + int DolphinApp::OnExit() { WiimoteReal::Shutdown(); diff --git a/Source/Core/DolphinWX/Src/Main.h b/Source/Core/DolphinWX/Src/Main.h index d3e1493e58..08d67e4dda 100644 --- a/Source/Core/DolphinWX/Src/Main.h +++ b/Source/Core/DolphinWX/Src/Main.h @@ -33,6 +33,7 @@ private: wxLocale *m_locale; void AfterInit(wxTimerEvent& WXUNUSED(event)); + void OnEndSession(wxCloseEvent& event); }; DECLARE_APP(DolphinApp); From ce5f80b151d2343879cea0168ff70fee17172b6d Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 10 Sep 2013 08:32:11 -0400 Subject: [PATCH 119/267] [Android] Give the exceptions in compareTo implementations in GameListItem and FolderBrowserItem some messages. If the exceptions ever actually get thrown, at least you're given a reason as to why the exception was thrown now. Also changed the exception type to NullPointerException. IllegalArgumentException is intended to be used for validating the parameters in constructors/methods. --- .../dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java | 2 +- .../src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java index e081c061fe..c2b2723664 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java @@ -104,6 +104,6 @@ public final class FolderBrowserItem implements Comparable if(name != null) return name.toLowerCase().compareTo(other.getName().toLowerCase()); else - throw new IllegalArgumentException(); + throw new NullPointerException("The name of this FolderBrowserItem is null"); } } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java index f65740dec3..67d61256d4 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java @@ -117,7 +117,7 @@ public final class GameListItem implements Comparable if (name != null) return name.toLowerCase().compareTo(o.getName().toLowerCase()); else - throw new IllegalArgumentException(); + throw new NullPointerException("The name of this GameListItem is null"); } } From 8ceb72612aa0f650fa0a7de6bb4beb69935c29f2 Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 10 Sep 2013 09:29:05 -0400 Subject: [PATCH 120/267] [Android] Kick the targetSdkVersion in the AndroidManifest XML file to 18. Since this app basically works on 4.x.x, we don't need to make compatibility modes kick in for anything above 4.0.0. Also very minor cleanup to the XML. --- Source/Android/AndroidManifest.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml index 70bc5c1275..c80638bb38 100644 --- a/Source/Android/AndroidManifest.xml +++ b/Source/Android/AndroidManifest.xml @@ -7,10 +7,10 @@ + android:targetSdkVersion="18" /> + + - - @@ -40,8 +40,8 @@ - + android:label="@string/settings" /> + From 84db868187590fc78e8685dc0def88749618b08d Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 10 Sep 2013 11:21:13 -0400 Subject: [PATCH 121/267] [Android] Android uppercases the name of the tabs in the settings by default. So we don't have to call ".toUpperCase" in the string returns in getPageTitle(). --- .../org/dolphinemu/dolphinemu/settings/PrefsActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java index dc75de2550..ce57b0d0ff 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java @@ -135,13 +135,13 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen switch(position) { case 0: - return getString(R.string.cpu_settings).toUpperCase(); + return getString(R.string.cpu_settings); case 1: - return getString(R.string.input_settings).toUpperCase(); + return getString(R.string.input_settings); case 2: - return getString(R.string.video_settings).toUpperCase(); + return getString(R.string.video_settings); default: // Should never happen. return null; From 56686666d6c744560b78c8c2320b102cad27293e Mon Sep 17 00:00:00 2001 From: comex Date: Tue, 10 Sep 2013 16:47:11 -0400 Subject: [PATCH 122/267] Fix ES_DECRYPT. ES_DECRYPT is usually called with the in IV parameter equal to the out IV parameter. Dolphin was preemptively zeroing out the out buffer, causing it to read zeroes for the IV. (Also be more correct when those parameters *aren't* equal.) Dolphin now has the dubious honor of having an exploit (smashstack) work in it. It crashes in Project M, though. --- .../Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 87cd940613..754b930053 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -247,10 +247,23 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) // Prepare the out buffer(s) with zeroes as a safety precaution // to avoid returning bad values + // XXX: is this still necessary? for (u32 i = 0; i < Buffer.NumberPayloadBuffer; i++) { - Memory::Memset(Buffer.PayloadBuffer[i].m_Address, 0, - Buffer.PayloadBuffer[i].m_Size); + u32 j; + for (j = 0; j < Buffer.NumberInBuffer; j++) + { + if (Buffer.InBuffer[j].m_Address == Buffer.PayloadBuffer[i].m_Address) + { + // The out buffer is the same as one of the in buffers. Don't zero it. + break; + } + } + if (j == Buffer.NumberInBuffer) + { + Memory::Memset(Buffer.PayloadBuffer[i].m_Address, 0, + Buffer.PayloadBuffer[i].m_Size); + } } switch (Buffer.Parameter) @@ -825,11 +838,13 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) u8* IV = Memory::GetPointer(Buffer.InBuffer[1].m_Address); u8* source = Memory::GetPointer(Buffer.InBuffer[2].m_Address); u32 size = Buffer.InBuffer[2].m_Size; + u8* newIV = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address); u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address); AES_KEY AESKey; AES_set_encrypt_key(keyTable[keyIndex], 128, &AESKey); - AES_cbc_encrypt(source, destination, size, &AESKey, IV, AES_ENCRYPT); + memcpy(newIV, IV, 16); + AES_cbc_encrypt(source, destination, size, &AESKey, newIV, AES_ENCRYPT); _dbg_assert_msg_(WII_IPC_ES, keyIndex == 6, "IOCTL_ES_ENCRYPT: Key type is not SD, data will be crap"); } @@ -841,11 +856,13 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) u8* IV = Memory::GetPointer(Buffer.InBuffer[1].m_Address); u8* source = Memory::GetPointer(Buffer.InBuffer[2].m_Address); u32 size = Buffer.InBuffer[2].m_Size; + u8* newIV = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address); u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address); AES_KEY AESKey; AES_set_decrypt_key(keyTable[keyIndex], 128, &AESKey); - AES_cbc_encrypt(source, destination, size, &AESKey, IV, AES_DECRYPT); + memcpy(newIV, IV, 16); + AES_cbc_encrypt(source, destination, size, &AESKey, newIV, AES_DECRYPT); _dbg_assert_msg_(WII_IPC_ES, keyIndex == 6, "IOCTL_ES_DECRYPT: Key type is not SD, data will be crap"); } From 2b10142b4f736d22f52304d5cce14b5f3df6b95e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 10 Sep 2013 22:34:59 -0400 Subject: [PATCH 123/267] Remove a bunch of old HLE junk This hasn't been used since 2008 --- Source/Core/Core/Src/HLE/HLE.cpp | 64 ++---- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 293 -------------------------- Source/Core/Core/Src/HLE/HLE_Misc.h | 23 -- 3 files changed, 13 insertions(+), 367 deletions(-) diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index e757fdde9a..6469359a31 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -42,57 +42,7 @@ static const SPatch OSPatches[] = { { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - // speedup - //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ "memcpy", HLE_Misc::gc_memcpy, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, - //{ "memcmp", HLE_Misc::gc_memcmp, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, - //{ "memset", HLE_Misc::gc_memset, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, - //{ "memmove", HLE_Misc::gc_memmove, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, - - //{ "__div2i", HLE_Misc::div2i, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? - //{ "__div2u", HLE_Misc::div2u, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? - - //{ "DCFlushRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ "DCInvalidateRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ "DCZeroRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - - // debug out is very nice ;) - - { "OSReport", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - { "DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - { "WUD_DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - { "OSPanic", HLE_OS::HLE_OSPanic, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - { "vprintf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - { "printf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - { "puts", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // gcc-optimized printf? - { "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used for early init things (normally) - { "___blank", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - { "__write_console", HLE_OS::HLE_write_console, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used by sysmenu (+more?) - - // wii only - //{ "__OSInitAudioSystem", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - - // Super Monkey Ball - no longer needed. - //{ ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".evil_normalize", HLE_Misc::SMB_EvilNormalize, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".evil_vec_setlength", HLE_Misc::SMB_evil_vec_setlength, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".evil_vec_something", HLE_Misc::FZero_evil_vec_normalize, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, { "PanicAlert", HLE_Misc::HLEPanicAlert, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, - //{ ".sqrt_internal_needs_cr1", HLE_Misc::SMB_sqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".atan2", HLE_Misc::SMB_atan2HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".sqrt_fz", HLE_Misc::FZ_sqrtHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - - // F-zero still isn't working correctly, but these aren't really helping. - - //{ ".sqrt_internal_fz", HLE_Misc::FZ_sqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".rsqrt_internal_fz", HLE_Misc::FZ_rsqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - - //{ ".kill_infinites", HLE_Misc::FZero_kill_infinites, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - // special - // { "GXPeekZ", HLE_Misc::GXPeekZHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - // { "GXPeekARGB", HLE_Misc::GXPeekARGBHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Name doesn't matter, installed in CBoot::BootUp() { "HBReload", HLE_Misc::HBReload, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, @@ -101,11 +51,23 @@ static const SPatch OSPatches[] = { "__OSBootDol", HLE_Misc::OSBootDol, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, { "OSGetResetCode", HLE_Misc::OSGetResetCode, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + // Debug/OS Support + { "OSPanic", HLE_OS::HLE_OSPanic, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + + { "OSReport", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "WUD_DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "vprintf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "printf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "puts", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // gcc-optimized printf? + { "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used for early init things (normally) + { "___blank", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "__write_console", HLE_OS::HLE_write_console, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used by sysmenu (+more?) }; static const SPatch OSBreakPoints[] = { - { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, + { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, }; void Patch(u32 addr, const char *hle_func_name) diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index c8323ca6c4..0b5db4f17f 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -27,21 +27,6 @@ namespace HLE_Misc std::string args; u32 argsPtr; -u32 bootType; - -// Helper to quickly read the floating point value at a memory location. -inline float F(u32 addr) -{ - u32 mem = Memory::ReadFast32(addr); - return *((float*)&mem); -} - -// Helper to quickly write a floating point value to a memory location. -inline void FW(u32 addr, float x) -{ - u32 data = *((u32*)&x); - Memory::WriteUnchecked_U32(data, addr); -} // If you just want to kill a function, one of the three following are usually appropriate. // According to the PPC ABI, the return value is always in r3. @@ -50,32 +35,6 @@ void UnimplementedFunction() NPC = LR; } -void UnimplementedFunctionTrue() -{ - GPR(3) = 1; - NPC = LR; -} - -void UnimplementedFunctionFalse() -{ - GPR(3) = 0; - NPC = LR; -} - -void GXPeekZ() -{ - // Just some fake Z value. - Memory::Write_U32(0xFFFFFF, GPR(5)); - NPC = LR; -} - -void GXPeekARGB() -{ - // Just some fake color value. - Memory::Write_U32(0xFFFFFFFF, GPR(5)); - NPC = LR; -} - // If you want a function to panic, you can rename it PanicAlert :p // Don't know if this is worth keeping. void HLEPanicAlert() @@ -84,200 +43,6 @@ void HLEPanicAlert() NPC = LR; } -// Computes the cosine of the angle between the two fvec3s pointed at by r3 and r4. -void SMB_EvilVecCosine() -{ - u32 r3 = GPR(3); - u32 r4 = GPR(4); - - float x1 = F(r3); - float y1 = F(r3 + 4); - float z1 = F(r3 + 8); - - float x2 = F(r4); - float y2 = F(r4 + 4); - float z2 = F(r4 + 8); - - float s1 = x1*x1 + y1*y1 + z1*z1; - float s2 = x2*x2 + y2*y2 + z2*z2; - - float dot = x1*x2 + y1*y2 + z1*z2; - - rPS0(1) = dot / sqrtf(s1 * s2); - NPC = LR; -} - -// Normalizes the vector pointed at by r3. -void SMB_EvilNormalize() -{ - u32 r3 = GPR(3); - float x = F(r3); - float y = F(r3 + 4); - float z = F(r3 + 8); - float len = x*x + y*y + z*z; - float inv_len; - if (len <= 0) - inv_len = 0; - else - inv_len = 1.0f / sqrtf(len); - x *= inv_len; - y *= inv_len; - z *= inv_len; - FW(r3, x); - FW(r3 + 4, y); - FW(r3 + 8, z); - NPC = LR; -} - -// Scales the vector pointed at by r3 to the length specified by f0. -// Writes results to vector pointed at by r4. -void SMB_evil_vec_setlength() -{ - u32 r3 = GPR(3); - u32 r4 = GPR(4); - float x = F(r3); - float y = F(r3 + 4); - float z = F(r3 + 8); - float inv_len = (float)(rPS0(0) / sqrt(x*x + y*y + z*z)); - x *= inv_len; - y *= inv_len; - z *= inv_len; - FW(r4, x); - FW(r4 + 4, y); - FW(r4 + 8, z); - NPC = LR; -} - -// Internal square root function in the crazy math lib. Acts a bit odd, just read it. It's not a bug :p -void SMB_sqrt_internal() -{ - double f = sqrt(rPS0(1)); - rPS0(0) = rPS0(1); - rPS1(0) = rPS0(1); - rPS0(1) = f; - rPS1(1) = f; - NPC = LR; -} - -// Internal inverse square root function in the crazy math lib. -void SMB_rsqrt_internal() -{ - double f = 1.0 / sqrt(rPS0(1)); - rPS0(1) = f; - rPS1(1) = f; - NPC = LR; -} - -void SMB_atan2() -{ - // in: f1 = x, f2 = y - // out: r3 = angle - double angle = atan2(rPS0(1), rPS0(2)); - int angle_fixpt = (int)(angle / 3.14159 * 32767); - if (angle_fixpt < -32767) angle_fixpt = -32767; - if (angle_fixpt > 32767) angle_fixpt = 32767; - GPR(3) = angle_fixpt; - NPC = LR; -} - - -// F-zero math lib range: 8006d044 - 8006f770 - -void FZero_kill_infinites() -{ - // TODO: Kill infinites in FPR(1) - - NPC = LR; -} - -void FZ_sqrt() { - u32 r3 = GPR(3); - double x = rPS0(0); - x = sqrt(x); - FW(r3, (float)x); - rPS0(0) = x; - NPC = LR; -} - -// Internal square root function in the crazy math lib. Acts a bit odd, just read it. It's not a bug :p -void FZ_sqrt_internal() -{ - double f = sqrt(rPS0(1)); - rPS0(0) = rPS0(1); - rPS1(0) = rPS0(1); - rPS0(1) = f; - rPS1(1) = f; - NPC = LR; -} - -// Internal inverse square root function in the crazy math lib. -void FZ_rsqrt_internal() -{ - double f = 1.0 / sqrt(rPS0(1)); - rPS0(1) = f; - rPS1(1) = f; - NPC = LR; -} - -void FZero_evil_vec_normalize() -{ - u32 r3 = GPR(3); - float x = F(r3); - float y = F(r3 + 4); - float z = F(r3 + 8); - float sq_len = x*x + y*y + z*z; - float inv_len = 1.0f / sqrtf(sq_len); - x *= inv_len; - y *= inv_len; - z *= inv_len; - FW(r3, x); - FW(r3 + 4, y); - FW(r3 + 8, z); - rPS0(1) = inv_len * sq_len; // len - rPS1(1) = inv_len * sq_len; // len - NPC = LR; - - /* -.evil_vec_something - -(f6, f7, f8) <- [r3] -f1 = f6 * f6 -f1 += f7 * f7 -f1 += f8 * f8 -f2 = mystery -f4 = f2 * f1 -f3 = f2 + f2 -f1 = 1/f0 - -f6 *= f1 -f7 *= f1 -f8 *= f1 - -8006d668: lis r5, 0xE000 -8006d684: lfs f2, 0x01A0 (r5) -8006d69c: fmr f0,f2 -8006d6a0: fmuls f4,f2,f1 -8006d6a4: fadds f3,f2,f2 -8006d6a8: frsqrte f1,f0,f1 -8006d6ac: fadds f3,f3,f2 -8006d6b0: fmuls f5,f1,f1 -8006d6b4: fnmsubs f5,f5,f4,f3 -8006d6b8: fmuls f1,f1,f5 -8006d6bc: fmuls f5,f1,f1 -8006d6c0: fnmsubs f5,f5,f4,f3 -8006d6c4: fmuls f1,f1,f5 -8006d6c8: fmuls f6,f6,f1 -8006d6cc: stfs f6, 0 (r3) -8006d6d0: fmuls f7,f7,f1 -8006d6d4: stfs f7, 0x0004 (r3) -8006d6d8: fmuls f8,f8,f1 -8006d6dc: stfs f8, 0x0008 (r3) -8006d6e0: fmuls f1,f1,f0 -8006d6e4: blr -*/ - NPC = LR; -} - void HBReload() { // There isn't much we can do. Just stop cleanly. @@ -403,62 +168,6 @@ u32 GetDolFileSize(std::string dol) return (u32)pFileSystem->GetFileSize(dolFile.c_str()); } -void gc_memmove() -{ - u32 dest = GPR(3); - u32 src = GPR(4); - u32 count = GPR(5); - memmove((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); - NPC = LR; -} - -void gc_memcpy() -{ - u32 dest = GPR(3); - u32 src = GPR(4); - u32 count = GPR(5); - memcpy((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); - NPC = LR; -} - -void gc_memset() -{ - u32 dest = GPR(3); - u32 ch = GPR(4); - u32 count = GPR(5); - memset((u8*)(Memory::base + dest), ch, count); - NPC = LR; -} - -void gc_memcmp() -{ - u32 dest = GPR(3); - u32 src = GPR(4); - u32 count = GPR(5); - GPR(3) = memcmp((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); - NPC = LR; -} - -void div2i() -{ - s64 num = (s64)(GPR(3)) << 32 | GPR(4); - s64 den = (s64)(GPR(5)) << 32 | GPR(6); - s64 quo = num / den; - GPR(3) = quo >> 32; - GPR(4) = quo & 0xffffffff; - NPC = LR; -} - -void div2u() -{ - u64 num = (u64)(GPR(3)) << 32 | GPR(4); - u64 den = (u64)(GPR(5)) << 32 | GPR(6); - u64 quo = num / den; - GPR(3) = quo >> 32; - GPR(4) = quo & 0xffffffff; - NPC = LR; -} - void OSGetResetCode() { u32 resetCode = Memory::Read_U32(0xCC003024); @@ -484,8 +193,6 @@ void OSBootDol() { if (GetIOSVersion() >= 30) { - bootType = GPR(4); - if ((GPR(4) >> 28) == 0x8) { u32 resetCode = GPR(30); diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h index e83805d23a..43924a4dcf 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.h +++ b/Source/Core/Core/Src/HLE/HLE_Misc.h @@ -7,34 +7,11 @@ namespace HLE_Misc { - void Pass(); void HLEPanicAlert(); void UnimplementedFunction(); - void UnimplementedFunctionTrue(); - void UnimplementedFunctionFalse(); - void GXPeekZ(); - void GXPeekARGB(); - void SMB_EvilVecCosine(); - void SMB_EvilNormalize(); - void SMB_sqrt_internal(); - void SMB_rsqrt_internal(); - void SMB_atan2(); - void SMB_evil_vec_setlength(); - void FZero_kill_infinites(); - void FZero_evil_vec_normalize(); - void FZ_sqrt(); - void FZ_sqrt_internal(); - void FZ_rsqrt_internal(); void HBReload(); void OSBootDol(); void OSGetResetCode(); - void memcpy(); - void memset(); - void memmove(); - void memcmp(); - void div2i(); - void div2u(); - void ExecuteDOL(u8* dolFile, u32 fileSize); } #endif From 3b0b5155e8335d3645ed5860682ecb1975d8c342 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 11 Sep 2013 11:02:09 +0200 Subject: [PATCH 124/267] ogl: change the default buffer upload on osx+nvidia --- Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp index 814a628d1c..89c3cd0f28 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp @@ -21,8 +21,12 @@ StreamBuffer::StreamBuffer(u32 type, size_t size, StreamType uploadType) { glGenBuffers(1, &m_buffer); - bool nvidia = !strcmp(g_ogl_config.gl_vendor, "NVIDIA Corporation"); + bool nvidia = false; +#ifndef __APPLE__ + // OSX also reports to be nvidia, but the driver is self written and doesn't act like the windows nvidia driver. + nvidia = !strcmp(g_ogl_config.gl_vendor, "NVIDIA Corporation"); +#endif if(m_uploadtype & STREAM_DETECT) { // TODO: move this to InitBackendInfo From 3fcdf5e25b9500f6bf9c46c8351d14569e8b3a85 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 11 Sep 2013 17:34:23 +0200 Subject: [PATCH 125/267] VideoCommon: use memcmp to compare shader uid --- Source/Core/VideoCommon/Src/ShaderGenCommon.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h index d2c8ec3710..31ec8d3e71 100644 --- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h @@ -88,26 +88,18 @@ public: bool operator == (const ShaderUid& obj) const { - return memcmp(this->values, obj.values, sizeof(values)) == 0; + return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) == 0; } bool operator != (const ShaderUid& obj) const { - return memcmp(this->values, obj.values, sizeof(values)) != 0; + return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) != 0; } // determines the storage order inside STL containers bool operator < (const ShaderUid& obj) const { - // TODO: Store last frame used and order by that? makes much more sense anyway... - for (unsigned int i = 0; i < data.NumValues(); ++i) - { - if (this->values[i] < obj.values[i]) - return true; - else if (this->values[i] > obj.values[i]) - return false; - } - return false; + return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) < 0; } template From ce49964dfea05f63e570891b4c75cde380a7e103 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 11 Sep 2013 17:48:04 -0500 Subject: [PATCH 126/267] Fix "modifier" button functionality et al. --- .../InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index d2982bba24..f2a0414bf6 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -196,7 +196,7 @@ bool ControllerInterface::UpdateOutput(const bool force) ControlState ControllerInterface::InputReference::State( const ControlState ignore ) { if (parsed_expression) - return parsed_expression->GetValue(); + return parsed_expression->GetValue() * range; else return 0.0f; } From fde3815d34dea16283aaf0fef8d19044cdd0398b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 11 Sep 2013 19:19:36 -0500 Subject: [PATCH 127/267] Replace ARRAYSIZE macro with another ugly macro. At least this will throw an error for a non-array and won't conflict with Windows macro names. --- Source/Core/Common/Src/CommonFuncs.h | 14 +++++++++++++- Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 10 +++++----- .../Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp | 18 +++++++++--------- .../Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp | 18 +++++++++--------- .../Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp | 14 +++++++------- .../Plugin_VideoOGL/Src/SamplerCache.cpp | 2 +- 7 files changed, 45 insertions(+), 33 deletions(-) diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 73320a3ac2..90ed639deb 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -12,6 +12,18 @@ #define SLEEP(x) usleep(x*1000) #endif +#include + +// TODO: make into function when type_traits and constexpr are available +template +struct ArraySizeImpl {}; + +template +struct ArraySizeImpl { static const std::size_t size = N; }; + +// Will fail to compile on a non-array: +#define ArraySize(x) ArraySizeImpl::size + template struct CompileTimeAssert; template<> struct CompileTimeAssert {}; @@ -52,7 +64,7 @@ _mm_shuffle_epi8(__m128i a, __m128i mask) #else #define Crash() {asm ("int $3");} #endif - #define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0])) + // GCC 4.8 defines all the rotate functions now // Small issue with GCC's lrotl/lrotr intrinsics is they are still 32bit while we require 64bit #ifndef _rotl diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp index 2f2d380366..792b045fd4 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp @@ -116,7 +116,7 @@ void GeckoSockServer::ClientThread() char data[128]; std::size_t got = 0; - if (client.Receive(&data[0], ARRAYSIZE(data), got) == sf::Socket::Disconnected) + if (client.Receive(&data[0], ArraySize(data), got) == sf::Socket::Disconnected) client_running = false; if (got != 0) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index ddd971c9c1..3bd01896a8 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -696,7 +696,7 @@ void ReadHeader() bongos = tmpHeader.bongos; bSyncGPU = tmpHeader.bSyncGPU; bNetPlay = tmpHeader.bNetPlay; - memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision)); + memcpy(revision, tmpHeader.revision, ArraySize(revision)); } else { @@ -1110,7 +1110,7 @@ void SaveRecording(const char *filename) header.bProgressive = bProgressive; header.bDSPHLE = bDSPHLE; header.bFastDiscSpeed = bFastDiscSpeed; - strncpy((char *)header.videoBackend, videoBackend.c_str(),ARRAYSIZE(header.videoBackend)); + strncpy((char *)header.videoBackend, videoBackend.c_str(),ArraySize(header.videoBackend)); header.CPUCore = iCPUCore; header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable; header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable; @@ -1123,11 +1123,11 @@ void SaveRecording(const char *filename) header.bClearSave = g_bClearSave; header.bSyncGPU = bSyncGPU; header.bNetPlay = bNetPlay; - strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); - strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); + strncpy((char *)header.discChange, g_discChange.c_str(),ArraySize(header.discChange)); + strncpy((char *)header.author, author.c_str(),ArraySize(header.author)); memcpy(header.md5,MD5,16); header.bongos = bongos; - memcpy(header.revision, revision, ARRAYSIZE(header.revision)); + memcpy(header.revision, revision, ArraySize(header.revision)); // TODO header.uniqueID = 0; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp index 3ba5e098ef..1bcd314291 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp @@ -9,7 +9,7 @@ PerfQuery::PerfQuery() : m_query_read_pos() , m_query_count() { - for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i) + for (int i = 0; i != ArraySize(m_query_buffer); ++i) { D3D11_QUERY_DESC qdesc = CD3D11_QUERY_DESC(D3D11_QUERY_OCCLUSION, 0); D3D::device->CreateQuery(&qdesc, &m_query_buffer[i].query); @@ -19,7 +19,7 @@ PerfQuery::PerfQuery() PerfQuery::~PerfQuery() { - for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i) + for (int i = 0; i != ArraySize(m_query_buffer); ++i) { // TODO: EndQuery? m_query_buffer[i].query->Release(); @@ -32,10 +32,10 @@ void PerfQuery::EnableQuery(PerfQueryGroup type) return; // Is this sane? - if (m_query_count > ARRAYSIZE(m_query_buffer) / 2) + if (m_query_count > ArraySize(m_query_buffer) / 2) WeakFlush(); - if (ARRAYSIZE(m_query_buffer) == m_query_count) + if (ArraySize(m_query_buffer) == m_query_count) { // TODO FlushOne(); @@ -45,7 +45,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type) // start query if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP) { - auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ARRAYSIZE(m_query_buffer)]; + auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ArraySize(m_query_buffer)]; D3D::context->Begin(entry.query); entry.query_type = type; @@ -62,7 +62,7 @@ void PerfQuery::DisableQuery(PerfQueryGroup type) // stop query if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP) { - auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + ARRAYSIZE(m_query_buffer)-1) % ARRAYSIZE(m_query_buffer)]; + auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + ArraySize(m_query_buffer)-1) % ArraySize(m_query_buffer)]; D3D::context->End(entry.query); } } @@ -70,7 +70,7 @@ void PerfQuery::DisableQuery(PerfQueryGroup type) void PerfQuery::ResetQuery() { m_query_count = 0; - std::fill_n(m_results, ARRAYSIZE(m_results), 0); + std::fill_n(m_results, ArraySize(m_results), 0); } u32 PerfQuery::GetQueryResult(PerfQueryType type) @@ -118,7 +118,7 @@ void PerfQuery::FlushOne() // NOTE: Reported pixel metrics should be referenced to native resolution m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight(); - m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer); + m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer); --m_query_count; } @@ -149,7 +149,7 @@ void PerfQuery::WeakFlush() // NOTE: Reported pixel metrics should be referenced to native resolution m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight(); - m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer); + m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer); --m_query_count; } else diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp index fafd06e901..3e6f058fdd 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp @@ -19,7 +19,7 @@ PerfQuery::~PerfQuery() void PerfQuery::CreateDeviceObjects() { - for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i) + for (int i = 0; i != ArraySize(m_query_buffer); ++i) { D3D::dev->CreateQuery(D3DQUERYTYPE_OCCLUSION, &m_query_buffer[i].query); } @@ -27,7 +27,7 @@ void PerfQuery::CreateDeviceObjects() } void PerfQuery::DestroyDeviceObjects() { - for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i) + for (int i = 0; i != ArraySize(m_query_buffer); ++i) { m_query_buffer[i].query->Release(); } @@ -38,10 +38,10 @@ void PerfQuery::EnableQuery(PerfQueryGroup type) if (!ShouldEmulate()) return; // Is this sane? - if (m_query_count > ARRAYSIZE(m_query_buffer) / 2) + if (m_query_count > ArraySize(m_query_buffer) / 2) WeakFlush(); - if (ARRAYSIZE(m_query_buffer) == m_query_count) + if (ArraySize(m_query_buffer) == m_query_count) { // TODO FlushOne(); @@ -51,7 +51,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type) // start query if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP) { - auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ARRAYSIZE(m_query_buffer)]; + auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ArraySize(m_query_buffer)]; entry.query->Issue(D3DISSUE_BEGIN); entry.query_type = type; ++m_query_count; @@ -65,7 +65,7 @@ void PerfQuery::DisableQuery(PerfQueryGroup type) // stop query if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP) { - auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + ARRAYSIZE(m_query_buffer)-1) % ARRAYSIZE(m_query_buffer)]; + auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + ArraySize(m_query_buffer)-1) % ArraySize(m_query_buffer)]; entry.query->Issue(D3DISSUE_END); } } @@ -73,7 +73,7 @@ void PerfQuery::DisableQuery(PerfQueryGroup type) void PerfQuery::ResetQuery() { m_query_count = 0; - std::fill_n(m_results, ARRAYSIZE(m_results), 0); + std::fill_n(m_results, ArraySize(m_results), 0); } u32 PerfQuery::GetQueryResult(PerfQueryType type) @@ -119,7 +119,7 @@ void PerfQuery::FlushOne() // NOTE: Reported pixel metrics should be referenced to native resolution m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight()); - m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer); + m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer); --m_query_count; } @@ -148,7 +148,7 @@ void PerfQuery::WeakFlush() // NOTE: Reported pixel metrics should be referenced to native resolution m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight()); - m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer); + m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer); --m_query_count; } else diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp index a1582c0c62..f981a105e0 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp @@ -9,7 +9,7 @@ PerfQuery::PerfQuery() : m_query_read_pos() , m_query_count() { - for (u32 i = 0; i != ARRAYSIZE(m_query_buffer); ++i) + for (u32 i = 0; i != ArraySize(m_query_buffer); ++i) glGenQueries(1, &m_query_buffer[i].query_id); ResetQuery(); @@ -17,7 +17,7 @@ PerfQuery::PerfQuery() PerfQuery::~PerfQuery() { - for (u32 i = 0; i != ARRAYSIZE(m_query_buffer); ++i) + for (u32 i = 0; i != ArraySize(m_query_buffer); ++i) glDeleteQueries(1, &m_query_buffer[i].query_id); } @@ -27,10 +27,10 @@ void PerfQuery::EnableQuery(PerfQueryGroup type) return; // Is this sane? - if (m_query_count > ARRAYSIZE(m_query_buffer) / 2) + if (m_query_count > ArraySize(m_query_buffer) / 2) WeakFlush(); - if (ARRAYSIZE(m_query_buffer) == m_query_count) + if (ArraySize(m_query_buffer) == m_query_count) { FlushOne(); //ERROR_LOG(VIDEO, "Flushed query buffer early!"); @@ -39,7 +39,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type) // start query if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP) { - auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ARRAYSIZE(m_query_buffer)]; + auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ArraySize(m_query_buffer)]; glBeginQuery(GL_SAMPLES_PASSED, entry.query_id); entry.query_type = type; @@ -81,7 +81,7 @@ void PerfQuery::FlushOne() // NOTE: Reported pixel metrics should be referenced to native resolution m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight(); - m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer); + m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer); --m_query_count; } @@ -121,7 +121,7 @@ void PerfQuery::WeakFlush() void PerfQuery::ResetQuery() { m_query_count = 0; - std::fill_n(m_results, ARRAYSIZE(m_results), 0); + std::fill_n(m_results, ArraySize(m_results), 0); } u32 PerfQuery::GetQueryResult(PerfQueryType type) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp index 8f986cd6c7..8e4722bde9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp @@ -89,7 +89,7 @@ void SamplerCache::SetParameters(GLuint sampler_id, const Params& params) auto& tm0 = params.tm0; auto& tm1 = params.tm1; - glSamplerParameteri(sampler_id, GL_TEXTURE_MIN_FILTER, min_filters[tm0.min_filter % ARRAYSIZE(min_filters)]); + glSamplerParameteri(sampler_id, GL_TEXTURE_MIN_FILTER, min_filters[tm0.min_filter % ArraySize(min_filters)]); glSamplerParameteri(sampler_id, GL_TEXTURE_MAG_FILTER, tm0.mag_filter ? GL_LINEAR : GL_NEAREST); glSamplerParameteri(sampler_id, GL_TEXTURE_WRAP_S, wrap_settings[tm0.wrap_s]); From b9c1af04ad7849cf2b94ae87fc4880ac92f0ce70 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 11 Sep 2013 20:58:47 -0400 Subject: [PATCH 128/267] Replace the one use of CompileTimeAssert with static_assert (already used elsewhere). --- Source/Core/Common/Src/CommonFuncs.h | 3 --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 90ed639deb..284302d70d 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -24,9 +24,6 @@ struct ArraySizeImpl { static const std::size_t size = N; }; // Will fail to compile on a non-array: #define ArraySize(x) ArraySizeImpl::size -template struct CompileTimeAssert; -template<> struct CompileTimeAssert {}; - #define b2(x) ( (x) | ( (x) >> 1) ) #define b4(x) ( b2(x) | ( b2(x) >> 2) ) #define b8(x) ( b4(x) | ( b4(x) >> 4) ) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp index a684bb0c02..9c3fedddb3 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp @@ -219,8 +219,7 @@ void PrintObject(const T &Obj) // If this miscompiles, adjust the size of // ZeldaVoicePB to 0x180 bytes (0xc0 shorts). - CompileTimeAssert ensure_zpb_size_correct; - (void)ensure_zpb_size_correct; + static_assert(sizeof(ZeldaVoicePB) == 0x180, "ZeldaVoicePB incorrectly defined."); ss << std::hex; for (size_t i = 0; i < sizeof(T); i++) From acbdcc8ea0d2c7f3f69aaeb1d9ee070799fd26e4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 11 Sep 2013 22:09:49 -0500 Subject: [PATCH 129/267] Use the POLARSSL_LIBRARY variable to set the link library. This fixes a possible linkage issue when multiple versions of the library are around. --- Source/Core/Core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 8989dcfcc5..d02f19556e 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -232,7 +232,7 @@ if(LIBUSB_FOUND) set(SRCS ${SRCS} Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp) endif(LIBUSB_FOUND) -set(LIBS ${LIBS} polarssl) +set(LIBS ${LIBS} ${POLARSSL_LIBRARY}) if(WIN32) set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp From d9dd0a7874f8190113ac10bf420aee85fd9f94e8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 11 Sep 2013 23:35:52 -0500 Subject: [PATCH 130/267] Fix building with polarssl from the externals. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73db7846fc..fcdeeca8fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -610,6 +610,7 @@ if(POLARSSL_FOUND AND POLARSSL_WORKS) include_directories(${POLARSSL_INCLUDE_DIR}) else() message("Using PolarSSL from Externals") + set(POLARSSL_LIBRARY polarssl) add_subdirectory(Externals/polarssl/) include_directories(Externals/polarssl/include) endif() From fa5499e0467b8e0730003328eab971c21f62b817 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 02:40:53 -0500 Subject: [PATCH 131/267] [ARM] Disable lmw when fastmem is disabled. --- .../Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 9 +++++++++ .../Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 8a12976680..8fcbcef894 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -134,6 +134,9 @@ void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset, void JitArm::stX(UGeckoInstruction inst) { + INSTRUCTION_START + JITDISABLE(bJITLoadStoreOff) + u32 a = inst.RA, b = inst.RB, s = inst.RS; s32 offset = inst.SIMM_16; u32 accessSize = 0; @@ -455,6 +458,12 @@ void JitArm::lXX(UGeckoInstruction inst) // We make the assumption that this pulls from main RAM at /all/ times void JitArm::lmw(UGeckoInstruction inst) { + INSTRUCTION_START + JITDISABLE(bJITLoadStoreOff) + if (!Core::g_CoreStartupParameter.bFastmem){ + Default(inst); return; + } + u32 a = inst.RA; ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index f3ab4f695b..5509687184 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -71,7 +71,6 @@ void JitArm::mfspr(UGeckoInstruction inst) JITDISABLE(bJITSystemRegistersOff) u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); - ARMReg RD = gpr.R(inst.RD); switch (iIndex) { case SPR_WPAR: @@ -81,6 +80,7 @@ void JitArm::mfspr(UGeckoInstruction inst) Default(inst); return; default: + ARMReg RD = gpr.R(inst.RD); LDR(RD, R9, PPCSTATE_OFF(spr) + iIndex * 4); break; } From 2c33bab1a634650dc80ce980da2d9755b076bdc0 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 10 Sep 2013 08:39:19 +0000 Subject: [PATCH 132/267] [ARM] lfsx implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../JitArm32/JitArm_LoadStoreFloating.cpp | 60 ++++++++++++++----- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 58c6cbda16..f39c7516e3 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -198,6 +198,7 @@ public: // Floating point loadStore void lfs(UGeckoInstruction _inst); + void lfsx(UGeckoInstruction _inst); void lfd(UGeckoInstruction _inst); void stfs(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index 2559c9f49e..e391e768fb 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -40,11 +40,8 @@ void JitArm::lfs(UGeckoInstruction inst) ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); - fpr.Flush(); - - LDR(rA, R9, PPCSTATE_OFF(Exceptions)); - CMP(rA, EXCEPTION_DSI); - FixupBranch DoNotLoad = B_CC(CC_EQ); + ARMReg v0 = fpr.R0(inst.FD); + ARMReg v1 = fpr.R1(inst.FD); if (inst.RA) { @@ -55,14 +52,15 @@ void JitArm::lfs(UGeckoInstruction inst) else MOVI2R(rB, (u32)inst.SIMM_16); - + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + MOVI2R(rA, (u32)&Memory::Read_F32); PUSH(4, R0, R1, R2, R3); MOV(R0, rB); BL(rA); - ARMReg v0 = fpr.R0(inst.FD); - ARMReg v1 = fpr.R1(inst.FD); #if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 VMOV(S0, R0); #endif @@ -75,6 +73,41 @@ void JitArm::lfs(UGeckoInstruction inst) SetJumpTarget(DoNotLoad); } +void JitArm::lfsx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStoreFloatingOff) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + ARMReg RB = gpr.R(inst.RB); + ARMReg v0 = fpr.R0(inst.FD); + ARMReg v1 = fpr.R1(inst.FD); + + if (inst.RA) + ADD(rB, RB, gpr.R(inst.RA)); + else + MOV(rB, RB); + + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + + MOVI2R(rA, (u32)&Memory::Read_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + + VMOV(S0, R0); + VCVT(v0, S0, 0); + VCVT(v1, S0, 0); + POP(4, R0, R1, R2, R3); + + gpr.Unlock(rA, rB); + SetJumpTarget(DoNotLoad); +} + void JitArm::lfd(UGeckoInstruction inst) { INSTRUCTION_START @@ -83,11 +116,7 @@ void JitArm::lfd(UGeckoInstruction inst) ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); - fpr.Flush(); - - LDR(rA, R9, PPCSTATE_OFF(Exceptions)); - CMP(rA, EXCEPTION_DSI); - FixupBranch DoNotLoad = B_CC(CC_EQ); + ARMReg v0 = fpr.R0(inst.FD); if (inst.RA) { @@ -98,13 +127,15 @@ void JitArm::lfd(UGeckoInstruction inst) else MOVI2R(rB, (u32)inst.SIMM_16); + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); MOVI2R(rA, (u32)&Memory::Read_F64); PUSH(4, R0, R1, R2, R3); MOV(R0, rB); BL(rA); - ARMReg v0 = fpr.R0(inst.FD); #if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1 VMOV(v0, R0); #else @@ -126,7 +157,6 @@ void JitArm::stfs(UGeckoInstruction inst) ARMReg rB = gpr.GetReg(); ARMReg v0 = fpr.R0(inst.FS); VCVT(S0, v0, 0); - fpr.Flush(); if (inst.RA) { diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 78e8e9d06b..fd2d53bd40 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -268,7 +268,7 @@ static GekkoOPTemplate table31[] = {725, &JitArm::Default}, //"stswi", OPTYPE_STORE, FL_EVIL}}, // fp load/store - {535, &JitArm::Default}, //"lfsx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, + {535, &JitArm::lfsx}, //"lfsx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, {567, &JitArm::Default}, //"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, {599, &JitArm::Default}, //"lfdx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, {631, &JitArm::Default}, //"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, From e1d510c2dc6707373814e01b3d50ec76ecafdf64 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 09:40:10 +0000 Subject: [PATCH 133/267] [ARM] Disables loadstores with update because they are broken. --- .../Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 8fcbcef894..aa265fcfb8 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -318,6 +318,7 @@ void JitArm::lXX(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITLoadStoreOff) + u32 a = inst.RA, b = inst.RB, d = inst.RD; s32 offset = inst.SIMM_16; u32 accessSize = 0; @@ -401,9 +402,16 @@ void JitArm::lXX(UGeckoInstruction inst) accessSize = 16; break; } + + if (update) + { + Default(inst); + return; + } // Check for exception before loading ARMReg rA = gpr.GetReg(false); + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); CMP(rA, EXCEPTION_DSI); FixupBranch DoNotLoad = B_CC(CC_EQ); @@ -422,9 +430,10 @@ void JitArm::lXX(UGeckoInstruction inst) } SetJumpTarget(DoNotLoad); - + // LWZ idle skipping if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && + inst.OPCD == 32 && (inst.hex & 0xFFFF0000) == 0x800D0000 && (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && From 749b62fcd9f673bec369469f6b8a153816d56176 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 09:55:55 +0000 Subject: [PATCH 134/267] [ARM] Fixes orcx implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index 672fd6edfd..f852563366 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -139,8 +139,7 @@ void JitArm::arith(UGeckoInstruction inst) bool carry = false; bool isUnsigned = false; bool shiftedImm = false; - // printf("inst %s has OPCD %d subop10 %d\n", PPCTables::GetInstructionName(inst), inst.OPCD, inst.SUBOP10); - + switch (inst.OPCD) { case 7: // mulli @@ -481,7 +480,7 @@ void JitArm::arith(UGeckoInstruction inst) RS = gpr.R(s); RB = gpr.R(b); MVN(rA, RB); - ANDS(RA, RS, rA); + ORRS(RA, RS, rA); gpr.Unlock(rA); } break; From 8882d27689b65c62e6edf7c63177db136d83fb79 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 10:17:27 +0000 Subject: [PATCH 135/267] [ARM] Fixes the ps_merge00 and ps_merge10 implementations. They both had the potential to overwrite the source registers in the moves. --- .../Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 8a0f09f463..b0f282ec40 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -234,8 +234,9 @@ void JitArm::ps_merge00(UGeckoInstruction inst) ARMReg vB0 = fpr.R0(b); ARMReg vD0 = fpr.R0(d, false); ARMReg vD1 = fpr.R1(d, false); - VMOV(vD0, vA0); + VMOV(vD1, vB0); + VMOV(vD0, vA0); } void JitArm::ps_merge01(UGeckoInstruction inst) @@ -268,8 +269,13 @@ void JitArm::ps_merge10(UGeckoInstruction inst) ARMReg vB0 = fpr.R0(b); ARMReg vD0 = fpr.R0(d, false); ARMReg vD1 = fpr.R1(d, false); + ARMReg V0 = fpr.GetReg(); + + VMOV(V0, vB0); VMOV(vD0, vA1); - VMOV(vD1, vB0); + VMOV(vD1, V0); + + fpr.Unlock(V0); } void JitArm::ps_merge11(UGeckoInstruction inst) From aa8f0c2ca4afc6effab6663a5f560438f761cc6b Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 10:30:52 +0000 Subject: [PATCH 136/267] [ARM] Fixes ps_madd implementation. --- .../Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index b0f282ec40..019e0563e6 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -53,8 +53,6 @@ void JitArm::ps_madd(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(bJITPairedOff) - Default(inst); return; - u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; if (inst.Rc) { @@ -72,11 +70,11 @@ void JitArm::ps_madd(UGeckoInstruction inst) ARMReg V0 = fpr.GetReg(); ARMReg V1 = fpr.GetReg(); - VMOV(V0, vC0); - VMOV(V1, vC1); + VMOV(V0, vB0); + VMOV(V1, vB1); - VMLA(V0, vA0, vB0); - VMLA(V1, vA1, vB1); + VMLA(V0, vA0, vC0); + VMLA(V1, vA1, vC1); VMOV(vD0, V0); VMOV(vD1, V1); From c1ddeacc9d090ac2c535a6044ac541a8087cfe8b Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 10:31:29 +0000 Subject: [PATCH 137/267] [ARM] Removes extraneous fpr.Flush --- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 36ba7054e5..e1877b608c 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -146,7 +146,6 @@ void JitArm::fmulsx(UGeckoInstruction inst) VMUL(vD0, vA, vC); VMOV(vD1, vD0); - fpr.Flush(); // Shouldn't be needed. Missing a flush somewhere if (inst.Rc) Helper_UpdateCR1(vD0); } void JitArm::fmulx(UGeckoInstruction inst) From 44066326ff3b0ad4aa691d13cd6882fa481fb2bc Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 18:10:16 +0200 Subject: [PATCH 138/267] Hack the gettext detection a bit to fix translations not working on OSX buildbot builds --- Source/Core/DolphinWX/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index a6dcba128f..cf75db6a75 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -175,7 +175,7 @@ if(USE_UPNP) endif() include(FindGettext) -if(GETTEXT_FOUND AND wxWidgets_FOUND) +if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND) file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po) add_custom_target(translations ALL) GETTEXT_CREATE_TRANSLATIONS(${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot ${LINGUAS}) @@ -261,7 +261,7 @@ else() DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle ) - if(GETTEXT_FOUND AND wxWidgets_FOUND) + if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_translations_into_bundle.cmake " file(GLOB TRANSLATION_FILES RELATIVE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/*.gmo From 0fc1ca01693a4098fe3748f26ecd6aebef91747e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 12 Sep 2013 12:26:20 -0500 Subject: [PATCH 139/267] Make Bochs_disasm not depend on Common. --- Externals/Bochs_disasm/PowerPCDisasm.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Externals/Bochs_disasm/PowerPCDisasm.cpp b/Externals/Bochs_disasm/PowerPCDisasm.cpp index 56719ff662..f6de85d845 100644 --- a/Externals/Bochs_disasm/PowerPCDisasm.cpp +++ b/Externals/Bochs_disasm/PowerPCDisasm.cpp @@ -39,11 +39,6 @@ #include "PowerPCDisasm.h" -#ifndef _MSC_VER -// Pull in rotate functions for non-msvc -#include "Common.h" -#endif - namespace PPCDisasm { @@ -580,7 +575,8 @@ typedef unsigned int ppc_word; if (me < mb) mask = ~mask; //rotate the mask so it can be applied to source reg - return _rotl(mask, 32 - r); + //return _rotl(mask, 32 - r); + return (mask << (32 - r)) | (mask >> r); } From ef1d33647f57553b7d0a2f0aed11c0b60a54ab4c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 12 Sep 2013 12:57:13 -0500 Subject: [PATCH 140/267] Improve the ArraySize function a bit now that c++11 isn't forbidden there. Error messages should be friendlier now. --- Source/Core/Common/Src/CommonFuncs.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 284302d70d..7f62684efb 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -13,16 +13,15 @@ #endif #include - -// TODO: make into function when type_traits and constexpr are available -template -struct ArraySizeImpl {}; - -template -struct ArraySizeImpl { static const std::size_t size = N; }; +#include // Will fail to compile on a non-array: -#define ArraySize(x) ArraySizeImpl::size +// TODO: make this a function when constexpr is available +template +struct ArraySizeImpl : public std::extent +{ static_assert(std::is_array::value, "is array"); }; + +#define ArraySize(x) ArraySizeImpl::value #define b2(x) ( (x) | ( (x) >> 1) ) #define b4(x) ( b2(x) | ( b2(x) >> 2) ) From 1680f27739eeebeb7b48d91e8a4e3b80d7c75fe6 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 23:07:19 -0500 Subject: [PATCH 141/267] [ARM] Disable loadstorepaired instructions when fastmem is disabled. --- .../Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp index 7ed402593c..bae9042dd0 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp @@ -25,8 +25,7 @@ void JitArm::psq_l(UGeckoInstruction inst) // R12 contains scale // R11 contains type // R10 is the ADDR - - if (js.memcheck) { Default(inst); return; } + if (js.memcheck || !Core::g_CoreStartupParameter.bFastmem) { Default(inst); return; } LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I])); UBFX(R12, R11, 16, 3); // Type @@ -66,8 +65,8 @@ void JitArm::psq_st(UGeckoInstruction inst) // R12 contains scale // R11 contains type // R10 is the ADDR - if (js.memcheck) { Default(inst); return; } - + if (js.memcheck || !Core::g_CoreStartupParameter.bFastmem) { Default(inst); return; } + LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I])); UBFX(R12, R11, 0, 3); // Type LSL(R12, R12, 2); From ba05db78280e8b7969092a65556ef1bef066c5cd Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Sep 2013 23:08:00 -0500 Subject: [PATCH 142/267] [Android] Add a fastmem option to the cpu options, default disabled. --- Source/Android/res/values/strings.xml | 2 ++ Source/Android/res/xml/cpu_prefs.xml | 4 ++++ .../org/dolphinemu/dolphinemu/settings/UserPreferences.java | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index f474984809..b3e4f9e3e6 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -72,6 +72,8 @@ Emulation core to use Dual Core Split workload to two CPU cores instead of one. Increases speed. + Fastmem + Uses potentially unsafe optimizations for memory access. Video Software Renderer OpenGL ES 3 diff --git a/Source/Android/res/xml/cpu_prefs.xml b/Source/Android/res/xml/cpu_prefs.xml index 83dc830791..3fd0f3ad2d 100644 --- a/Source/Android/res/xml/cpu_prefs.xml +++ b/Source/Android/res/xml/cpu_prefs.xml @@ -10,5 +10,9 @@ android:key="cpuCorePref" android:summary="@string/emu_core_to_use" android:title="@string/cpu_core" /> + \ No newline at end of file diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index b29a91a63c..93fc9cf890 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -36,6 +36,7 @@ public final class UserPreferences // Add the settings. editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3")); editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True")); + editor.putBoolean("fastmemPref", getConfig("Dolphin.ini", "Core", "Fastmem", "False").equals("True")); editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer")); editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True")); @@ -118,6 +119,9 @@ public final class UserPreferences // Current CPU core being used. Falls back to interpreter upon error. String currentEmuCore = prefs.getString("cpuCorePref", "0"); + // Fastmem JIT core usage + boolean isUsingFastmem = prefs.getBoolean("fastmemPref", false); + // Current video backend being used. Falls back to software rendering upon error. String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering"); @@ -173,6 +177,7 @@ public final class UserPreferences // CPU related Settings NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUCore", currentEmuCore); NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUThread", isUsingDualCore ? "True" : "False"); + NativeLibrary.SetConfig("Dolphin.ini", "Core", "Fastmem", isUsingFastmem ? "True" : "False"); // General Video Settings NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend); From 0490d7d59c874dadd95bccd37f88943e1ee6e150 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 13 Sep 2013 00:24:06 -0400 Subject: [PATCH 143/267] [Android] JP strings for the Fastmem option. --- Source/Android/res/values-ja/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index c2cf3c5e55..e17935f939 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -72,6 +72,8 @@ 使用するエミュレーションコア デュアルコア 処理のための2つのCPUコアを使用して。速度が向上します。 + Fastmem + メモリアクセスのために潜在的に危険な最適化を使用して。 ビデオ Software Renderer OpenGL ES 3 From 7a15159c3479724bef43d8dc43e47c21392c2df7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 13 Sep 2013 00:29:59 -0400 Subject: [PATCH 144/267] [Android] Explicitly set the defaults for the CPU settings. --- Source/Android/res/xml/cpu_prefs.xml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Source/Android/res/xml/cpu_prefs.xml b/Source/Android/res/xml/cpu_prefs.xml index 3fd0f3ad2d..4316e1fcc5 100644 --- a/Source/Android/res/xml/cpu_prefs.xml +++ b/Source/Android/res/xml/cpu_prefs.xml @@ -1,18 +1,21 @@ - + - + android:defaultValue="false" + android:key="dualCorePref" + android:summary="@string/dual_core_descrip" + android:title="@string/dual_core" /> + + - + android:defaultValue="false" + android:key="fastmemPref" + android:summary="@string/fastmem_desc" + android:title="@string/fastmem" /> + \ No newline at end of file From 39a524f47df5c40688ca05b4d800b5818a42c943 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 5 Sep 2013 13:00:25 -0400 Subject: [PATCH 145/267] Returning false from an IPC_HLE method should not produce an INFO_LOG. It's commonly used to delay replying to a message and is in no way an error. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 9e52b70e5a..8425f092d8 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -548,17 +548,6 @@ void ExecuteCommand(u32 _Address) // Generate a reply to the IPC command EnqReply(_Address, reply_delay); } - else - { - if (pDevice) - { - INFO_LOG(WII_IPC_HLE, "<<-- Reply Failed to %s IPC Request %i @ 0x%08x ", pDevice->GetDeviceName().c_str(), Command, _Address); - } - else - { - INFO_LOG(WII_IPC_HLE, "<<-- Reply Failed to Unknown (%08x) IPC Request %i @ 0x%08x ", DeviceID, Command, _Address); - } - } } // Happens AS SOON AS IPC gets a new pointer! From 868ab1918b25e6c817a849ae18540076443635b5 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 11 Sep 2013 22:17:58 -0400 Subject: [PATCH 146/267] Reset es_inuse upon Reset. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 8425f092d8..31baf28abb 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -150,6 +150,12 @@ void Reset(bool _bHard) g_FdMap[i] = NULL; } + u32 j; + for (j=0; j Date: Wed, 11 Sep 2013 22:43:00 -0400 Subject: [PATCH 147/267] Fake ticket views for missing IOS title. --- .../Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 754b930053..254fcecbd6 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -594,13 +594,18 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) ViewCount = FileSize / DiscIO::INANDContentLoader::TICKET_SIZE; _dbg_assert_msg_(WII_IPC_ES, (ViewCount>0) && (ViewCount<=4), "IOCTL_ES_GETVIEWCNT ticket count seems to be wrong"); } + else if (TitleID >> 32 == 0x00000001) + { + // Fake a ticket view to make IOS reload work. + ViewCount = 1; + } else { + ViewCount = 0; if (TitleID == TITLEID_SYSMENU) { PanicAlertT("There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete."); } - ViewCount = 0; //retVal = ES_NO_TICKET_INSTALLED; } } @@ -651,6 +656,19 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } } } + else if (TitleID >> 32 == 0x00000001) + { + // For IOS titles, the ticket view isn't normally parsed by either the + // SDK or libogc, just passed to LaunchTitle, so this + // shouldn't matter at all. Just fill out some fields just + // to be on the safe side. + u32 Address = Buffer.PayloadBuffer[0].m_Address; + memset(Memory::GetPointer(Address), 0, 0xD8); + Memory::Write_U64(TitleID, Address + 4 + (0x1dc - 0x1d0)); // title ID + Memory::Write_U16(0xffff, Address + 4 + (0x1e4 - 0x1d0)); // unnnown + Memory::Write_U32(0xff00, Address + 4 + (0x1ec - 0x1d0)); // access mask + memset(Memory::GetPointer(Address + 4 + (0x222 - 0x1d0)), 0xff, 0x20); // content permissions + } else { //retVal = ES_NO_TICKET_INSTALLED; From 354b205decf33451061b5dff41e64f7535d58634 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 11 Sep 2013 22:43:12 -0400 Subject: [PATCH 148/267] Return correct value to fix libogc's IOS launch sequence. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 254fcecbd6..98e77c7695 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -934,10 +934,11 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) // Lie to mem about loading a different IOS // someone with an affected game should test IOSv = TitleID & 0xffff; + bSuccess = true; } - if (!bSuccess && IOSv >= 30 && IOSv != 0xffff) + if (!bSuccess) { - PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not available in your NAND dump\n" + PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your NAND dump\n" "TitleID %016llx.\n Dolphin will likely hang now.", TitleID); } else @@ -984,14 +985,13 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016llx %08x %016llx %08x %016llx %04x", TitleID,view,ticketid,devicetype,titleid,access); // IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff - //We have to handle the reply ourselves as this handle is not valid anymore - + // This is necessary because Reset(true) above deleted this object. Ew. // It seems that the original hardware overwrites the command after it has been // executed. We write 8 which is not any valid command, and what IOS does Memory::Write_U32(8, _CommandAddress); // IOS seems to write back the command that was responded to - Memory::Write_U32(6, _CommandAddress + 8); + Memory::Write_U32(7, _CommandAddress + 8); // Generate a reply to the IPC command WII_IPC_HLE_Interface::EnqReply(_CommandAddress, 0); From a316e2f1827d159e3fbf501f1a10c37bf478700c Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 11 Sep 2013 23:55:17 -0400 Subject: [PATCH 149/267] Hook the Gecko codehandler to invalidate the icache. The codehandler is broken and does not do this itself. This is a hack, but a lot simpler than the alternatives. --- Source/Core/Core/Src/Boot/Boot.cpp | 4 ++++ Source/Core/Core/Src/HLE/HLE.cpp | 1 + Source/Core/Core/Src/HLE/HLE_Misc.cpp | 23 +++++++++++++++++++++++ Source/Core/Core/Src/HLE/HLE_Misc.h | 1 + 4 files changed, 29 insertions(+) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 6f8f67bf11..9f48b87a32 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -192,6 +192,10 @@ bool CBoot::BootUp() Memory::WriteBigEData(stubstr, 0x80001804, 8); } + // Not part of the binary itself, but either we or Gecko OS might insert + // this, and it doesn't clear the icache properly. + HLE::Patch(0x800018a8, "GeckoCodehandler"); + g_symbolDB.Clear(); VideoInterface::Preset(_StartupPara.bNTSC); switch (_StartupPara.m_BootType) diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index 6469359a31..3d3d8d6052 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -63,6 +63,7 @@ static const SPatch OSPatches[] = { "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used for early init things (normally) { "___blank", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, { "__write_console", HLE_OS::HLE_write_console, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used by sysmenu (+more?) + { "GeckoCodehandler", HLE_Misc::HLEGeckoCodehandler, HLE_HOOK_START, HLE_TYPE_GENERIC }, }; static const SPatch OSBreakPoints[] = diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index 0b5db4f17f..fa5f8c7d61 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -17,6 +17,7 @@ #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "HLE.h" #include "PowerPC/PPCAnalyst.h" +#include "PowerPC/PPCCache.h" #include "PowerPC/SignatureDB.h" #include "PowerPC/PPCSymbolDB.h" #include "CommonPaths.h" @@ -242,4 +243,26 @@ void OSBootDol() NPC = PC; } +void HLEGeckoCodehandler() +{ + // Work around the codehandler not properly invalidating the icache, but + // only the first few frames. + // (Project M uses a conditional to only apply patches after something has + // been read into memory, or such, so we do the first 5 frames. More + // robust alternative would be to actually detect memory writes, but that + // would be even uglier.) + u32 magic = 0xd01f1bad; + u32 existing = Memory::Read_U32(0x80001800); + if (existing - magic == 5) + { + return; + } + else if(existing - magic > 5) + { + existing = magic; + } + Memory::Write_U32(existing + 1, 0x80001800); + PowerPC::ppcState.iCache.Reset(); +} + } diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h index 43924a4dcf..bc3acd143f 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.h +++ b/Source/Core/Core/Src/HLE/HLE_Misc.h @@ -12,6 +12,7 @@ namespace HLE_Misc void HBReload(); void OSBootDol(); void OSGetResetCode(); + void HLEGeckoCodehandler(); } #endif From e6cd3b328376bb3ec71e4f4571991e5d4dec1397 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 12 Sep 2013 00:03:37 -0400 Subject: [PATCH 150/267] Fix placement of HLE::Patch to not get overwritten by HLE::PatchFunctions. (This applies to the existing HBReload hook, which would be erased in various circumstances depending on the type of file loaded.) --- Source/Core/Core/Src/Boot/Boot.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 9f48b87a32..f35c24c594 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -184,18 +184,6 @@ bool CBoot::BootUp() NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str()); - // HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code handler - if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) - { - HLE::Patch(0x80001800, "HBReload"); - const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' }; - Memory::WriteBigEData(stubstr, 0x80001804, 8); - } - - // Not part of the binary itself, but either we or Gecko OS might insert - // this, and it doesn't clear the icache properly. - HLE::Patch(0x800018a8, "GeckoCodehandler"); - g_symbolDB.Clear(); VideoInterface::Preset(_StartupPara.bNTSC); switch (_StartupPara.m_BootType) @@ -419,6 +407,19 @@ bool CBoot::BootUp() return false; } } + + // HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code handler + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) + { + HLE::Patch(0x80001800, "HBReload"); + const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' }; + Memory::WriteBigEData(stubstr, 0x80001804, 8); + } + + // Not part of the binary itself, but either we or Gecko OS might insert + // this, and it doesn't clear the icache properly. + HLE::Patch(0x800018a8, "GeckoCodehandler"); + Host_UpdateLogDisplay(); return true; } From e62bc44f15edfc21819994cd8908698f678d6b30 Mon Sep 17 00:00:00 2001 From: comex Date: Fri, 13 Sep 2013 16:26:39 -0400 Subject: [PATCH 151/267] Use d01f1bad for the gameid check in RunCodeHandler rather than the actual ID. This avoids conflict with the icache hack. codehandleronly.s does not actually use the gameid, so it shouldn't matter. --- Source/Core/Core/Src/GeckoCode.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 252e758746..f8359e1bc5 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -154,8 +154,9 @@ bool InstallCodeHandler() // Turn off Pause on start Memory::Write_U32(0, 0x80002774); - // Write the Game ID into the location expected by WiiRD - Memory::WriteBigEData(Memory::GetPointer(0x80000000), 0x80001800, 6); + // Write a magic value to 'gameid' (codehandleronly does not actually read this). + // For the purpose of this, see HLEGeckoCodehandler. + Memory::Write_U32(0xd01f1bad, 0x80001800); // Create GCT in memory Memory::Write_U32(0x00d0c0de, codelist_location); @@ -279,10 +280,7 @@ void RunCodeHandler() { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats && active_codes.size() > 0) { - u8 *gameId = Memory::GetPointer(0x80000000); - u8 *wiirdId = Memory::GetPointer(0x80001800); - - if (!code_handler_installed || memcmp(gameId, wiirdId, 6)) + if (!code_handler_installed || Memory::Read_U32(0x80001800) - 0xd01f1bad > 5) code_handler_installed = InstallCodeHandler(); if (code_handler_installed) From e15e30602c5c30c4f667278ca114e37747473f6c Mon Sep 17 00:00:00 2001 From: comex Date: Fri, 13 Sep 2013 18:11:53 -0400 Subject: [PATCH 152/267] Fix HLE_HOOK_START in the interpreter. --- .../Core/Src/PowerPC/Interpreter/Interpreter.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp index ca98489fd3..a99eab7cea 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp @@ -106,10 +106,20 @@ int Interpreter::SingleStepInner(void) if (HLE::IsEnabled(flags)) { HLEFunction(function); + if (type == HLE::HLE_HOOK_START) + { + // Run the original. + function = 0; + } + } + else + { + function = 0; } } } - else + + if (function == 0) { #ifdef USE_GDBSTUB if (gdb_active() && gdb_bp_x(PC)) { From f830b85d101653dc11a3d97cb7b8b679d8ac09ec Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 13 Sep 2013 21:33:11 -0400 Subject: [PATCH 153/267] NetPlayServer: Drop all the pads for a client when she disconnects This makes intuitive sense, and prevents issues with users stealing up all the pads and requiring admin intervention to participate. --- Source/Core/Core/Src/NetPlayServer.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 715fd5048d..5abf805fe5 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -238,9 +238,11 @@ unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket) SendToClients(spac); } + int pid = m_players[socket].pid; + sf::Packet spac; spac << (MessageId)NP_MSG_PLAYER_LEAVE; - spac << m_players[socket].pid; + spac << pid; m_selector.Remove(socket); @@ -251,6 +253,11 @@ unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket) std::lock_guard lks(m_crit.send); SendToClients(spac); + for (int i = 0; i < 4; i++) + if (m_pad_map[i] == pid) + m_pad_map[i] = -1; + UpdatePadMapping(); + return 0; } From 751fae49653719b945e2716c97ade225db4f5785 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 13 Sep 2013 21:17:18 -0500 Subject: [PATCH 154/267] [Android] Make sure the default config file has fastmem disabled. --- Source/Android/assets/Dolphin.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini index 1ccac4d26e..87cb8139f7 100644 --- a/Source/Android/assets/Dolphin.ini +++ b/Source/Android/assets/Dolphin.ini @@ -10,7 +10,7 @@ CPUCore = 3 CPUThread = False GFXBackend = Software Renderer HLE_BS2 = False -Fastmem = True +Fastmem = False DSPThread = False DSPHLE = True SkipIdle = True From aaf8e92f78e4213347bf583c00fa70d432219f26 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 02:50:14 +0000 Subject: [PATCH 155/267] [ARM] Fixes srawix implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index f852563366..054b8d3790 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -757,9 +757,9 @@ void JitArm::srawix(UGeckoInstruction inst) int a = inst.RA; int s = inst.RS; int amount = inst.SH; + if (amount != 0) { - Default(inst); return; ARMReg RA = gpr.R(a); ARMReg RS = gpr.R(s); ARMReg tmp = gpr.GetReg(); @@ -774,7 +774,7 @@ void JitArm::srawix(UGeckoInstruction inst) LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER])); BIC(tmp, tmp, mask); - SetCC(CC_EQ); + SetCC(CC_NEQ); ORR(tmp, tmp, mask); SetCC(); STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER])); From 0ae8fa964daafdc61bbd3cdafcd58f76be0a63e4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 03:51:32 +0000 Subject: [PATCH 156/267] [ARM] lfsu implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 5 +-- .../JitArm32/JitArm_LoadStoreFloating.cpp | 41 +++++++++++++++++-- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index f39c7516e3..6fd886ea0c 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -198,6 +198,7 @@ public: // Floating point loadStore void lfs(UGeckoInstruction _inst); + void lfsu(UGeckoInstruction _inst); void lfsx(UGeckoInstruction _inst); void lfd(UGeckoInstruction _inst); void stfs(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index 054b8d3790..9873c0d479 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -27,7 +27,6 @@ #include "JitRegCache.h" #include "JitAsm.h" extern u32 Helper_Mask(u8 mb, u8 me); -// ADDI and RLWINMX broken for now // Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers. // Jit64 ComputerRC is signed @@ -204,9 +203,9 @@ void JitArm::arith(UGeckoInstruction inst) isImm[1] = true; Imm[1] = inst.UIMM << (shiftedImm ? 16 : 0); break; - case 29: // addis_rc + case 29: // andis_rc shiftedImm = true; - case 28: // addi_rc + case 28: // andi_rc if (gpr.IsImm(s)) { isImm[0] = true; diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index e391e768fb..723430cc95 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -56,19 +56,54 @@ void JitArm::lfs(UGeckoInstruction inst) CMP(rA, EXCEPTION_DSI); FixupBranch DoNotLoad = B_CC(CC_EQ); - MOVI2R(rA, (u32)&Memory::Read_F32); + MOVI2R(rA, (u32)&Memory::Read_U32); PUSH(4, R0, R1, R2, R3); MOV(R0, rB); BL(rA); -#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 VMOV(S0, R0); -#endif VCVT(v0, S0, 0); VCVT(v1, S0, 0); POP(4, R0, R1, R2, R3); + gpr.Unlock(rA, rB); + SetJumpTarget(DoNotLoad); +} +void JitArm::lfsu(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStoreFloatingOff) + + ARMReg RA = gpr.R(inst.RA); + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + ARMReg v0 = fpr.R0(inst.FD); + ARMReg v1 = fpr.R1(inst.FD); + + MOVI2R(rB, inst.SIMM_16); + ADD(rB, rB, RA); + + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + + MOVI2R(rA, (u32)&Memory::Read_U32); + + MOV(RA, rB); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + + VMOV(S0, R0); + + VCVT(v0, S0, 0); + VCVT(v1, S0, 0); + POP(4, R0, R1, R2, R3); + + gpr.Unlock(rA, rB); SetJumpTarget(DoNotLoad); } diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index fd2d53bd40..6f649f2890 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -98,7 +98,7 @@ static GekkoOPTemplate primarytable[] = {47, &JitArm::Default}, //"stmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, {48, &JitArm::lfs}, //"lfs", OPTYPE_LOADFP, FL_IN_A}}, - {49, &JitArm::Default}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, + {49, &JitArm::lfsu}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, {50, &JitArm::lfd}, //"lfd", OPTYPE_LOADFP, FL_IN_A}}, {51, &JitArm::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, From 4512813cf9ff373b6d6ce63aca896ec038934ad8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 04:00:40 +0000 Subject: [PATCH 157/267] [ARM] lfdu and stfsu implementations. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 2 + .../JitArm32/JitArm_LoadStoreFloating.cpp | 71 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 4 +- 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 6fd886ea0c..75136ec155 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -201,7 +201,9 @@ public: void lfsu(UGeckoInstruction _inst); void lfsx(UGeckoInstruction _inst); void lfd(UGeckoInstruction _inst); + void lfdu(UGeckoInstruction _inst); void stfs(UGeckoInstruction _inst); + void stfsu(UGeckoInstruction _inst); // Paired Singles void ps_add(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index 723430cc95..6bc9392978 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -183,6 +183,43 @@ void JitArm::lfd(UGeckoInstruction inst) SetJumpTarget(DoNotLoad); } +void JitArm::lfdu(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStoreFloatingOff) + + ARMReg RA = gpr.R(inst.RA); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + ARMReg v0 = fpr.R0(inst.FD); + + MOVI2R(rB, inst.SIMM_16); + ADD(rB, rB, RA); + + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + + MOVI2R(rA, (u32)&Memory::Read_F64); + MOV(RA, rB); + + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + +#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1 + VMOV(v0, R0); +#else + VMOV(v0, D0); +#endif + + POP(4, R0, R1, R2, R3); + + gpr.Unlock(rA, rB); + SetJumpTarget(DoNotLoad); +} + void JitArm::stfs(UGeckoInstruction inst) { INSTRUCTION_START @@ -215,3 +252,37 @@ void JitArm::stfs(UGeckoInstruction inst) gpr.Unlock(rA, rB); } +void JitArm::stfsu(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStoreFloatingOff) + + ARMReg RA = gpr.R(inst.RA); + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg v0 = fpr.R0(inst.FS); + VCVT(S0, v0, 0); + + MOVI2R(rB, inst.SIMM_16); + ADD(rB, rB, RA); + + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + + SetCC(CC_NEQ); + MOV(RA, rB); + SetCC(); + + MOVI2R(rA, (u32)&Memory::Write_U32); + PUSH(4, R0, R1, R2, R3); + VMOV(R0, S0); + MOV(R1, rB); + + BL(rA); + + POP(4, R0, R1, R2, R3); + + gpr.Unlock(rA, rB); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 6f649f2890..da6d6b9dc8 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -100,10 +100,10 @@ static GekkoOPTemplate primarytable[] = {48, &JitArm::lfs}, //"lfs", OPTYPE_LOADFP, FL_IN_A}}, {49, &JitArm::lfsu}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, {50, &JitArm::lfd}, //"lfd", OPTYPE_LOADFP, FL_IN_A}}, - {51, &JitArm::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, + {51, &JitArm::lfdu}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, {52, &JitArm::stfs}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, - {53, &JitArm::Default}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + {53, &JitArm::stfsu}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, {54, &JitArm::Default}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, {55, &JitArm::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, From dfcef6890efe6537c0229ac4aacc472f1ce89dbd Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 25 Aug 2013 14:31:11 -0400 Subject: [PATCH 158/267] Use global user directory on windows. Can override by setting HKCU\Software\Dolphin-emu\LocalUserConfig to true. --- Source/Core/Common/Src/FileUtil.cpp | 47 +++++++++++++++++++++++++- Source/Core/Core/Src/CoreParameter.cpp | 6 +--- Source/Core/DolphinWX/Src/Main.cpp | 1 + 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 8792321bf0..d2be401fb1 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -665,7 +665,52 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new if (paths[D_USER_IDX].empty()) { #ifdef _WIN32 - paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; + // Detect where the User directory is. There are four different cases (on top of the + // command line flag, which overrides all this): + // 1. HKCU\Software\Dolphin Emulator\LocalUserConfig exists and is true + // -> Use GetExeDirectory()\User + // 2. HKCU\Software\Dolphin Emulator\UserConfigPath exists + // -> Use this as the user directory path + // 3. My Documents exists + // -> Use My Documents\Dolphin Emulator as the User directory path + // 4. Default + // -> Use GetExeDirectory()\User + + // Check our registry keys + HKEY hkey; + DWORD local = 0; + TCHAR configPath[MAX_PATH] = {0}; + if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), NULL, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS) + { + DWORD size = 4; + if (RegQueryValueEx(hkey, TEXT("LocalUserConfig"), NULL, NULL, reinterpret_cast(&local), &size) != ERROR_SUCCESS) + local = 0; + + size = MAX_PATH; + if (RegQueryValueEx(hkey, TEXT("UserConfigPath"), NULL, NULL, (LPBYTE)configPath, &size) != ERROR_SUCCESS) + configPath[0] = 0; + RegCloseKey(hkey); + } + + // Get Program Files path in case we need it. + TCHAR my_documents[MAX_PATH]; + bool my_documents_found = SUCCEEDED(SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, my_documents)); + + if (local) // Case 1 + paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; + else if (configPath[0]) // Case 2 + paths[D_USER_IDX] = TStrToUTF8(configPath); + else if (my_documents_found) // Case 3 + paths[D_USER_IDX] = TStrToUTF8(my_documents) + DIR_SEP "Dolphin Emulator" DIR_SEP; + else // Case 4 + paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; + + // Prettify the path: it will be displayed in some places, we don't want a mix of \ and /. + paths[D_USER_IDX] = ReplaceAll(paths[D_USER_IDX], "\\", DIR_SEP); + + // Make sure it ends in DIR_SEP. + if (*paths[D_USER_IDX].rbegin() != DIR_SEP_CHR) + paths[D_USER_IDX] += DIR_SEP; #else if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 93dd4be5a2..462a7e8474 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -351,11 +351,7 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri { // Use default memcard path if there is no user defined name std::string defaultFilename = isSlotA ? GC_MEMCARDA : GC_MEMCARDB; - #ifdef _WIN32 - memcardPath = "." + File::GetUserPath(D_GCUSER_IDX).substr(File::GetExeDirectory().size()) + defaultFilename + ext; - #else - memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext; - #endif + memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext; } else { diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 30593ac637..6e55ec1501 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -268,6 +268,7 @@ bool DolphinApp::OnInit() File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP), File::GetUserPath(D_OPENCL_IDX)); #endif + File::CreateFullPath(File::GetUserPath(D_USER_IDX)); File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX)); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX)); File::CreateFullPath(File::GetUserPath(D_CACHE_IDX)); From b587af3ea3cd0df8c6f0c31ae8d8c4bf39b15316 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 11 Sep 2013 03:53:36 +0200 Subject: [PATCH 159/267] Change the initial user directory creation to stop special casing Windows --- Source/Core/Common/Src/CommonPaths.h | 1 + Source/Core/Common/Src/FileUtil.cpp | 30 +++++++++++++++++++++------- Source/Core/DolphinWX/Src/Main.cpp | 8 +------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 38640723e5..fd5ca2b238 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -38,6 +38,7 @@ // Shared data dirs (Sys and shared User for linux) #ifdef _WIN32 #define SYSDATA_DIR "Sys" + #define SHARED_USER_DIR File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP #elif defined __APPLE__ #define SYSDATA_DIR "Contents/Resources/Sys" #define SHARED_USER_DIR File::GetBundleDirectory() + \ diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index d2be401fb1..92e9674ff2 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -551,11 +551,24 @@ bool DeleteDirRecursively(const std::string &directory) // Create directory and copy contents (does not overwrite existing files) void CopyDir(const std::string &source_path, const std::string &dest_path) { -#ifndef _WIN32 if (source_path == dest_path) return; if (!File::Exists(source_path)) return; if (!File::Exists(dest_path)) File::CreateFullPath(dest_path); +#ifdef _WIN32 + WIN32_FIND_DATA ffd; + HANDLE hFind = FindFirstFile(UTF8ToTStr(source_path + "\\*").c_str(), &ffd); + + if (hFind == INVALID_HANDLE_VALUE) + { + FindClose(hFind); + return; + } + + do + { + const std::string virtualName(TStrToUTF8(ffd.cFileName)); +#else struct dirent dirent, *result = NULL; DIR *dirp = opendir(source_path.c_str()); if (!dirp) return; @@ -563,10 +576,9 @@ void CopyDir(const std::string &source_path, const std::string &dest_path) while (!readdir_r(dirp, &dirent, &result) && result) { const std::string virtualName(result->d_name); +#endif // check for "." and ".." - if (((virtualName[0] == '.') && (virtualName[1] == '\0')) || - ((virtualName[0] == '.') && (virtualName[1] == '.') && - (virtualName[2] == '\0'))) + if (virtualName == "." || virtualName == "..") continue; std::string source, dest; @@ -580,6 +592,10 @@ void CopyDir(const std::string &source_path, const std::string &dest_path) CopyDir(source, dest); } else if (!File::Exists(dest)) File::Copy(source, dest); +#ifdef _WIN32 + } while (FindNextFile(hFind, &ffd) != 0); + FindClose(hFind); +#else } closedir(dirp); #endif @@ -643,9 +659,9 @@ std::string GetSysDirectory() std::string sysDir; #if defined (__APPLE__) - sysDir = GetBundleDirectory(); - sysDir += DIR_SEP; - sysDir += SYSDATA_DIR; + sysDir = GetBundleDirectory() + DIR_SEP + SYSDATA_DIR; +#elif defined (_WIN32) + sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR; #else sysDir = SYSDATA_DIR; #endif diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 6e55ec1501..9bff5de2d2 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -249,12 +249,6 @@ bool DolphinApp::OnInit() } #endif -#ifdef _WIN32 - if (!wxSetWorkingDirectory(StrToWxStr(File::GetExeDirectory()))) - { - INFO_LOG(CONSOLE, "Set working directory failed"); - } -#else //create all necessary directories in user directory //TODO : detect the revision and upgrade where necessary File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP), @@ -267,7 +261,7 @@ bool DolphinApp::OnInit() File::GetUserPath(D_WIIUSER_IDX)); File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP), File::GetUserPath(D_OPENCL_IDX)); -#endif + File::CreateFullPath(File::GetUserPath(D_USER_IDX)); File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX)); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX)); From 6bdb6585d6174415105f335b3982fbc7e39fb560 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 01:02:41 +0200 Subject: [PATCH 160/267] Overlay the user Maps/ over the shared one to avoid copying files --- Data/{User => Sys}/Maps/GFZE01.map | 0 Data/{User => Sys}/Maps/GMBE8P.map | 0 Source/Core/Core/Src/Boot/Boot.cpp | 80 +++++++++++-------- Source/Core/Core/Src/Boot/Boot.h | 16 +++- Source/Core/Core/Src/Boot/Boot_ELF.cpp | 2 +- .../Src/Debugger/CodeWindowFunctions.cpp | 16 ++-- Source/Core/DolphinWX/Src/Main.cpp | 3 +- 7 files changed, 70 insertions(+), 47 deletions(-) rename Data/{User => Sys}/Maps/GFZE01.map (100%) rename Data/{User => Sys}/Maps/GMBE8P.map (100%) diff --git a/Data/User/Maps/GFZE01.map b/Data/Sys/Maps/GFZE01.map similarity index 100% rename from Data/User/Maps/GFZE01.map rename to Data/Sys/Maps/GFZE01.map diff --git a/Data/User/Maps/GMBE8P.map b/Data/Sys/Maps/GMBE8P.map similarity index 100% rename from Data/User/Maps/GMBE8P.map rename to Data/Sys/Maps/GMBE8P.map diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index f35c24c594..1d53f9814b 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -71,59 +71,73 @@ void CBoot::UpdateDebugger_MapLoaded(const char *_gameID) Host_NotifyMapLoaded(); } -std::string CBoot::GenerateMapFilename() +bool CBoot::FindMapFile(std::string* existing_map_file, + std::string* writable_map_file) { + std::string title_id_str; + SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter; switch (_StartupPara.m_BootType) { case SCoreStartupParameter::BOOT_WII_NAND: { - const DiscIO::INANDContentLoader& Loader = DiscIO::CNANDContentManager::Access().GetNANDLoader(_StartupPara.m_strFilename); + const DiscIO::INANDContentLoader& Loader = + DiscIO::CNANDContentManager::Access().GetNANDLoader(_StartupPara.m_strFilename); if (Loader.IsValid()) { u64 TitleID = Loader.GetTitleID(); - char tmpBuffer[32]; - sprintf(tmpBuffer, "%08x_%08x", (u32)(TitleID >> 32) & 0xFFFFFFFF , (u32)TitleID & 0xFFFFFFFF ); - return File::GetUserPath(D_MAPS_IDX) + std::string(tmpBuffer) + ".map"; + title_id_str = StringFromFormat("%08X_%08X", + (u32)(TitleID >> 32) & 0xFFFFFFFF, + (u32)TitleID & 0xFFFFFFFF); } break; } case SCoreStartupParameter::BOOT_ELF: case SCoreStartupParameter::BOOT_DOL: - return _StartupPara.m_strFilename.substr(0, _StartupPara.m_strFilename.size()-4) + ".map"; + // Strip the .elf/.dol file extension + title_id_str = _StartupPara.m_strFilename.substr( + 0, _StartupPara.m_strFilename.size() - 4); + break; + default: - return File::GetUserPath(D_MAPS_IDX) + _StartupPara.GetUniqueID() + ".map"; + title_id_str = _StartupPara.GetUniqueID(); + break; } - return std::string("unknown map"); -} + if (writable_map_file) + *writable_map_file = File::GetUserPath(D_MAPS_IDX) + title_id_str + ".map"; -bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_gameID) -{ - if (_rFilename.size() == 0) - return false; - - std::string strMapFilename = GenerateMapFilename(); - - bool success = false; - if (!g_symbolDB.LoadMap(strMapFilename.c_str())) + bool found = false; + static const std::string maps_directories[] = { + File::GetUserPath(D_MAPS_IDX), + File::GetSysDirectory() + MAPS_DIR DIR_SEP + }; + for (size_t i = 0; !found && i < ArraySize(maps_directories); ++i) { - if (_gameID != NULL) + std::string path = maps_directories[i] + title_id_str + ".map"; + if (File::Exists(path)) { - BuildCompleteFilename(strMapFilename, "maps", std::string(_gameID) + ".map"); - success = g_symbolDB.LoadMap(strMapFilename.c_str()); + found = true; + if (existing_map_file) + *existing_map_file = path; } } - else + + return found; +} + +bool CBoot::LoadMapFromFilename() +{ + std::string strMapFilename; + bool found = FindMapFile(&strMapFilename, NULL); + if (found && g_symbolDB.LoadMap(strMapFilename.c_str())) { - success = true; + UpdateDebugger_MapLoaded(); + return true; } - if (success) - UpdateDebugger_MapLoaded(); - - return success; + return false; } // If ipl.bin is not found, this function does *some* of what BS1 does: @@ -201,10 +215,6 @@ bool CBoot::BootUp() PanicAlertT("Warning - starting ISO in wrong console mode!"); } - char gameID[7]; - memcpy(gameID, pVolume->GetUniqueID().c_str(), 6); - gameID[6] = 0; - // setup the map from ISOFile ID VolumeHandler::SetVolumeName(_StartupPara.m_strFilename); @@ -252,7 +262,7 @@ bool CBoot::BootUp() /* Try to load the symbol map if there is one, and then scan it for and eventually replace code */ - if (LoadMapFromFilename(_StartupPara.m_strFilename, gameID)) + if (LoadMapFromFilename()) HLE::PatchFunctions(); // We don't need the volume any more @@ -298,7 +308,7 @@ bool CBoot::BootUp() PC = dolLoader.GetEntryPoint(); } - if (LoadMapFromFilename(_StartupPara.m_strFilename)) + if (LoadMapFromFilename()) HLE::PatchFunctions(); break; @@ -368,7 +378,7 @@ bool CBoot::BootUp() case SCoreStartupParameter::BOOT_WII_NAND: Boot_WiiWAD(_StartupPara.m_strFilename.c_str()); - if (LoadMapFromFilename(_StartupPara.m_strFilename)) + if (LoadMapFromFilename()) HLE::PatchFunctions(); // load default image or create virtual drive from directory @@ -387,7 +397,7 @@ bool CBoot::BootUp() DVDInterface::SetDiscInside(VolumeHandler::IsValid()); if (Load_BS2(_StartupPara.m_strBootROM)) { - if (LoadMapFromFilename(_StartupPara.m_strFilename)) + if (LoadMapFromFilename()) HLE::PatchFunctions(); } else diff --git a/Source/Core/Core/Src/Boot/Boot.h b/Source/Core/Core/Src/Boot/Boot.h index 69053b0f71..94b26273a8 100644 --- a/Source/Core/Core/Src/Boot/Boot.h +++ b/Source/Core/Core/Src/Boot/Boot.h @@ -16,14 +16,26 @@ public: static bool BootUp(); static bool IsElfWii(const char *filename); - static std::string GenerateMapFilename(); + + // Tries to find a map file for the current game by looking first in the + // local user directory, then in the shared user directory. + // + // If existing_map_file is not NULL and a map file exists, it is set to the + // path to the existing map file. + // + // If writable_map_file is not NULL, it is set to the path to where a map + // file should be saved. + // + // Returns true if a map file exists, false if none could be found. + static bool FindMapFile(std::string* existing_map_file, + std::string* writable_map_file); private: static void RunFunction(u32 _iAddr); static void UpdateDebugger_MapLoaded(const char* _gameID = NULL); - static bool LoadMapFromFilename(const std::string& _rFilename, const char* _gameID = NULL); + static bool LoadMapFromFilename(); static bool Boot_ELF(const char *filename); static bool Boot_WiiWAD(const char *filename); diff --git a/Source/Core/Core/Src/Boot/Boot_ELF.cpp b/Source/Core/Core/Src/Boot/Boot_ELF.cpp index 06e4a33bd8..99b0c3c0a3 100644 --- a/Source/Core/Core/Src/Boot/Boot_ELF.cpp +++ b/Source/Core/Core/Src/Boot/Boot_ELF.cpp @@ -68,7 +68,7 @@ bool CBoot::Boot_ELF(const char *filename) reader.LoadInto(0x80000000); if (!reader.LoadSymbols()) { - if (LoadMapFromFilename(filename)) + if (LoadMapFromFilename()) HLE::PatchFunctions(); } else diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp index c8f7b63eb4..d9fe275abd 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp @@ -211,7 +211,9 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) if (Core::GetState() == Core::CORE_UNINITIALIZED) return; - std::string mapfile = CBoot::GenerateMapFilename(); + std::string existing_map_file, writable_map_file; + bool map_exists = CBoot::FindMapFile(&existing_map_file, + &writable_map_file); switch (event.GetId()) { case IDM_CLEARSYMBOLS: @@ -238,28 +240,28 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) break; } case IDM_LOADMAPFILE: - if (!File::Exists(mapfile)) + if (!map_exists) { g_symbolDB.Clear(); PPCAnalyst::FindFunctions(0x81300000, 0x81800000, &g_symbolDB); SignatureDB db; if (db.Load((File::GetSysDirectory() + TOTALDB).c_str())) db.Apply(&g_symbolDB); - Parent->StatusBarMessage("'%s' not found, scanning for common functions instead", mapfile.c_str()); + Parent->StatusBarMessage("'%s' not found, scanning for common functions instead", writable_map_file.c_str()); } else { - g_symbolDB.LoadMap(mapfile.c_str()); - Parent->StatusBarMessage("Loaded symbols from '%s'", mapfile.c_str()); + g_symbolDB.LoadMap(existing_map_file.c_str()); + Parent->StatusBarMessage("Loaded symbols from '%s'", existing_map_file.c_str()); } HLE::PatchFunctions(); NotifyMapLoaded(); break; case IDM_SAVEMAPFILE: - g_symbolDB.SaveMap(mapfile.c_str()); + g_symbolDB.SaveMap(writable_map_file.c_str()); break; case IDM_SAVEMAPFILEWITHCODES: - g_symbolDB.SaveMap(mapfile.c_str(), true); + g_symbolDB.SaveMap(writable_map_file.c_str(), true); break; case IDM_RENAME_SYMBOLS: diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 9bff5de2d2..9fae1f2999 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -253,8 +253,6 @@ bool DolphinApp::OnInit() //TODO : detect the revision and upgrade where necessary File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP), File::GetUserPath(D_GAMECONFIG_IDX)); - File::CopyDir(std::string(SHARED_USER_DIR MAPS_DIR DIR_SEP), - File::GetUserPath(D_MAPS_IDX)); File::CopyDir(std::string(SHARED_USER_DIR SHADERS_DIR DIR_SEP), File::GetUserPath(D_SHADERS_IDX)); File::CopyDir(std::string(SHARED_USER_DIR WII_USER_DIR DIR_SEP), @@ -272,6 +270,7 @@ bool DolphinApp::OnInit() File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX)); + File::CreateFullPath(File::GetUserPath(D_MAPS_IDX)); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP); From e7213ca4b16593b676031802dd353a14a77c8a60 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 02:40:17 +0200 Subject: [PATCH 161/267] Overlay the user Shaders/ over the shared one to avoid copying files --- .../16bit.txt => Sys/Shaders/16bit.glsl} | 0 .../32bit.txt => Sys/Shaders/32bit.glsl} | 0 Data/{User => Sys}/Shaders/README.txt | 0 .../Shaders/acidmetal.glsl} | 0 .../Shaders/acidtrip.glsl} | 0 .../Shaders/acidtrip2.glsl} | 0 .../Shaders/asciiart.glsl} | 0 .../Shaders/auto_toon.glsl} | 0 .../Shaders/auto_toon2.glsl} | 0 .../Shaders/bad_bloom.glsl} | 0 .../Shaders/brighten.glsl} | 0 .../Shaders/chrismas.glsl} | 0 .../cool1.txt => Sys/Shaders/cool1.glsl} | 0 .../Shaders/darkerbrighter.glsl} | 0 .../emboss.txt => Sys/Shaders/emboss.glsl} | 0 .../fire.txt => Sys/Shaders/fire.glsl} | 0 .../fire2.txt => Sys/Shaders/fire2.glsl} | 0 .../Shaders/firewater.glsl} | 0 .../Shaders/grayscale.glsl} | 0 .../Shaders/grayscale2.glsl} | 0 .../invert.txt => Sys/Shaders/invert.glsl} | 0 .../Shaders/invert_blue.glsl} | 0 .../Shaders/invertedoutline.glsl} | 0 .../Shaders/mad_world.glsl} | 0 .../Shaders/nightvision.glsl} | 0 .../Shaders/nightvision2.glsl} | 0 .../Shaders/nightvision2scanlines.glsl} | 0 .../Shaders/posterize.glsl} | 0 .../Shaders/posterize2.glsl} | 0 .../Shaders/primarycolors.glsl} | 0 .../sepia.txt => Sys/Shaders/sepia.glsl} | 0 .../sketchy.txt => Sys/Shaders/sketchy.glsl} | 0 .../Shaders/spookey1.glsl} | 0 .../Shaders/spookey2.glsl} | 0 .../Shaders/stereoscopic.glsl} | 0 .../Shaders/stereoscopic2.glsl} | 0 .../sunset.txt => Sys/Shaders/sunset.glsl} | 0 .../Shaders/swap_RGB_BGR.glsl} | 0 .../Shaders/swap_RGB_BRG.glsl} | 0 .../Shaders/swap_RGB_GBR.glsl} | 0 .../Shaders/swap_RGB_GRB.glsl} | 0 .../Shaders/swap_RGB_RBG.glsl} | 0 .../toxic.txt => Sys/Shaders/toxic.glsl} | 0 Source/Core/DolphinWX/Src/Main.cpp | 17 ++++---- .../Plugin_VideoOGL/Src/PostProcessing.cpp | 8 +++- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 39 ++++++++++++------- 46 files changed, 41 insertions(+), 23 deletions(-) rename Data/{User/Shaders/16bit.txt => Sys/Shaders/16bit.glsl} (100%) rename Data/{User/Shaders/32bit.txt => Sys/Shaders/32bit.glsl} (100%) rename Data/{User => Sys}/Shaders/README.txt (100%) rename Data/{User/Shaders/acidmetal.txt => Sys/Shaders/acidmetal.glsl} (100%) rename Data/{User/Shaders/acidtrip.txt => Sys/Shaders/acidtrip.glsl} (100%) rename Data/{User/Shaders/acidtrip2.txt => Sys/Shaders/acidtrip2.glsl} (100%) rename Data/{User/Shaders/asciiart.txt => Sys/Shaders/asciiart.glsl} (100%) rename Data/{User/Shaders/auto_toon.txt => Sys/Shaders/auto_toon.glsl} (100%) rename Data/{User/Shaders/auto_toon2.txt => Sys/Shaders/auto_toon2.glsl} (100%) rename Data/{User/Shaders/bad_bloom.txt => Sys/Shaders/bad_bloom.glsl} (100%) rename Data/{User/Shaders/brighten.txt => Sys/Shaders/brighten.glsl} (100%) rename Data/{User/Shaders/chrismas.txt => Sys/Shaders/chrismas.glsl} (100%) rename Data/{User/Shaders/cool1.txt => Sys/Shaders/cool1.glsl} (100%) rename Data/{User/Shaders/darkerbrighter.txt => Sys/Shaders/darkerbrighter.glsl} (100%) rename Data/{User/Shaders/emboss.txt => Sys/Shaders/emboss.glsl} (100%) rename Data/{User/Shaders/fire.txt => Sys/Shaders/fire.glsl} (100%) rename Data/{User/Shaders/fire2.txt => Sys/Shaders/fire2.glsl} (100%) rename Data/{User/Shaders/firewater.txt => Sys/Shaders/firewater.glsl} (100%) rename Data/{User/Shaders/grayscale.txt => Sys/Shaders/grayscale.glsl} (100%) rename Data/{User/Shaders/grayscale2.txt => Sys/Shaders/grayscale2.glsl} (100%) rename Data/{User/Shaders/invert.txt => Sys/Shaders/invert.glsl} (100%) rename Data/{User/Shaders/invert_blue.txt => Sys/Shaders/invert_blue.glsl} (100%) rename Data/{User/Shaders/invertedoutline.txt => Sys/Shaders/invertedoutline.glsl} (100%) rename Data/{User/Shaders/mad_world.txt => Sys/Shaders/mad_world.glsl} (100%) rename Data/{User/Shaders/nightvision.txt => Sys/Shaders/nightvision.glsl} (100%) rename Data/{User/Shaders/nightvision2.txt => Sys/Shaders/nightvision2.glsl} (100%) rename Data/{User/Shaders/nightvision2scanlines.txt => Sys/Shaders/nightvision2scanlines.glsl} (100%) rename Data/{User/Shaders/posterize.txt => Sys/Shaders/posterize.glsl} (100%) rename Data/{User/Shaders/posterize2.txt => Sys/Shaders/posterize2.glsl} (100%) rename Data/{User/Shaders/primarycolors.txt => Sys/Shaders/primarycolors.glsl} (100%) rename Data/{User/Shaders/sepia.txt => Sys/Shaders/sepia.glsl} (100%) rename Data/{User/Shaders/sketchy.txt => Sys/Shaders/sketchy.glsl} (100%) rename Data/{User/Shaders/spookey1.txt => Sys/Shaders/spookey1.glsl} (100%) rename Data/{User/Shaders/spookey2.txt => Sys/Shaders/spookey2.glsl} (100%) rename Data/{User/Shaders/stereoscopic.txt => Sys/Shaders/stereoscopic.glsl} (100%) rename Data/{User/Shaders/stereoscopic2.txt => Sys/Shaders/stereoscopic2.glsl} (100%) rename Data/{User/Shaders/sunset.txt => Sys/Shaders/sunset.glsl} (100%) rename Data/{User/Shaders/swap_RGB_BGR.txt => Sys/Shaders/swap_RGB_BGR.glsl} (100%) rename Data/{User/Shaders/swap_RGB_BRG.txt => Sys/Shaders/swap_RGB_BRG.glsl} (100%) rename Data/{User/Shaders/swap_RGB_GBR.txt => Sys/Shaders/swap_RGB_GBR.glsl} (100%) rename Data/{User/Shaders/swap_RGB_GRB.txt => Sys/Shaders/swap_RGB_GRB.glsl} (100%) rename Data/{User/Shaders/swap_RGB_RBG.txt => Sys/Shaders/swap_RGB_RBG.glsl} (100%) rename Data/{User/Shaders/toxic.txt => Sys/Shaders/toxic.glsl} (100%) diff --git a/Data/User/Shaders/16bit.txt b/Data/Sys/Shaders/16bit.glsl similarity index 100% rename from Data/User/Shaders/16bit.txt rename to Data/Sys/Shaders/16bit.glsl diff --git a/Data/User/Shaders/32bit.txt b/Data/Sys/Shaders/32bit.glsl similarity index 100% rename from Data/User/Shaders/32bit.txt rename to Data/Sys/Shaders/32bit.glsl diff --git a/Data/User/Shaders/README.txt b/Data/Sys/Shaders/README.txt similarity index 100% rename from Data/User/Shaders/README.txt rename to Data/Sys/Shaders/README.txt diff --git a/Data/User/Shaders/acidmetal.txt b/Data/Sys/Shaders/acidmetal.glsl similarity index 100% rename from Data/User/Shaders/acidmetal.txt rename to Data/Sys/Shaders/acidmetal.glsl diff --git a/Data/User/Shaders/acidtrip.txt b/Data/Sys/Shaders/acidtrip.glsl similarity index 100% rename from Data/User/Shaders/acidtrip.txt rename to Data/Sys/Shaders/acidtrip.glsl diff --git a/Data/User/Shaders/acidtrip2.txt b/Data/Sys/Shaders/acidtrip2.glsl similarity index 100% rename from Data/User/Shaders/acidtrip2.txt rename to Data/Sys/Shaders/acidtrip2.glsl diff --git a/Data/User/Shaders/asciiart.txt b/Data/Sys/Shaders/asciiart.glsl similarity index 100% rename from Data/User/Shaders/asciiart.txt rename to Data/Sys/Shaders/asciiart.glsl diff --git a/Data/User/Shaders/auto_toon.txt b/Data/Sys/Shaders/auto_toon.glsl similarity index 100% rename from Data/User/Shaders/auto_toon.txt rename to Data/Sys/Shaders/auto_toon.glsl diff --git a/Data/User/Shaders/auto_toon2.txt b/Data/Sys/Shaders/auto_toon2.glsl similarity index 100% rename from Data/User/Shaders/auto_toon2.txt rename to Data/Sys/Shaders/auto_toon2.glsl diff --git a/Data/User/Shaders/bad_bloom.txt b/Data/Sys/Shaders/bad_bloom.glsl similarity index 100% rename from Data/User/Shaders/bad_bloom.txt rename to Data/Sys/Shaders/bad_bloom.glsl diff --git a/Data/User/Shaders/brighten.txt b/Data/Sys/Shaders/brighten.glsl similarity index 100% rename from Data/User/Shaders/brighten.txt rename to Data/Sys/Shaders/brighten.glsl diff --git a/Data/User/Shaders/chrismas.txt b/Data/Sys/Shaders/chrismas.glsl similarity index 100% rename from Data/User/Shaders/chrismas.txt rename to Data/Sys/Shaders/chrismas.glsl diff --git a/Data/User/Shaders/cool1.txt b/Data/Sys/Shaders/cool1.glsl similarity index 100% rename from Data/User/Shaders/cool1.txt rename to Data/Sys/Shaders/cool1.glsl diff --git a/Data/User/Shaders/darkerbrighter.txt b/Data/Sys/Shaders/darkerbrighter.glsl similarity index 100% rename from Data/User/Shaders/darkerbrighter.txt rename to Data/Sys/Shaders/darkerbrighter.glsl diff --git a/Data/User/Shaders/emboss.txt b/Data/Sys/Shaders/emboss.glsl similarity index 100% rename from Data/User/Shaders/emboss.txt rename to Data/Sys/Shaders/emboss.glsl diff --git a/Data/User/Shaders/fire.txt b/Data/Sys/Shaders/fire.glsl similarity index 100% rename from Data/User/Shaders/fire.txt rename to Data/Sys/Shaders/fire.glsl diff --git a/Data/User/Shaders/fire2.txt b/Data/Sys/Shaders/fire2.glsl similarity index 100% rename from Data/User/Shaders/fire2.txt rename to Data/Sys/Shaders/fire2.glsl diff --git a/Data/User/Shaders/firewater.txt b/Data/Sys/Shaders/firewater.glsl similarity index 100% rename from Data/User/Shaders/firewater.txt rename to Data/Sys/Shaders/firewater.glsl diff --git a/Data/User/Shaders/grayscale.txt b/Data/Sys/Shaders/grayscale.glsl similarity index 100% rename from Data/User/Shaders/grayscale.txt rename to Data/Sys/Shaders/grayscale.glsl diff --git a/Data/User/Shaders/grayscale2.txt b/Data/Sys/Shaders/grayscale2.glsl similarity index 100% rename from Data/User/Shaders/grayscale2.txt rename to Data/Sys/Shaders/grayscale2.glsl diff --git a/Data/User/Shaders/invert.txt b/Data/Sys/Shaders/invert.glsl similarity index 100% rename from Data/User/Shaders/invert.txt rename to Data/Sys/Shaders/invert.glsl diff --git a/Data/User/Shaders/invert_blue.txt b/Data/Sys/Shaders/invert_blue.glsl similarity index 100% rename from Data/User/Shaders/invert_blue.txt rename to Data/Sys/Shaders/invert_blue.glsl diff --git a/Data/User/Shaders/invertedoutline.txt b/Data/Sys/Shaders/invertedoutline.glsl similarity index 100% rename from Data/User/Shaders/invertedoutline.txt rename to Data/Sys/Shaders/invertedoutline.glsl diff --git a/Data/User/Shaders/mad_world.txt b/Data/Sys/Shaders/mad_world.glsl similarity index 100% rename from Data/User/Shaders/mad_world.txt rename to Data/Sys/Shaders/mad_world.glsl diff --git a/Data/User/Shaders/nightvision.txt b/Data/Sys/Shaders/nightvision.glsl similarity index 100% rename from Data/User/Shaders/nightvision.txt rename to Data/Sys/Shaders/nightvision.glsl diff --git a/Data/User/Shaders/nightvision2.txt b/Data/Sys/Shaders/nightvision2.glsl similarity index 100% rename from Data/User/Shaders/nightvision2.txt rename to Data/Sys/Shaders/nightvision2.glsl diff --git a/Data/User/Shaders/nightvision2scanlines.txt b/Data/Sys/Shaders/nightvision2scanlines.glsl similarity index 100% rename from Data/User/Shaders/nightvision2scanlines.txt rename to Data/Sys/Shaders/nightvision2scanlines.glsl diff --git a/Data/User/Shaders/posterize.txt b/Data/Sys/Shaders/posterize.glsl similarity index 100% rename from Data/User/Shaders/posterize.txt rename to Data/Sys/Shaders/posterize.glsl diff --git a/Data/User/Shaders/posterize2.txt b/Data/Sys/Shaders/posterize2.glsl similarity index 100% rename from Data/User/Shaders/posterize2.txt rename to Data/Sys/Shaders/posterize2.glsl diff --git a/Data/User/Shaders/primarycolors.txt b/Data/Sys/Shaders/primarycolors.glsl similarity index 100% rename from Data/User/Shaders/primarycolors.txt rename to Data/Sys/Shaders/primarycolors.glsl diff --git a/Data/User/Shaders/sepia.txt b/Data/Sys/Shaders/sepia.glsl similarity index 100% rename from Data/User/Shaders/sepia.txt rename to Data/Sys/Shaders/sepia.glsl diff --git a/Data/User/Shaders/sketchy.txt b/Data/Sys/Shaders/sketchy.glsl similarity index 100% rename from Data/User/Shaders/sketchy.txt rename to Data/Sys/Shaders/sketchy.glsl diff --git a/Data/User/Shaders/spookey1.txt b/Data/Sys/Shaders/spookey1.glsl similarity index 100% rename from Data/User/Shaders/spookey1.txt rename to Data/Sys/Shaders/spookey1.glsl diff --git a/Data/User/Shaders/spookey2.txt b/Data/Sys/Shaders/spookey2.glsl similarity index 100% rename from Data/User/Shaders/spookey2.txt rename to Data/Sys/Shaders/spookey2.glsl diff --git a/Data/User/Shaders/stereoscopic.txt b/Data/Sys/Shaders/stereoscopic.glsl similarity index 100% rename from Data/User/Shaders/stereoscopic.txt rename to Data/Sys/Shaders/stereoscopic.glsl diff --git a/Data/User/Shaders/stereoscopic2.txt b/Data/Sys/Shaders/stereoscopic2.glsl similarity index 100% rename from Data/User/Shaders/stereoscopic2.txt rename to Data/Sys/Shaders/stereoscopic2.glsl diff --git a/Data/User/Shaders/sunset.txt b/Data/Sys/Shaders/sunset.glsl similarity index 100% rename from Data/User/Shaders/sunset.txt rename to Data/Sys/Shaders/sunset.glsl diff --git a/Data/User/Shaders/swap_RGB_BGR.txt b/Data/Sys/Shaders/swap_RGB_BGR.glsl similarity index 100% rename from Data/User/Shaders/swap_RGB_BGR.txt rename to Data/Sys/Shaders/swap_RGB_BGR.glsl diff --git a/Data/User/Shaders/swap_RGB_BRG.txt b/Data/Sys/Shaders/swap_RGB_BRG.glsl similarity index 100% rename from Data/User/Shaders/swap_RGB_BRG.txt rename to Data/Sys/Shaders/swap_RGB_BRG.glsl diff --git a/Data/User/Shaders/swap_RGB_GBR.txt b/Data/Sys/Shaders/swap_RGB_GBR.glsl similarity index 100% rename from Data/User/Shaders/swap_RGB_GBR.txt rename to Data/Sys/Shaders/swap_RGB_GBR.glsl diff --git a/Data/User/Shaders/swap_RGB_GRB.txt b/Data/Sys/Shaders/swap_RGB_GRB.glsl similarity index 100% rename from Data/User/Shaders/swap_RGB_GRB.txt rename to Data/Sys/Shaders/swap_RGB_GRB.glsl diff --git a/Data/User/Shaders/swap_RGB_RBG.txt b/Data/Sys/Shaders/swap_RGB_RBG.glsl similarity index 100% rename from Data/User/Shaders/swap_RGB_RBG.txt rename to Data/Sys/Shaders/swap_RGB_RBG.glsl diff --git a/Data/User/Shaders/toxic.txt b/Data/Sys/Shaders/toxic.glsl similarity index 100% rename from Data/User/Shaders/toxic.txt rename to Data/Sys/Shaders/toxic.glsl diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 9fae1f2999..7ba77501c0 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -253,27 +253,26 @@ bool DolphinApp::OnInit() //TODO : detect the revision and upgrade where necessary File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP), File::GetUserPath(D_GAMECONFIG_IDX)); - File::CopyDir(std::string(SHARED_USER_DIR SHADERS_DIR DIR_SEP), - File::GetUserPath(D_SHADERS_IDX)); File::CopyDir(std::string(SHARED_USER_DIR WII_USER_DIR DIR_SEP), File::GetUserPath(D_WIIUSER_IDX)); File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP), File::GetUserPath(D_OPENCL_IDX)); File::CreateFullPath(File::GetUserPath(D_USER_IDX)); - File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX)); - File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX)); File::CreateFullPath(File::GetUserPath(D_CACHE_IDX)); + File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX)); File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX)); File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX)); - File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX)); - File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); - File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); - File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX)); - File::CreateFullPath(File::GetUserPath(D_MAPS_IDX)); + File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX)); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP); + File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX)); + File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX)); + File::CreateFullPath(File::GetUserPath(D_MAPS_IDX)); + File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); + File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX)); + File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); LogManager::Init(); SConfig::Init(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp index d5899038fc..c1563a74e2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "CommonPaths.h" #include "FileUtil.h" #include "VideoCommon.h" #include "VideoConfig.h" @@ -150,7 +151,12 @@ void ApplyShader() // loading shader code std::string code; - std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".txt"; + std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".glsl"; + if (!File::Exists(path)) + { + // Fallback to shared user dir + path = File::GetSysDirectory() + SHADERS_DIR DIR_SEP + g_ActiveConfig.sPostProcessingShader + ".glsl"; + } if(!File::ReadFileToString(true, path.c_str(), code)) { ERROR_LOG(VIDEO, "Post-processing shader not found: %s", path.c_str()); return; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 1eb986fe74..9e38b80fed 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -38,6 +38,7 @@ Make AA apply instantly during gameplay if possible #include "Globals.h" #include "Atomic.h" +#include "CommonPaths.h" #include "Thread.h" #include "LogManager.h" @@ -102,25 +103,37 @@ std::string VideoBackend::GetDisplayName() void GetShaders(std::vector &shaders) { + std::set already_found; + shaders.clear(); - if (File::IsDirectory(File::GetUserPath(D_SHADERS_IDX))) + static const std::string directories[] = { + File::GetUserPath(D_SHADERS_IDX), + File::GetSysDirectory() + SHADERS_DIR DIR_SEP, + }; + for (size_t i = 0; i < ArraySize(directories); ++i) { + if (!File::IsDirectory(directories[i])) + continue; + File::FSTEntry entry; - File::ScanDirectoryTree(File::GetUserPath(D_SHADERS_IDX), entry); - for (u32 i = 0; i < entry.children.size(); i++) + File::ScanDirectoryTree(directories[i], entry); + for (u32 j = 0; j < entry.children.size(); j++) { - std::string name = entry.children[i].virtualName.c_str(); - if (!strcasecmp(name.substr(name.size() - 4).c_str(), ".txt")) { - name = name.substr(0, name.size() - 4); - shaders.push_back(name); - } + std::string name = entry.children[j].virtualName.c_str(); + if (name.size() < 5) + continue; + if (strcasecmp(name.substr(name.size() - 5).c_str(), ".glsl")) + continue; + + name = name.substr(0, name.size() - 5); + if (already_found.find(name) != already_found.end()) + continue; + + already_found.insert(name); + shaders.push_back(name); } - std::sort(shaders.begin(), shaders.end()); - } - else - { - File::CreateDir(File::GetUserPath(D_SHADERS_IDX).c_str()); } + std::sort(shaders.begin(), shaders.end()); } void InitBackendInfo() From c3eec379df65ebedfbfce614dee8517c149da0a2 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 03:32:03 +0200 Subject: [PATCH 162/267] Move global User/Wii to Sys/Wii --- Data/Sys/Wii/setting-kor.txt | Bin 256 -> 0 bytes Data/{User => Sys}/Wii/shared2/ec/shopsetu.log | Bin .../{User => Sys}/Wii/shared2/succession/shop.log | Bin Data/{User => Sys}/Wii/shared2/sys/SYSCONF | Bin .../Wii/shared2/wc24/mbox/Readme.txt | 0 .../Wii/shared2/wc24/mbox/wc24recv.ctl | Bin .../Wii/shared2/wc24/mbox/wc24recv.mbx | Bin .../Wii/shared2/wc24/mbox/wc24send.ctl | Bin .../Wii/shared2/wc24/mbox/wc24send.mbx | Bin Data/{User => Sys}/Wii/shared2/wc24/misc.bin | Bin Data/{User => Sys}/Wii/shared2/wc24/nwc24dl.bin | Bin Data/{User => Sys}/Wii/shared2/wc24/nwc24fl.bin | Bin Data/{User => Sys}/Wii/shared2/wc24/nwc24fls.bin | Bin Data/{User => Sys}/Wii/shared2/wc24/nwc24msg.cbk | Bin Data/{User => Sys}/Wii/shared2/wc24/nwc24msg.cfg | Bin .../dolphinemu/dolphinemu/DolphinEmulator.java | 7 +------ Source/Core/DolphinWX/CMakeLists.txt | 3 --- Source/Core/DolphinWX/Src/Main.cpp | 9 +++++---- 18 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 Data/Sys/Wii/setting-kor.txt rename Data/{User => Sys}/Wii/shared2/ec/shopsetu.log (100%) rename Data/{User => Sys}/Wii/shared2/succession/shop.log (100%) rename Data/{User => Sys}/Wii/shared2/sys/SYSCONF (100%) rename Data/{User => Sys}/Wii/shared2/wc24/mbox/Readme.txt (100%) rename Data/{User => Sys}/Wii/shared2/wc24/mbox/wc24recv.ctl (100%) rename Data/{User => Sys}/Wii/shared2/wc24/mbox/wc24recv.mbx (100%) rename Data/{User => Sys}/Wii/shared2/wc24/mbox/wc24send.ctl (100%) rename Data/{User => Sys}/Wii/shared2/wc24/mbox/wc24send.mbx (100%) rename Data/{User => Sys}/Wii/shared2/wc24/misc.bin (100%) rename Data/{User => Sys}/Wii/shared2/wc24/nwc24dl.bin (100%) rename Data/{User => Sys}/Wii/shared2/wc24/nwc24fl.bin (100%) rename Data/{User => Sys}/Wii/shared2/wc24/nwc24fls.bin (100%) rename Data/{User => Sys}/Wii/shared2/wc24/nwc24msg.cbk (100%) rename Data/{User => Sys}/Wii/shared2/wc24/nwc24msg.cfg (100%) diff --git a/Data/Sys/Wii/setting-kor.txt b/Data/Sys/Wii/setting-kor.txt deleted file mode 100644 index 8c0485555498314da6e852416b9bf1cdce02578c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%ute3Ov-Zo#VH(vPsx$W%c+-~=y6Moo!+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs7|4CQhSgqN-_2iAm)63TLyI%S`!BAnzybmg`9&o-eeQ@!E-lShn MTi1X8$1tb?07>;b#{d8T diff --git a/Data/User/Wii/shared2/ec/shopsetu.log b/Data/Sys/Wii/shared2/ec/shopsetu.log similarity index 100% rename from Data/User/Wii/shared2/ec/shopsetu.log rename to Data/Sys/Wii/shared2/ec/shopsetu.log diff --git a/Data/User/Wii/shared2/succession/shop.log b/Data/Sys/Wii/shared2/succession/shop.log similarity index 100% rename from Data/User/Wii/shared2/succession/shop.log rename to Data/Sys/Wii/shared2/succession/shop.log diff --git a/Data/User/Wii/shared2/sys/SYSCONF b/Data/Sys/Wii/shared2/sys/SYSCONF similarity index 100% rename from Data/User/Wii/shared2/sys/SYSCONF rename to Data/Sys/Wii/shared2/sys/SYSCONF diff --git a/Data/User/Wii/shared2/wc24/mbox/Readme.txt b/Data/Sys/Wii/shared2/wc24/mbox/Readme.txt similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/Readme.txt rename to Data/Sys/Wii/shared2/wc24/mbox/Readme.txt diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl rename to Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx rename to Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/wc24send.ctl rename to Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/wc24send.mbx rename to Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx diff --git a/Data/User/Wii/shared2/wc24/misc.bin b/Data/Sys/Wii/shared2/wc24/misc.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/misc.bin rename to Data/Sys/Wii/shared2/wc24/misc.bin diff --git a/Data/User/Wii/shared2/wc24/nwc24dl.bin b/Data/Sys/Wii/shared2/wc24/nwc24dl.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/nwc24dl.bin rename to Data/Sys/Wii/shared2/wc24/nwc24dl.bin diff --git a/Data/User/Wii/shared2/wc24/nwc24fl.bin b/Data/Sys/Wii/shared2/wc24/nwc24fl.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/nwc24fl.bin rename to Data/Sys/Wii/shared2/wc24/nwc24fl.bin diff --git a/Data/User/Wii/shared2/wc24/nwc24fls.bin b/Data/Sys/Wii/shared2/wc24/nwc24fls.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/nwc24fls.bin rename to Data/Sys/Wii/shared2/wc24/nwc24fls.bin diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cbk b/Data/Sys/Wii/shared2/wc24/nwc24msg.cbk similarity index 100% rename from Data/User/Wii/shared2/wc24/nwc24msg.cbk rename to Data/Sys/Wii/shared2/wc24/nwc24msg.cbk diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cfg b/Data/Sys/Wii/shared2/wc24/nwc24msg.cfg similarity index 100% rename from Data/User/Wii/shared2/wc24/nwc24msg.cfg rename to Data/Sys/Wii/shared2/wc24/nwc24msg.cfg diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 6703c5710c..07bfaf8a63 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -64,10 +64,9 @@ public final class DolphinEmulator extends Activity String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; String ConfigDir = BaseDir + File.separator + "Config"; String GCDir = BaseDir + File.separator + "GC"; - String WiiDir = BaseDir + File.separator + "Wii"; // Copy assets if needed - File file = new File(WiiDir + File.separator + "setting-usa.txt"); + File file = new File(GCDir + File.separator + "font_sjis.bin"); if(!file.exists()) { NativeLibrary.CreateUserFolders(); @@ -81,10 +80,6 @@ public final class DolphinEmulator extends Activity CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); CopyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.bin"); - CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt"); - CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt"); - CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt"); - CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt"); } // Load the configuration keys set in the Dolphin ini and gfx ini files diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index cf75db6a75..5a5a836b65 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -212,9 +212,6 @@ if(ANDROID) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/ ) - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/Wii/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/ - ) else() add_executable(${DOLPHIN_EXE} ${SRCS}) target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 7ba77501c0..eac7be46b3 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -249,12 +249,13 @@ bool DolphinApp::OnInit() } #endif - //create all necessary directories in user directory - //TODO : detect the revision and upgrade where necessary + // Copy initial Wii NAND data from Sys to User. + File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, + File::GetUserPath(D_WIIUSER_IDX)); + + // TODO: replace these with overlays File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP), File::GetUserPath(D_GAMECONFIG_IDX)); - File::CopyDir(std::string(SHARED_USER_DIR WII_USER_DIR DIR_SEP), - File::GetUserPath(D_WIIUSER_IDX)); File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP), File::GetUserPath(D_OPENCL_IDX)); From 91a758b3426a284daada4ad49ab8beab2e1837e3 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 03:44:16 +0200 Subject: [PATCH 163/267] Move TextureDecoder.cl from User to Sys --- Data/{User => Sys}/OpenCL/TextureDecoder.cl | 0 Source/Core/DolphinWX/Src/Main.cpp | 3 +-- Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) rename Data/{User => Sys}/OpenCL/TextureDecoder.cl (100%) diff --git a/Data/User/OpenCL/TextureDecoder.cl b/Data/Sys/OpenCL/TextureDecoder.cl similarity index 100% rename from Data/User/OpenCL/TextureDecoder.cl rename to Data/Sys/OpenCL/TextureDecoder.cl diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index eac7be46b3..3965943b89 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -256,8 +256,6 @@ bool DolphinApp::OnInit() // TODO: replace these with overlays File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP), File::GetUserPath(D_GAMECONFIG_IDX)); - File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP), - File::GetUserPath(D_OPENCL_IDX)); File::CreateFullPath(File::GetUserPath(D_USER_IDX)); File::CreateFullPath(File::GetUserPath(D_CACHE_IDX)); @@ -271,6 +269,7 @@ bool DolphinApp::OnInit() File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX)); File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX)); File::CreateFullPath(File::GetUserPath(D_MAPS_IDX)); + File::CreateFullPath(File::GetUserPath(D_OPENCL_IDX)); File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX)); File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp index a9c6977d42..211244c457 100644 --- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp @@ -5,6 +5,7 @@ #include "OCLTextureDecoder.h" #include "../OpenCL.h" +#include "CommonPaths.h" #include "FileUtil.h" #include @@ -138,7 +139,7 @@ void TexDecoder_OpenCL_Initialize() if (err) { std::string code; - filename = File::GetUserPath(D_OPENCL_IDX) + "TextureDecoder.cl"; + filename = File::GetSysDirectory() + OPENCL_DIR DIR_SEP "TextureDecoder.cl"; if (!File::ReadFileToString(true, filename.c_str(), code)) { ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename.c_str()); From 86e765f3eb3a5a097a91868fe24b74648edd210d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 03:55:16 +0200 Subject: [PATCH 164/267] Move Themes/ from User to Sys. Only Gameinis remain. --- Data/{User => Sys}/Themes/Boomy/README.txt | 0 Data/{User => Sys}/Themes/Boomy/browse.png | Bin Data/{User => Sys}/Themes/Boomy/config.png | Bin Data/{User => Sys}/Themes/Boomy/dsp.png | Bin Data/{User => Sys}/Themes/Boomy/fullscreen.png | Bin Data/{User => Sys}/Themes/Boomy/gcpad.png | Bin Data/{User => Sys}/Themes/Boomy/graphics.png | Bin Data/{User => Sys}/Themes/Boomy/help.png | Bin Data/{User => Sys}/Themes/Boomy/nobanner.png | Bin Data/{User => Sys}/Themes/Boomy/open.png | Bin Data/{User => Sys}/Themes/Boomy/pause.png | Bin Data/{User => Sys}/Themes/Boomy/play.png | Bin Data/{User => Sys}/Themes/Boomy/refresh.png | Bin Data/{User => Sys}/Themes/Boomy/screenshot.png | Bin Data/{User => Sys}/Themes/Boomy/stop.png | Bin Data/{User => Sys}/Themes/Boomy/wiimote.png | Bin Source/Core/Common/Src/FileUtil.cpp | 6 ++---- Source/Core/DolphinWX/Src/ConfigMain.cpp | 4 +--- Source/Core/DolphinWX/Src/Main.cpp | 1 + 19 files changed, 4 insertions(+), 7 deletions(-) rename Data/{User => Sys}/Themes/Boomy/README.txt (100%) rename Data/{User => Sys}/Themes/Boomy/browse.png (100%) rename Data/{User => Sys}/Themes/Boomy/config.png (100%) rename Data/{User => Sys}/Themes/Boomy/dsp.png (100%) rename Data/{User => Sys}/Themes/Boomy/fullscreen.png (100%) rename Data/{User => Sys}/Themes/Boomy/gcpad.png (100%) rename Data/{User => Sys}/Themes/Boomy/graphics.png (100%) rename Data/{User => Sys}/Themes/Boomy/help.png (100%) rename Data/{User => Sys}/Themes/Boomy/nobanner.png (100%) rename Data/{User => Sys}/Themes/Boomy/open.png (100%) rename Data/{User => Sys}/Themes/Boomy/pause.png (100%) rename Data/{User => Sys}/Themes/Boomy/play.png (100%) rename Data/{User => Sys}/Themes/Boomy/refresh.png (100%) rename Data/{User => Sys}/Themes/Boomy/screenshot.png (100%) rename Data/{User => Sys}/Themes/Boomy/stop.png (100%) rename Data/{User => Sys}/Themes/Boomy/wiimote.png (100%) diff --git a/Data/User/Themes/Boomy/README.txt b/Data/Sys/Themes/Boomy/README.txt similarity index 100% rename from Data/User/Themes/Boomy/README.txt rename to Data/Sys/Themes/Boomy/README.txt diff --git a/Data/User/Themes/Boomy/browse.png b/Data/Sys/Themes/Boomy/browse.png similarity index 100% rename from Data/User/Themes/Boomy/browse.png rename to Data/Sys/Themes/Boomy/browse.png diff --git a/Data/User/Themes/Boomy/config.png b/Data/Sys/Themes/Boomy/config.png similarity index 100% rename from Data/User/Themes/Boomy/config.png rename to Data/Sys/Themes/Boomy/config.png diff --git a/Data/User/Themes/Boomy/dsp.png b/Data/Sys/Themes/Boomy/dsp.png similarity index 100% rename from Data/User/Themes/Boomy/dsp.png rename to Data/Sys/Themes/Boomy/dsp.png diff --git a/Data/User/Themes/Boomy/fullscreen.png b/Data/Sys/Themes/Boomy/fullscreen.png similarity index 100% rename from Data/User/Themes/Boomy/fullscreen.png rename to Data/Sys/Themes/Boomy/fullscreen.png diff --git a/Data/User/Themes/Boomy/gcpad.png b/Data/Sys/Themes/Boomy/gcpad.png similarity index 100% rename from Data/User/Themes/Boomy/gcpad.png rename to Data/Sys/Themes/Boomy/gcpad.png diff --git a/Data/User/Themes/Boomy/graphics.png b/Data/Sys/Themes/Boomy/graphics.png similarity index 100% rename from Data/User/Themes/Boomy/graphics.png rename to Data/Sys/Themes/Boomy/graphics.png diff --git a/Data/User/Themes/Boomy/help.png b/Data/Sys/Themes/Boomy/help.png similarity index 100% rename from Data/User/Themes/Boomy/help.png rename to Data/Sys/Themes/Boomy/help.png diff --git a/Data/User/Themes/Boomy/nobanner.png b/Data/Sys/Themes/Boomy/nobanner.png similarity index 100% rename from Data/User/Themes/Boomy/nobanner.png rename to Data/Sys/Themes/Boomy/nobanner.png diff --git a/Data/User/Themes/Boomy/open.png b/Data/Sys/Themes/Boomy/open.png similarity index 100% rename from Data/User/Themes/Boomy/open.png rename to Data/Sys/Themes/Boomy/open.png diff --git a/Data/User/Themes/Boomy/pause.png b/Data/Sys/Themes/Boomy/pause.png similarity index 100% rename from Data/User/Themes/Boomy/pause.png rename to Data/Sys/Themes/Boomy/pause.png diff --git a/Data/User/Themes/Boomy/play.png b/Data/Sys/Themes/Boomy/play.png similarity index 100% rename from Data/User/Themes/Boomy/play.png rename to Data/Sys/Themes/Boomy/play.png diff --git a/Data/User/Themes/Boomy/refresh.png b/Data/Sys/Themes/Boomy/refresh.png similarity index 100% rename from Data/User/Themes/Boomy/refresh.png rename to Data/Sys/Themes/Boomy/refresh.png diff --git a/Data/User/Themes/Boomy/screenshot.png b/Data/Sys/Themes/Boomy/screenshot.png similarity index 100% rename from Data/User/Themes/Boomy/screenshot.png rename to Data/Sys/Themes/Boomy/screenshot.png diff --git a/Data/User/Themes/Boomy/stop.png b/Data/Sys/Themes/Boomy/stop.png similarity index 100% rename from Data/User/Themes/Boomy/stop.png rename to Data/Sys/Themes/Boomy/stop.png diff --git a/Data/User/Themes/Boomy/wiimote.png b/Data/Sys/Themes/Boomy/wiimote.png similarity index 100% rename from Data/User/Themes/Boomy/wiimote.png rename to Data/Sys/Themes/Boomy/wiimote.png diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 92e9674ff2..e37689ad0a 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -861,12 +861,10 @@ std::string GetThemeDir(const std::string& theme_name) { std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/"; -#if !defined(_WIN32) // If theme does not exist in user's dir load from shared directory if (!File::Exists(dir)) - dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/"; -#endif - + dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/"; + return dir; } diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 168e046c29..7da1226d64 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -598,9 +598,7 @@ void CConfigMain::CreateGUIControls() CFileSearch::XStringVector theme_dirs; theme_dirs.push_back(File::GetUserPath(D_THEMES_IDX)); -#if !defined(_WIN32) - theme_dirs.push_back(SHARED_USER_DIR THEMES_DIR); -#endif + theme_dirs.push_back(File::GetSysDirectory() + THEMES_DIR); CFileSearch cfs(CFileSearch::XStringVector(1, "*"), theme_dirs); auto const& sv = cfs.GetFileNames(); diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 3965943b89..c354b640e3 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -273,6 +273,7 @@ bool DolphinApp::OnInit() File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX)); File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); + File::CreateFullPath(File::GetUserPath(D_THEMES_IDX)); LogManager::Init(); SConfig::Init(); From aa202c2e219bc026b87ee743bb2c5055d991f439 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 12 Sep 2013 17:26:04 +0200 Subject: [PATCH 165/267] Move global gameinis from User to Sys. Get rid of SHARED_USER. --- CMakeLists.txt | 1 - Data/{User => Sys}/GameConfig/D43E01.ini | 0 Data/{User => Sys}/GameConfig/D43J01.ini | 0 Data/{User => Sys}/GameConfig/D43P01.ini | 0 Data/{User => Sys}/GameConfig/D43U01.ini | 0 Data/{User => Sys}/GameConfig/DTLX01.ini | 0 Data/{User => Sys}/GameConfig/DVDXDV.ini | 0 Data/{User => Sys}/GameConfig/FABP01.ini | 0 Data/{User => Sys}/GameConfig/FBYE01.ini | 0 Data/{User => Sys}/GameConfig/G2BE5G.ini | 0 Data/{User => Sys}/GameConfig/G2BP7D.ini | 0 Data/{User => Sys}/GameConfig/G2CE52.ini | 0 Data/{User => Sys}/GameConfig/G2FE78.ini | 0 Data/{User => Sys}/GameConfig/G2GJB2.ini | 0 Data/{User => Sys}/GameConfig/G2ME01.ini | 0 Data/{User => Sys}/GameConfig/G2MP01.ini | 0 Data/{User => Sys}/GameConfig/G2OE41.ini | 0 Data/{User => Sys}/GameConfig/G2OP41.ini | 0 Data/{User => Sys}/GameConfig/G2RE52.ini | 0 Data/{User => Sys}/GameConfig/G2TE52.ini | 0 Data/{User => Sys}/GameConfig/G2VE08.ini | 0 Data/{User => Sys}/GameConfig/G2VP08.ini | 0 Data/{User => Sys}/GameConfig/G2XE8P.ini | 0 Data/{User => Sys}/GameConfig/G2XP8P.ini | 0 Data/{User => Sys}/GameConfig/G3AD69.ini | 0 Data/{User => Sys}/GameConfig/G3AE69.ini | 0 Data/{User => Sys}/GameConfig/G3AF69.ini | 0 Data/{User => Sys}/GameConfig/G3AP69.ini | 0 Data/{User => Sys}/GameConfig/G3DE6L.ini | 0 Data/{User => Sys}/GameConfig/G3EE51.ini | 0 Data/{User => Sys}/GameConfig/G3FE69.ini | 0 Data/{User => Sys}/GameConfig/G3FF69.ini | 0 Data/{User => Sys}/GameConfig/G3FP69.ini | 0 Data/{User => Sys}/GameConfig/G3JEAF.ini | 0 Data/{User => Sys}/GameConfig/G3LE8P.ini | 0 Data/{User => Sys}/GameConfig/G3NJDA.ini | 0 Data/{User => Sys}/GameConfig/G3QEA4.ini | 0 Data/{User => Sys}/GameConfig/G3RD52.ini | 0 Data/{User => Sys}/GameConfig/G3RE52.ini | 0 Data/{User => Sys}/GameConfig/G3RF52.ini | 0 Data/{User => Sys}/GameConfig/G3RP52.ini | 0 Data/{User => Sys}/GameConfig/G3SE41.ini | 0 Data/{User => Sys}/GameConfig/G3VE69.ini | 0 Data/{User => Sys}/GameConfig/G3XE52.ini | 0 Data/{User => Sys}/GameConfig/G3XP52.ini | 0 Data/{User => Sys}/GameConfig/G4AEE9.ini | 0 Data/{User => Sys}/GameConfig/G4BE08.ini | 0 Data/{User => Sys}/GameConfig/G4BP08.ini | 0 Data/{User => Sys}/GameConfig/G4CE54.ini | 0 Data/{User => Sys}/GameConfig/G4FD69.ini | 0 Data/{User => Sys}/GameConfig/G4FE69.ini | 0 Data/{User => Sys}/GameConfig/G4FF69.ini | 0 Data/{User => Sys}/GameConfig/G4FP69.ini | 0 Data/{User => Sys}/GameConfig/G4GEE9.ini | 0 Data/{User => Sys}/GameConfig/G4ME69.ini | 0 Data/{User => Sys}/GameConfig/G4MP69.ini | 0 Data/{User => Sys}/GameConfig/G4NJDA.ini | 0 Data/{User => Sys}/GameConfig/G4QE01.ini | 0 Data/{User => Sys}/GameConfig/G4QP01.ini | 0 Data/{User => Sys}/GameConfig/G4SE01.ini | 0 Data/{User => Sys}/GameConfig/G4SP01.ini | 0 Data/{User => Sys}/GameConfig/G4ZE69.ini | 0 Data/{User => Sys}/GameConfig/G5DE78.ini | 0 Data/{User => Sys}/GameConfig/G5DP78.ini | 0 Data/{User => Sys}/GameConfig/G5SE7D.ini | 0 Data/{User => Sys}/GameConfig/G5SP7D.ini | 0 Data/{User => Sys}/GameConfig/G63E41.ini | 0 Data/{User => Sys}/GameConfig/G63P41.ini | 0 Data/{User => Sys}/GameConfig/G6FE69.ini | 0 Data/{User => Sys}/GameConfig/G6NE69.ini | 0 Data/{User => Sys}/GameConfig/G6NP69.ini | 0 Data/{User => Sys}/GameConfig/G6QE08.ini | 0 Data/{User => Sys}/GameConfig/G6TE5G.ini | 0 Data/{User => Sys}/GameConfig/G6TP5G.ini | 0 Data/{User => Sys}/GameConfig/G89EAF.ini | 0 Data/{User => Sys}/GameConfig/G8FE8P.ini | 0 Data/{User => Sys}/GameConfig/G8ME01.ini | 0 Data/{User => Sys}/GameConfig/G8MJ01.ini | 0 Data/{User => Sys}/GameConfig/G8MP01.ini | 0 Data/{User => Sys}/GameConfig/G8OJ18.ini | 0 Data/{User => Sys}/GameConfig/G8SJAF.ini | 0 Data/{User => Sys}/GameConfig/G8WE01.ini | 0 Data/{User => Sys}/GameConfig/G8WP01.ini | 0 Data/{User => Sys}/GameConfig/G9BEE9.ini | 0 Data/{User => Sys}/GameConfig/G9RE7D.ini | 0 Data/{User => Sys}/GameConfig/G9SE8P.ini | 0 Data/{User => Sys}/GameConfig/G9SJ8P.ini | 0 Data/{User => Sys}/GameConfig/G9SP8P.ini | 0 Data/{User => Sys}/GameConfig/G9TD52.ini | 0 Data/{User => Sys}/GameConfig/G9TE52.ini | 0 Data/{User => Sys}/GameConfig/G9TF52.ini | 0 Data/{User => Sys}/GameConfig/G9TI52.ini | 0 Data/{User => Sys}/GameConfig/G9TP52.ini | 0 Data/{User => Sys}/GameConfig/GA2E51.ini | 0 Data/{User => Sys}/GameConfig/GA3E51.ini | 0 Data/{User => Sys}/GameConfig/GA4E51.ini | 0 Data/{User => Sys}/GameConfig/GA7E70.ini | 0 Data/{User => Sys}/GameConfig/GABEAF.ini | 0 Data/{User => Sys}/GameConfig/GACE5H.ini | 0 Data/{User => Sys}/GameConfig/GAFE01.ini | 0 Data/{User => Sys}/GameConfig/GAFJ01.ini | 0 Data/{User => Sys}/GameConfig/GAFP01.ini | 0 Data/{User => Sys}/GameConfig/GAFU01.ini | 0 Data/{User => Sys}/GameConfig/GAGP70.ini | 0 Data/{User => Sys}/GameConfig/GAHEGG.ini | 0 Data/{User => Sys}/GameConfig/GALE01.ini | 0 Data/{User => Sys}/GameConfig/GALJ01.ini | 0 Data/{User => Sys}/GameConfig/GALP01.ini | 0 Data/{User => Sys}/GameConfig/GAME5H.ini | 0 Data/{User => Sys}/GameConfig/GANE7U.ini | 0 Data/{User => Sys}/GameConfig/GAPE52.ini | 0 Data/{User => Sys}/GameConfig/GAQE6S.ini | 0 Data/{User => Sys}/GameConfig/GARE5H.ini | 0 Data/{User => Sys}/GameConfig/GATE51.ini | 0 Data/{User => Sys}/GameConfig/GATP51.ini | 0 Data/{User => Sys}/GameConfig/GAUE08.ini | 0 Data/{User => Sys}/GameConfig/GAUJ08.ini | 0 Data/{User => Sys}/GameConfig/GAVE78.ini | 0 Data/{User => Sys}/GameConfig/GAVP78.ini | 0 Data/{User => Sys}/GameConfig/GAVY78.ini | 0 Data/{User => Sys}/GameConfig/GAXE5D.ini | 0 Data/{User => Sys}/GameConfig/GAZD69.ini | 0 Data/{User => Sys}/GameConfig/GAZE69.ini | 0 Data/{User => Sys}/GameConfig/GAZF69.ini | 0 Data/{User => Sys}/GameConfig/GAZH69.ini | 0 Data/{User => Sys}/GameConfig/GAZI69.ini | 0 Data/{User => Sys}/GameConfig/GAZJ69.ini | 0 Data/{User => Sys}/GameConfig/GAZM69.ini | 0 Data/{User => Sys}/GameConfig/GAZP69.ini | 0 Data/{User => Sys}/GameConfig/GAZS69.ini | 0 Data/{User => Sys}/GameConfig/GB3E51.ini | 0 Data/{User => Sys}/GameConfig/GB4E51.ini | 0 Data/{User => Sys}/GameConfig/GB4P51.ini | 0 Data/{User => Sys}/GameConfig/GBDE5G.ini | 0 Data/{User => Sys}/GameConfig/GBDS7D.ini | 0 Data/{User => Sys}/GameConfig/GBFE70.ini | 0 Data/{User => Sys}/GameConfig/GBGE5G.ini | 0 Data/{User => Sys}/GameConfig/GBGP7D.ini | 0 Data/{User => Sys}/GameConfig/GBHDC8.ini | 0 Data/{User => Sys}/GameConfig/GBHEC8.ini | 0 Data/{User => Sys}/GameConfig/GBHFC8.ini | 0 Data/{User => Sys}/GameConfig/GBHPC8.ini | 0 Data/{User => Sys}/GameConfig/GBIE08.ini | 0 Data/{User => Sys}/GameConfig/GBIP08.ini | 0 Data/{User => Sys}/GameConfig/GBKE70.ini | 0 Data/{User => Sys}/GameConfig/GBLE52.ini | 0 Data/{User => Sys}/GameConfig/GBLP52.ini | 0 Data/{User => Sys}/GameConfig/GBLPGL.ini | 0 Data/{User => Sys}/GameConfig/GBME7F.ini | 0 Data/{User => Sys}/GameConfig/GBMP7F.ini | 0 Data/{User => Sys}/GameConfig/GBOP51.ini | 0 Data/{User => Sys}/GameConfig/GBQE78.ini | 0 Data/{User => Sys}/GameConfig/GBSE8P.ini | 0 Data/{User => Sys}/GameConfig/GBSP8P.ini | 0 Data/{User => Sys}/GameConfig/GBTE70.ini | 0 Data/{User => Sys}/GameConfig/GBVE41.ini | 0 Data/{User => Sys}/GameConfig/GBVP41.ini | 0 Data/{User => Sys}/GameConfig/GBWD64.ini | 0 Data/{User => Sys}/GameConfig/GBWE64.ini | 0 Data/{User => Sys}/GameConfig/GBWF64.ini | 0 Data/{User => Sys}/GameConfig/GBWP64.ini | 0 Data/{User => Sys}/GameConfig/GBXE51.ini | 0 Data/{User => Sys}/GameConfig/GBYE0A.ini | 0 Data/{User => Sys}/GameConfig/GBZE08.ini | 0 Data/{User => Sys}/GameConfig/GBZP08.ini | 0 Data/{User => Sys}/GameConfig/GC2E9G.ini | 0 Data/{User => Sys}/GameConfig/GC3D78.ini | 0 Data/{User => Sys}/GameConfig/GC3E78.ini | 0 Data/{User => Sys}/GameConfig/GC3F78.ini | 0 Data/{User => Sys}/GameConfig/GC3P78.ini | 0 Data/{User => Sys}/GameConfig/GC4JBN.ini | 0 Data/{User => Sys}/GameConfig/GC5PNK.ini | 0 Data/{User => Sys}/GameConfig/GC6E01.ini | 0 Data/{User => Sys}/GameConfig/GC6P01.ini | 0 Data/{User => Sys}/GameConfig/GC7PNK.ini | 0 Data/{User => Sys}/GameConfig/GC9P6S.ini | 0 Data/{User => Sys}/GameConfig/GCAE5H.ini | 0 Data/{User => Sys}/GameConfig/GCBE7D.ini | 0 Data/{User => Sys}/GameConfig/GCBP7D.ini | 0 Data/{User => Sys}/GameConfig/GCCE01.ini | 0 Data/{User => Sys}/GameConfig/GCCP01.ini | 0 Data/{User => Sys}/GameConfig/GCDE08.ini | 0 Data/{User => Sys}/GameConfig/GCDP08.ini | 0 Data/{User => Sys}/GameConfig/GCEE41.ini | 0 Data/{User => Sys}/GameConfig/GCEP41.ini | 0 Data/{User => Sys}/GameConfig/GCFE9G.ini | 0 Data/{User => Sys}/GameConfig/GCGE41.ini | 0 Data/{User => Sys}/GameConfig/GCHE78.ini | 0 Data/{User => Sys}/GameConfig/GCJE41.ini | 0 Data/{User => Sys}/GameConfig/GCJP41.ini | 0 Data/{User => Sys}/GameConfig/GCLP69.ini | 0 Data/{User => Sys}/GameConfig/GCNE7D.ini | 0 Data/{User => Sys}/GameConfig/GCNP7D.ini | 0 Data/{User => Sys}/GameConfig/GCOE52.ini | 0 Data/{User => Sys}/GameConfig/GCOPDV.ini | 0 Data/{User => Sys}/GameConfig/GCPE6S.ini | 0 Data/{User => Sys}/GameConfig/GCPP6S.ini | 0 Data/{User => Sys}/GameConfig/GCQE7D.ini | 0 Data/{User => Sys}/GameConfig/GCQP7D.ini | 0 Data/{User => Sys}/GameConfig/GCSEAF.ini | 0 Data/{User => Sys}/GameConfig/GCTE51.ini | 0 Data/{User => Sys}/GameConfig/GCTP51.ini | 0 Data/{User => Sys}/GameConfig/GCVEEB.ini | 0 Data/{User => Sys}/GameConfig/GCZE69.ini | 0 Data/{User => Sys}/GameConfig/GCZP69.ini | 0 Data/{User => Sys}/GameConfig/GD4E6S.ini | 0 Data/{User => Sys}/GameConfig/GD6EB2.ini | 0 Data/{User => Sys}/GameConfig/GD6P70.ini | 0 Data/{User => Sys}/GameConfig/GD7PB2.ini | 0 Data/{User => Sys}/GameConfig/GD9E69.ini | 0 Data/{User => Sys}/GameConfig/GD9P69.ini | 0 Data/{User => Sys}/GameConfig/GDDE41.ini | 0 Data/{User => Sys}/GameConfig/GDEE71.ini | 0 Data/{User => Sys}/GameConfig/GDFE5D.ini | 0 Data/{User => Sys}/GameConfig/GDFP5D.ini | 0 Data/{User => Sys}/GameConfig/GDGE7H.ini | 0 Data/{User => Sys}/GameConfig/GDGP78.ini | 0 Data/{User => Sys}/GameConfig/GDIE7D.ini | 0 Data/{User => Sys}/GameConfig/GDIP7D.ini | 0 Data/{User => Sys}/GameConfig/GDJEB2.ini | 0 Data/{User => Sys}/GameConfig/GDKEA4.ini | 0 Data/{User => Sys}/GameConfig/GDLEA4.ini | 0 Data/{User => Sys}/GameConfig/GDME01.ini | 0 Data/{User => Sys}/GameConfig/GDQP6S.ini | 0 Data/{User => Sys}/GameConfig/GDREAF.ini | 0 Data/{User => Sys}/GameConfig/GDSE78.ini | 0 Data/{User => Sys}/GameConfig/GDSP78.ini | 0 Data/{User => Sys}/GameConfig/GDTE69.ini | 0 Data/{User => Sys}/GameConfig/GDVE6L.ini | 0 Data/{User => Sys}/GameConfig/GDVP6L.ini | 0 Data/{User => Sys}/GameConfig/GDWEA4.ini | 0 Data/{User => Sys}/GameConfig/GE4E7D.ini | 0 Data/{User => Sys}/GameConfig/GE5EA4.ini | 0 Data/{User => Sys}/GameConfig/GE9E5D.ini | 0 Data/{User => Sys}/GameConfig/GEAE8P.ini | 0 Data/{User => Sys}/GameConfig/GEAP8P.ini | 0 Data/{User => Sys}/GameConfig/GEBEA4.ini | 0 Data/{User => Sys}/GameConfig/GEDE01.ini | 0 Data/{User => Sys}/GameConfig/GEDP01.ini | 0 Data/{User => Sys}/GameConfig/GEME7F.ini | 0 Data/{User => Sys}/GameConfig/GEND69.ini | 0 Data/{User => Sys}/GameConfig/GENE69.ini | 0 Data/{User => Sys}/GameConfig/GENP69.ini | 0 Data/{User => Sys}/GameConfig/GENS69.ini | 0 Data/{User => Sys}/GameConfig/GEOE08.ini | 0 Data/{User => Sys}/GameConfig/GEOP08.ini | 0 Data/{User => Sys}/GameConfig/GESEA4.ini | 0 Data/{User => Sys}/GameConfig/GEWE41.ini | 0 Data/{User => Sys}/GameConfig/GEXE52.ini | 0 Data/{User => Sys}/GameConfig/GEYE69.ini | 0 Data/{User => Sys}/GameConfig/GEZE8P.ini | 0 Data/{User => Sys}/GameConfig/GEZP8P.ini | 0 Data/{User => Sys}/GameConfig/GF2E69.ini | 0 Data/{User => Sys}/GameConfig/GF4E52.ini | 0 Data/{User => Sys}/GameConfig/GF4F52.ini | 0 Data/{User => Sys}/GameConfig/GF4P52.ini | 0 Data/{User => Sys}/GameConfig/GF5E69.ini | 0 Data/{User => Sys}/GameConfig/GF6E69.ini | 0 Data/{User => Sys}/GameConfig/GF6F69.ini | 0 Data/{User => Sys}/GameConfig/GF7E01.ini | 0 Data/{User => Sys}/GameConfig/GF7P01.ini | 0 Data/{User => Sys}/GameConfig/GF8E69.ini | 0 Data/{User => Sys}/GameConfig/GF8P69.ini | 0 Data/{User => Sys}/GameConfig/GFAD69.ini | 0 Data/{User => Sys}/GameConfig/GFAE69.ini | 0 Data/{User => Sys}/GameConfig/GFAP69.ini | 0 Data/{User => Sys}/GameConfig/GFAS69.ini | 0 Data/{User => Sys}/GameConfig/GFBE5D.ini | 0 Data/{User => Sys}/GameConfig/GFCP69.ini | 0 Data/{User => Sys}/GameConfig/GFDD69.ini | 0 Data/{User => Sys}/GameConfig/GFDE69.ini | 0 Data/{User => Sys}/GameConfig/GFEE01.ini | 0 Data/{User => Sys}/GameConfig/GFEJ01.ini | 0 Data/{User => Sys}/GameConfig/GFEP01.ini | 0 Data/{User => Sys}/GameConfig/GFFE5D.ini | 0 Data/{User => Sys}/GameConfig/GFGEA4.ini | 0 Data/{User => Sys}/GameConfig/GFHP6V.ini | 0 Data/{User => Sys}/GameConfig/GFKE69.ini | 0 Data/{User => Sys}/GameConfig/GFPEA4.ini | 0 Data/{User => Sys}/GameConfig/GFQEA4.ini | 0 Data/{User => Sys}/GameConfig/GFTE01.ini | 0 Data/{User => Sys}/GameConfig/GFTP01.ini | 0 Data/{User => Sys}/GameConfig/GFUE4Z.ini | 0 Data/{User => Sys}/GameConfig/GFYE69.ini | 0 Data/{User => Sys}/GameConfig/GFYP69.ini | 0 Data/{User => Sys}/GameConfig/GFZE01.ini | 0 Data/{User => Sys}/GameConfig/GFZJ01.ini | 0 Data/{User => Sys}/GameConfig/GFZP01.ini | 0 Data/{User => Sys}/GameConfig/GG4E08.ini | 0 Data/{User => Sys}/GameConfig/GG4P08.ini | 0 Data/{User => Sys}/GameConfig/GG5E52.ini | 0 Data/{User => Sys}/GameConfig/GGAJB2.ini | 0 Data/{User => Sys}/GameConfig/GGCE0A.ini | 0 Data/{User => Sys}/GameConfig/GGCOSD.ini | 0 Data/{User => Sys}/GameConfig/GGEE41.ini | 0 Data/{User => Sys}/GameConfig/GGEP41.ini | 0 Data/{User => Sys}/GameConfig/GGEY41.ini | 0 Data/{User => Sys}/GameConfig/GGME00.ini | 0 Data/{User => Sys}/GameConfig/GGPJB2.ini | 0 Data/{User => Sys}/GameConfig/GGRE41.ini | 0 Data/{User => Sys}/GameConfig/GGSEA4.ini | 0 Data/{User => Sys}/GameConfig/GGSJA4.ini | 0 Data/{User => Sys}/GameConfig/GGSPA4.ini | 0 Data/{User => Sys}/GameConfig/GGTE01.ini | 0 Data/{User => Sys}/GameConfig/GGTP01.ini | 0 Data/{User => Sys}/GameConfig/GGYE41.ini | 0 Data/{User => Sys}/GameConfig/GGYP41.ini | 0 Data/{User => Sys}/GameConfig/GGZE52.ini | 0 Data/{User => Sys}/GameConfig/GGZX52.ini | 0 Data/{User => Sys}/GameConfig/GH2E69.ini | 0 Data/{User => Sys}/GameConfig/GH2P69.ini | 0 Data/{User => Sys}/GameConfig/GH4D69.ini | 0 Data/{User => Sys}/GameConfig/GH4E69.ini | 0 Data/{User => Sys}/GameConfig/GH4F69.ini | 0 Data/{User => Sys}/GameConfig/GH4H69.ini | 0 Data/{User => Sys}/GameConfig/GH4I69.ini | 0 Data/{User => Sys}/GameConfig/GH4J69.ini | 0 Data/{User => Sys}/GameConfig/GH4M69.ini | 0 Data/{User => Sys}/GameConfig/GH4P69.ini | 0 Data/{User => Sys}/GameConfig/GH4S69.ini | 0 Data/{User => Sys}/GameConfig/GH5D52.ini | 0 Data/{User => Sys}/GameConfig/GH5E52.ini | 0 Data/{User => Sys}/GameConfig/GH5F52.ini | 0 Data/{User => Sys}/GameConfig/GH5P52.ini | 0 Data/{User => Sys}/GameConfig/GH6EAF.ini | 0 Data/{User => Sys}/GameConfig/GH7E5D.ini | 0 Data/{User => Sys}/GameConfig/GHAE08.ini | 0 Data/{User => Sys}/GameConfig/GHAP08.ini | 0 Data/{User => Sys}/GameConfig/GHBE7D.ini | 0 Data/{User => Sys}/GameConfig/GHBP7D.ini | 0 Data/{User => Sys}/GameConfig/GHCE4Q.ini | 0 Data/{User => Sys}/GameConfig/GHCF4Q.ini | 0 Data/{User => Sys}/GameConfig/GHGEEB.ini | 0 Data/{User => Sys}/GameConfig/GHKE7D.ini | 0 Data/{User => Sys}/GameConfig/GHLE69.ini | 0 Data/{User => Sys}/GameConfig/GHLJ69.ini | 0 Data/{User => Sys}/GameConfig/GHLP69.ini | 0 Data/{User => Sys}/GameConfig/GHLX69.ini | 0 Data/{User => Sys}/GameConfig/GHLY69.ini | 0 Data/{User => Sys}/GameConfig/GHLZ69.ini | 0 Data/{User => Sys}/GameConfig/GHMD4F.ini | 0 Data/{User => Sys}/GameConfig/GHME4F.ini | 0 Data/{User => Sys}/GameConfig/GHMF4F.ini | 0 Data/{User => Sys}/GameConfig/GHMP4F.ini | 0 Data/{User => Sys}/GameConfig/GHNE71.ini | 0 Data/{User => Sys}/GameConfig/GHQE7D.ini | 0 Data/{User => Sys}/GameConfig/GHQP7D.ini | 0 Data/{User => Sys}/GameConfig/GHRE78.ini | 0 Data/{User => Sys}/GameConfig/GHSE69.ini | 0 Data/{User => Sys}/GameConfig/GHSJ69.ini | 0 Data/{User => Sys}/GameConfig/GHSP69.ini | 0 Data/{User => Sys}/GameConfig/GHSX69.ini | 0 Data/{User => Sys}/GameConfig/GHSY69.ini | 0 Data/{User => Sys}/GameConfig/GHUE7D.ini | 0 Data/{User => Sys}/GameConfig/GHVE08.ini | 0 Data/{User => Sys}/GameConfig/GHWE78.ini | 0 Data/{User => Sys}/GameConfig/GHYE6S.ini | 0 Data/{User => Sys}/GameConfig/GIAE7D.ini | 0 Data/{User => Sys}/GameConfig/GIBE4F.ini | 0 Data/{User => Sys}/GameConfig/GICE78.ini | 0 Data/{User => Sys}/GameConfig/GIGJ8P.ini | 0 Data/{User => Sys}/GameConfig/GIKE70.ini | 0 Data/{User => Sys}/GameConfig/GIKP70.ini | 0 Data/{User => Sys}/GameConfig/GILE51.ini | 0 Data/{User => Sys}/GameConfig/GILP51.ini | 0 Data/{User => Sys}/GameConfig/GINE69.ini | 0 Data/{User => Sys}/GameConfig/GINX69.ini | 0 Data/{User => Sys}/GameConfig/GIPEAF.ini | 0 Data/{User => Sys}/GameConfig/GIQE78.ini | 0 Data/{User => Sys}/GameConfig/GISE36.ini | 0 Data/{User => Sys}/GameConfig/GISP36.ini | 0 Data/{User => Sys}/GameConfig/GITE01.ini | 0 Data/{User => Sys}/GameConfig/GITP01.ini | 0 Data/{User => Sys}/GameConfig/GIVE4Z.ini | 0 Data/{User => Sys}/GameConfig/GIZE52.ini | 0 Data/{User => Sys}/GameConfig/GJ3PA4.ini | 0 Data/{User => Sys}/GameConfig/GJBE5G.ini | 0 Data/{User => Sys}/GameConfig/GJCE8P.ini | 0 Data/{User => Sys}/GameConfig/GJDE5S.ini | 0 Data/{User => Sys}/GameConfig/GJKE52.ini | 0 Data/{User => Sys}/GameConfig/GJNE78.ini | 0 Data/{User => Sys}/GameConfig/GJSJ18.ini | 0 Data/{User => Sys}/GameConfig/GJUD78.ini | 0 Data/{User => Sys}/GameConfig/GJUE78.ini | 0 Data/{User => Sys}/GameConfig/GJUF78.ini | 0 Data/{User => Sys}/GameConfig/GJWE78.ini | 0 Data/{User => Sys}/GameConfig/GJXE51.ini | 0 Data/{User => Sys}/GameConfig/GJXP51.ini | 0 Data/{User => Sys}/GameConfig/GJZE52.ini | 0 Data/{User => Sys}/GameConfig/GK2D52.ini | 0 Data/{User => Sys}/GameConfig/GK2E52.ini | 0 Data/{User => Sys}/GameConfig/GK2F52.ini | 0 Data/{User => Sys}/GameConfig/GK2I52.ini | 0 Data/{User => Sys}/GameConfig/GK2P52.ini | 0 Data/{User => Sys}/GameConfig/GK4E01.ini | 0 Data/{User => Sys}/GameConfig/GK5E78.ini | 0 Data/{User => Sys}/GameConfig/GK5X78.ini | 0 Data/{User => Sys}/GameConfig/GK6JA4.ini | 0 Data/{User => Sys}/GameConfig/GK7E08.ini | 0 Data/{User => Sys}/GameConfig/GK7P08.ini | 0 Data/{User => Sys}/GameConfig/GK9EA4.ini | 0 Data/{User => Sys}/GameConfig/GKAE8P.ini | 0 Data/{User => Sys}/GameConfig/GKBEAF.ini | 0 Data/{User => Sys}/GameConfig/GKBPAF.ini | 0 Data/{User => Sys}/GameConfig/GKDP01.ini | 0 Data/{User => Sys}/GameConfig/GKFEGG.ini | 0 Data/{User => Sys}/GameConfig/GKGE01.ini | 0 Data/{User => Sys}/GameConfig/GKHEA4.ini | 0 Data/{User => Sys}/GameConfig/GKHPA4.ini | 0 Data/{User => Sys}/GameConfig/GKJE78.ini | 0 Data/{User => Sys}/GameConfig/GKKE69.ini | 0 Data/{User => Sys}/GameConfig/GKLD69.ini | 0 Data/{User => Sys}/GameConfig/GKLE69.ini | 0 Data/{User => Sys}/GameConfig/GKLF69.ini | 0 Data/{User => Sys}/GameConfig/GKLI69.ini | 0 Data/{User => Sys}/GameConfig/GKLJ69.ini | 0 Data/{User => Sys}/GameConfig/GKLP69.ini | 0 Data/{User => Sys}/GameConfig/GKLS69.ini | 0 Data/{User => Sys}/GameConfig/GKME41.ini | 0 Data/{User => Sys}/GameConfig/GKMP41.ini | 0 Data/{User => Sys}/GameConfig/GKNEB2.ini | 0 Data/{User => Sys}/GameConfig/GKOE70.ini | 0 Data/{User => Sys}/GameConfig/GKOP6V.ini | 0 Data/{User => Sys}/GameConfig/GKOP70.ini | 0 Data/{User => Sys}/GameConfig/GKQJ01.ini | 0 Data/{User => Sys}/GameConfig/GKSE52.ini | 0 Data/{User => Sys}/GameConfig/GKTJA4.ini | 0 Data/{User => Sys}/GameConfig/GKUE9G.ini | 0 Data/{User => Sys}/GameConfig/GKYE01.ini | 0 Data/{User => Sys}/GameConfig/GKYJ01.ini | 0 Data/{User => Sys}/GameConfig/GKYP01.ini | 0 Data/{User => Sys}/GameConfig/GKZE9G.ini | 0 Data/{User => Sys}/GameConfig/GL5E4F.ini | 0 Data/{User => Sys}/GameConfig/GL7E64.ini | 0 Data/{User => Sys}/GameConfig/GL7P64.ini | 0 Data/{User => Sys}/GameConfig/GL8E4F.ini | 0 Data/{User => Sys}/GameConfig/GL8F4F.ini | 0 Data/{User => Sys}/GameConfig/GLBE8P.ini | 0 Data/{User => Sys}/GameConfig/GLCE52.ini | 0 Data/{User => Sys}/GameConfig/GLCF52.ini | 0 Data/{User => Sys}/GameConfig/GLEE08.ini | 0 Data/{User => Sys}/GameConfig/GLEP08.ini | 0 Data/{User => Sys}/GameConfig/GLLE78.ini | 0 Data/{User => Sys}/GameConfig/GLME01.ini | 0 Data/{User => Sys}/GameConfig/GLMP01.ini | 0 Data/{User => Sys}/GameConfig/GLNE69.ini | 0 Data/{User => Sys}/GameConfig/GLNP69.ini | 0 Data/{User => Sys}/GameConfig/GLOE69.ini | 0 Data/{User => Sys}/GameConfig/GLOP69.ini | 0 Data/{User => Sys}/GameConfig/GLQE41.ini | 0 Data/{User => Sys}/GameConfig/GLRE64.ini | 0 Data/{User => Sys}/GameConfig/GLSD64.ini | 0 Data/{User => Sys}/GameConfig/GLSE64.ini | 0 Data/{User => Sys}/GameConfig/GLSF64.ini | 0 Data/{User => Sys}/GameConfig/GLSP64.ini | 0 Data/{User => Sys}/GameConfig/GLUE7U.ini | 0 Data/{User => Sys}/GameConfig/GLWE51.ini | 0 Data/{User => Sys}/GameConfig/GLYE69.ini | 0 Data/{User => Sys}/GameConfig/GLYP69.ini | 0 Data/{User => Sys}/GameConfig/GLZE69.ini | 0 Data/{User => Sys}/GameConfig/GLZF69.ini | 0 Data/{User => Sys}/GameConfig/GM2E8P.ini | 0 Data/{User => Sys}/GameConfig/GM2P8P.ini | 0 Data/{User => Sys}/GameConfig/GM3E69.ini | 0 Data/{User => Sys}/GameConfig/GM4E01.ini | 0 Data/{User => Sys}/GameConfig/GM4J01.ini | 0 Data/{User => Sys}/GameConfig/GM4P01.ini | 0 Data/{User => Sys}/GameConfig/GM5E7D.ini | 0 Data/{User => Sys}/GameConfig/GM5F7D.ini | 0 Data/{User => Sys}/GameConfig/GM5P7D.ini | 0 Data/{User => Sys}/GameConfig/GM6EE9.ini | 0 Data/{User => Sys}/GameConfig/GM6PE9.ini | 0 Data/{User => Sys}/GameConfig/GM8E01.ini | 0 Data/{User => Sys}/GameConfig/GM8J01.ini | 0 Data/{User => Sys}/GameConfig/GM8P01.ini | 0 Data/{User => Sys}/GameConfig/GMBE8P.ini | 0 Data/{User => Sys}/GameConfig/GMBP8P.ini | 0 Data/{User => Sys}/GameConfig/GMFS69.ini | 0 Data/{User => Sys}/GameConfig/GMHE52.ini | 0 Data/{User => Sys}/GameConfig/GMHF52.ini | 0 Data/{User => Sys}/GameConfig/GMHP52.ini | 0 Data/{User => Sys}/GameConfig/GMIE70.ini | 0 Data/{User => Sys}/GameConfig/GMIP70.ini | 0 Data/{User => Sys}/GameConfig/GMKD5D.ini | 0 Data/{User => Sys}/GameConfig/GMLEA4.ini | 0 Data/{User => Sys}/GameConfig/GMNE78.ini | 0 Data/{User => Sys}/GameConfig/GMPE01.ini | 0 Data/{User => Sys}/GameConfig/GMPP01.ini | 0 Data/{User => Sys}/GameConfig/GMSE01.ini | 0 Data/{User => Sys}/GameConfig/GMSJ01.ini | 0 Data/{User => Sys}/GameConfig/GMSP01.ini | 0 Data/{User => Sys}/GameConfig/GMTP69.ini | 0 Data/{User => Sys}/GameConfig/GMUE5D.ini | 0 Data/{User => Sys}/GameConfig/GMXE70.ini | 0 Data/{User => Sys}/GameConfig/GN6E69.ini | 0 Data/{User => Sys}/GameConfig/GN8E69.ini | 0 Data/{User => Sys}/GameConfig/GN8P69.ini | 0 Data/{User => Sys}/GameConfig/GNDE69.ini | 0 Data/{User => Sys}/GameConfig/GNHE5d.ini | 0 Data/{User => Sys}/GameConfig/GNJEAF.ini | 0 Data/{User => Sys}/GameConfig/GNLE69.ini | 0 Data/{User => Sys}/GameConfig/GNNE69.ini | 0 Data/{User => Sys}/GameConfig/GNOE78.ini | 0 Data/{User => Sys}/GameConfig/GNQE69.ini | 0 Data/{User => Sys}/GameConfig/GNRJDA.ini | 0 Data/{User => Sys}/GameConfig/GNUEDA.ini | 0 Data/{User => Sys}/GameConfig/GNWE69.ini | 0 Data/{User => Sys}/GameConfig/GNWP69.ini | 0 Data/{User => Sys}/GameConfig/GO2E4F.ini | 0 Data/{User => Sys}/GameConfig/GO7E69.ini | 0 Data/{User => Sys}/GameConfig/GO7F69.ini | 0 Data/{User => Sys}/GameConfig/GO7P69.ini | 0 Data/{User => Sys}/GameConfig/GOAE52.ini | 0 Data/{User => Sys}/GameConfig/GOBE4Z.ini | 0 Data/{User => Sys}/GameConfig/GOCE5D.ini | 0 Data/{User => Sys}/GameConfig/GOGJB2.ini | 0 Data/{User => Sys}/GameConfig/GOME01.ini | 0 Data/{User => Sys}/GameConfig/GOMP01.ini | 0 Data/{User => Sys}/GameConfig/GONE69.ini | 0 Data/{User => Sys}/GameConfig/GOOE01.ini | 0 Data/{User => Sys}/GameConfig/GOPEB2.ini | 0 Data/{User => Sys}/GameConfig/GOPJB2.ini | 0 Data/{User => Sys}/GameConfig/GOQEAF.ini | 0 Data/{User => Sys}/GameConfig/GOSE41.ini | 0 Data/{User => Sys}/GameConfig/GOSP41.ini | 0 Data/{User => Sys}/GameConfig/GOSX41.ini | 0 Data/{User => Sys}/GameConfig/GOWD69.ini | 0 Data/{User => Sys}/GameConfig/GOWE69.ini | 0 Data/{User => Sys}/GameConfig/GOWF69.ini | 0 Data/{User => Sys}/GameConfig/GOWJ69.ini | 0 Data/{User => Sys}/GameConfig/GOWP69.ini | 0 Data/{User => Sys}/GameConfig/GOYD69.ini | 0 Data/{User => Sys}/GameConfig/GOYE69.ini | 0 Data/{User => Sys}/GameConfig/GOYF69.ini | 0 Data/{User => Sys}/GameConfig/GOYP69.ini | 0 Data/{User => Sys}/GameConfig/GOYS69.ini | 0 Data/{User => Sys}/GameConfig/GP2E82.ini | 0 Data/{User => Sys}/GameConfig/GP2EAF.ini | 0 Data/{User => Sys}/GameConfig/GP4J18.ini | 0 Data/{User => Sys}/GameConfig/GP5E01.ini | 0 Data/{User => Sys}/GameConfig/GP5J01.ini | 0 Data/{User => Sys}/GameConfig/GP5P01.ini | 0 Data/{User => Sys}/GameConfig/GP6E01.ini | 0 Data/{User => Sys}/GameConfig/GP6J01.ini | 0 Data/{User => Sys}/GameConfig/GP6P01.ini | 0 Data/{User => Sys}/GameConfig/GP7E01.ini | 0 Data/{User => Sys}/GameConfig/GP7J01.ini | 0 Data/{User => Sys}/GameConfig/GP7P01.ini | 0 Data/{User => Sys}/GameConfig/GP8EAF.ini | 0 Data/{User => Sys}/GameConfig/GPAE01.ini | 0 Data/{User => Sys}/GameConfig/GPAJ01.ini | 0 Data/{User => Sys}/GameConfig/GPAP01.ini | 0 Data/{User => Sys}/GameConfig/GPAU01.ini | 0 Data/{User => Sys}/GameConfig/GPDE51.ini | 0 Data/{User => Sys}/GameConfig/GPEJ2Q.ini | 0 Data/{User => Sys}/GameConfig/GPHD52.ini | 0 Data/{User => Sys}/GameConfig/GPHE52.ini | 0 Data/{User => Sys}/GameConfig/GPHP52.ini | 0 Data/{User => Sys}/GameConfig/GPIE01.ini | 0 Data/{User => Sys}/GameConfig/GPIP01.ini | 0 Data/{User => Sys}/GameConfig/GPKE41.ini | 0 Data/{User => Sys}/GameConfig/GPNE08.ini | 0 Data/{User => Sys}/GameConfig/GPNP08.ini | 0 Data/{User => Sys}/GameConfig/GPOE8P.ini | 0 Data/{User => Sys}/GameConfig/GPOP8P.ini | 0 Data/{User => Sys}/GameConfig/GPSE8P.ini | 0 Data/{User => Sys}/GameConfig/GPSP8P.ini | 0 Data/{User => Sys}/GameConfig/GPTE41.ini | 0 Data/{User => Sys}/GameConfig/GPTP41.ini | 0 Data/{User => Sys}/GameConfig/GPVE01.ini | 0 Data/{User => Sys}/GameConfig/GPVP01.ini | 0 Data/{User => Sys}/GameConfig/GPXP01.ini | 0 Data/{User => Sys}/GameConfig/GPZJ01.ini | 0 Data/{User => Sys}/GameConfig/GQ8E69.ini | 0 Data/{User => Sys}/GameConfig/GQCD52.ini | 0 Data/{User => Sys}/GameConfig/GQCE52.ini | 0 Data/{User => Sys}/GameConfig/GQCF52.ini | 0 Data/{User => Sys}/GameConfig/GQCI52.ini | 0 Data/{User => Sys}/GameConfig/GQCP52.ini | 0 Data/{User => Sys}/GameConfig/GQCS52.ini | 0 Data/{User => Sys}/GameConfig/GQLE9G.ini | 0 Data/{User => Sys}/GameConfig/GQNE5D.ini | 0 Data/{User => Sys}/GameConfig/GQSDAF.ini | 0 Data/{User => Sys}/GameConfig/GQSEAF.ini | 0 Data/{User => Sys}/GameConfig/GQSFAF.ini | 0 Data/{User => Sys}/GameConfig/GQSPAF.ini | 0 Data/{User => Sys}/GameConfig/GQTE4Q.ini | 0 Data/{User => Sys}/GameConfig/GQWE69.ini | 0 Data/{User => Sys}/GameConfig/GQWJ69.ini | 0 Data/{User => Sys}/GameConfig/GQWP69.ini | 0 Data/{User => Sys}/GameConfig/GQWX69.ini | 0 Data/{User => Sys}/GameConfig/GQXE69.ini | 0 Data/{User => Sys}/GameConfig/GR2E52.ini | 0 Data/{User => Sys}/GameConfig/GR6E78.ini | 0 Data/{User => Sys}/GameConfig/GR8D69.ini | 0 Data/{User => Sys}/GameConfig/GR8E69.ini | 0 Data/{User => Sys}/GameConfig/GR8F69.ini | 0 Data/{User => Sys}/GameConfig/GR8J69.ini | 0 Data/{User => Sys}/GameConfig/GR8P69.ini | 0 Data/{User => Sys}/GameConfig/GRAE5Z.ini | 0 Data/{User => Sys}/GameConfig/GRBE6S.ini | 0 Data/{User => Sys}/GameConfig/GRBP6S.ini | 0 Data/{User => Sys}/GameConfig/GREE08.ini | 0 Data/{User => Sys}/GameConfig/GREP08.ini | 0 Data/{User => Sys}/GameConfig/GRFE78.ini | 0 Data/{User => Sys}/GameConfig/GRHE41.ini | 0 Data/{User => Sys}/GameConfig/GRHP41.ini | 0 Data/{User => Sys}/GameConfig/GRJEAF.ini | 0 Data/{User => Sys}/GameConfig/GRKE41.ini | 0 Data/{User => Sys}/GameConfig/GRKP7G.ini | 0 Data/{User => Sys}/GameConfig/GRLE41.ini | 0 Data/{User => Sys}/GameConfig/GRNE52.ini | 0 Data/{User => Sys}/GameConfig/GROP7J.ini | 0 Data/{User => Sys}/GameConfig/GRQE41.ini | 0 Data/{User => Sys}/GameConfig/GRSEAF.ini | 0 Data/{User => Sys}/GameConfig/GRSPAF.ini | 0 Data/{User => Sys}/GameConfig/GRUE78.ini | 0 Data/{User => Sys}/GameConfig/GRVEA4.ini | 0 Data/{User => Sys}/GameConfig/GRYE41.ini | 0 Data/{User => Sys}/GameConfig/GS2D78.ini | 0 Data/{User => Sys}/GameConfig/GS2E78.ini | 0 Data/{User => Sys}/GameConfig/GS2F78.ini | 0 Data/{User => Sys}/GameConfig/GS2P78.ini | 0 Data/{User => Sys}/GameConfig/GS8P7D.ini | 0 Data/{User => Sys}/GameConfig/GSAE01.ini | 0 Data/{User => Sys}/GameConfig/GSAP01.ini | 0 Data/{User => Sys}/GameConfig/GSCE51.ini | 0 Data/{User => Sys}/GameConfig/GSEJB2.ini | 0 Data/{User => Sys}/GameConfig/GSMP52.ini | 0 Data/{User => Sys}/GameConfig/GSNE8P.ini | 0 Data/{User => Sys}/GameConfig/GSNP8P.ini | 0 Data/{User => Sys}/GameConfig/GSOE8P.ini | 0 Data/{User => Sys}/GameConfig/GSOP8P.ini | 0 Data/{User => Sys}/GameConfig/GSPE69.ini | 0 Data/{User => Sys}/GameConfig/GSSE8P.ini | 0 Data/{User => Sys}/GameConfig/GSSJ8P.ini | 0 Data/{User => Sys}/GameConfig/GSSP70.ini | 0 Data/{User => Sys}/GameConfig/GSSP8P.ini | 0 Data/{User => Sys}/GameConfig/GSTE69.ini | 0 Data/{User => Sys}/GameConfig/GSTP69.ini | 0 Data/{User => Sys}/GameConfig/GSWE64.ini | 0 Data/{User => Sys}/GameConfig/GSWP64.ini | 0 Data/{User => Sys}/GameConfig/GSWS64.ini | 0 Data/{User => Sys}/GameConfig/GSZP41.ini | 0 Data/{User => Sys}/GameConfig/GT3D52.ini | 0 Data/{User => Sys}/GameConfig/GT3E52.ini | 0 Data/{User => Sys}/GameConfig/GT3F52.ini | 0 Data/{User => Sys}/GameConfig/GT3P52.ini | 0 Data/{User => Sys}/GameConfig/GT6E70.ini | 0 Data/{User => Sys}/GameConfig/GT7E41.ini | 0 Data/{User => Sys}/GameConfig/GT7P41.ini | 0 Data/{User => Sys}/GameConfig/GT7X41.ini | 0 Data/{User => Sys}/GameConfig/GT8E78.ini | 0 Data/{User => Sys}/GameConfig/GTCJBL.ini | 0 Data/{User => Sys}/GameConfig/GTEE01.ini | 0 Data/{User => Sys}/GameConfig/GTEP01.ini | 0 Data/{User => Sys}/GameConfig/GTFEA4.ini | 0 Data/{User => Sys}/GameConfig/GTKE51.ini | 0 Data/{User => Sys}/GameConfig/GTKP51.ini | 0 Data/{User => Sys}/GameConfig/GTLE52.ini | 0 Data/{User => Sys}/GameConfig/GTLP52.ini | 0 Data/{User => Sys}/GameConfig/GTLX52.ini | 0 Data/{User => Sys}/GameConfig/GTSE4F.ini | 0 Data/{User => Sys}/GameConfig/GTSP4F.ini | 0 Data/{User => Sys}/GameConfig/GTUE8G.ini | 0 Data/{User => Sys}/GameConfig/GTWE70.ini | 0 Data/{User => Sys}/GameConfig/GTWP70.ini | 0 Data/{User => Sys}/GameConfig/GTYE69.ini | 0 Data/{User => Sys}/GameConfig/GTYP69.ini | 0 Data/{User => Sys}/GameConfig/GTZE41.ini | 0 Data/{User => Sys}/GameConfig/GTZP41.ini | 0 Data/{User => Sys}/GameConfig/GUBE69.ini | 0 Data/{User => Sys}/GameConfig/GUBP69.ini | 0 Data/{User => Sys}/GameConfig/GUCP69.ini | 0 Data/{User => Sys}/GameConfig/GUFE4Z.ini | 0 Data/{User => Sys}/GameConfig/GUGE69.ini | 0 Data/{User => Sys}/GameConfig/GUME52.ini | 0 Data/{User => Sys}/GameConfig/GUMP52.ini | 0 Data/{User => Sys}/GameConfig/GUNE5D.ini | 0 Data/{User => Sys}/GameConfig/GUPE8P.ini | 0 Data/{User => Sys}/GameConfig/GUPP8P.ini | 0 Data/{User => Sys}/GameConfig/GUTE52.ini | 0 Data/{User => Sys}/GameConfig/GUVE51.ini | 0 Data/{User => Sys}/GameConfig/GUZE41.ini | 0 Data/{User => Sys}/GameConfig/GUZP41.ini | 0 Data/{User => Sys}/GameConfig/GV3E70.ini | 0 Data/{User => Sys}/GameConfig/GV3P70.ini | 0 Data/{User => Sys}/GameConfig/GVCE08.ini | 0 Data/{User => Sys}/GameConfig/GVCP08.ini | 0 Data/{User => Sys}/GameConfig/GVDE78.ini | 0 Data/{User => Sys}/GameConfig/GVHE4F.ini | 0 Data/{User => Sys}/GameConfig/GVJE08.ini | 0 Data/{User => Sys}/GameConfig/GVJJ08.ini | 0 Data/{User => Sys}/GameConfig/GVJP08.ini | 0 Data/{User => Sys}/GameConfig/GVKE52.ini | 0 Data/{User => Sys}/GameConfig/GVLD69.ini | 0 Data/{User => Sys}/GameConfig/GVLE69.ini | 0 Data/{User => Sys}/GameConfig/GVLF69.ini | 0 Data/{User => Sys}/GameConfig/GVLP69.ini | 0 Data/{User => Sys}/GameConfig/GVRE7H.ini | 0 Data/{User => Sys}/GameConfig/GVSE8P.ini | 0 Data/{User => Sys}/GameConfig/GVSP8P.ini | 0 Data/{User => Sys}/GameConfig/GW2E78.ini | 0 Data/{User => Sys}/GameConfig/GW2P78.ini | 0 Data/{User => Sys}/GameConfig/GW3E78.ini | 0 Data/{User => Sys}/GameConfig/GW3P78.ini | 0 Data/{User => Sys}/GameConfig/GW5E69.ini | 0 Data/{User => Sys}/GameConfig/GW7E69.ini | 0 Data/{User => Sys}/GameConfig/GW7P69.ini | 0 Data/{User => Sys}/GameConfig/GW8E52.ini | 0 Data/{User => Sys}/GameConfig/GW9E78.ini | 0 Data/{User => Sys}/GameConfig/GWAE8P.ini | 0 Data/{User => Sys}/GameConfig/GWAF8P.ini | 0 Data/{User => Sys}/GameConfig/GWAP8P.ini | 0 Data/{User => Sys}/GameConfig/GWBP41.ini | 0 Data/{User => Sys}/GameConfig/GWEE51.ini | 0 Data/{User => Sys}/GameConfig/GWEJB0.ini | 0 Data/{User => Sys}/GameConfig/GWEP8P.ini | 0 Data/{User => Sys}/GameConfig/GWGP4F.ini | 0 Data/{User => Sys}/GameConfig/GWJE52.ini | 0 Data/{User => Sys}/GameConfig/GWKE41.ini | 0 Data/{User => Sys}/GameConfig/GWKP41.ini | 0 Data/{User => Sys}/GameConfig/GWLE6L.ini | 0 Data/{User => Sys}/GameConfig/GWLX6L.ini | 0 Data/{User => Sys}/GameConfig/GWME51.ini | 0 Data/{User => Sys}/GameConfig/GWOE5G.ini | 0 Data/{User => Sys}/GameConfig/GWPE78.ini | 0 Data/{User => Sys}/GameConfig/GWPJG2.ini | 0 Data/{User => Sys}/GameConfig/GWPP78.ini | 0 Data/{User => Sys}/GameConfig/GWQE52.ini | 0 Data/{User => Sys}/GameConfig/GWRE01.ini | 0 Data/{User => Sys}/GameConfig/GWRP01.ini | 0 Data/{User => Sys}/GameConfig/GWSEA4.ini | 0 Data/{User => Sys}/GameConfig/GWTEA4.ini | 0 Data/{User => Sys}/GameConfig/GWVE52.ini | 0 Data/{User => Sys}/GameConfig/GWWE01.ini | 0 Data/{User => Sys}/GameConfig/GWWP01.ini | 0 Data/{User => Sys}/GameConfig/GWYE41.ini | 0 Data/{User => Sys}/GameConfig/GWYX41.ini | 0 Data/{User => Sys}/GameConfig/GWZE01.ini | 0 Data/{User => Sys}/GameConfig/GWZP01.ini | 0 Data/{User => Sys}/GameConfig/GX2E52.ini | 0 Data/{User => Sys}/GameConfig/GX2P52.ini | 0 Data/{User => Sys}/GameConfig/GX3E41.ini | 0 Data/{User => Sys}/GameConfig/GX3P41.ini | 0 Data/{User => Sys}/GameConfig/GX3X41.ini | 0 Data/{User => Sys}/GameConfig/GXBE69.ini | 0 Data/{User => Sys}/GameConfig/GXBP69.ini | 0 Data/{User => Sys}/GameConfig/GXCE01.ini | 0 Data/{User => Sys}/GameConfig/GXEE8P.ini | 0 Data/{User => Sys}/GameConfig/GXEP8P.ini | 0 Data/{User => Sys}/GameConfig/GXFE69.ini | 0 Data/{User => Sys}/GameConfig/GXFF69.ini | 0 Data/{User => Sys}/GameConfig/GXFP69.ini | 0 Data/{User => Sys}/GameConfig/GXGE08.ini | 0 Data/{User => Sys}/GameConfig/GXLE52.ini | 0 Data/{User => Sys}/GameConfig/GXLP52.ini | 0 Data/{User => Sys}/GameConfig/GXME52.ini | 0 Data/{User => Sys}/GameConfig/GXNE5D.ini | 0 Data/{User => Sys}/GameConfig/GXOE69.ini | 0 Data/{User => Sys}/GameConfig/GXOX69.ini | 0 Data/{User => Sys}/GameConfig/GXRE08.ini | 0 Data/{User => Sys}/GameConfig/GXSE8P.ini | 0 Data/{User => Sys}/GameConfig/GXSP8P.ini | 0 Data/{User => Sys}/GameConfig/GXXE01.ini | 0 Data/{User => Sys}/GameConfig/GXXP01.ini | 0 Data/{User => Sys}/GameConfig/GY2E01.ini | 0 Data/{User => Sys}/GameConfig/GYAE78.ini | 0 Data/{User => Sys}/GameConfig/GYBP01.ini | 0 Data/{User => Sys}/GameConfig/GYFEA4.ini | 0 Data/{User => Sys}/GameConfig/GYKEB2.ini | 0 Data/{User => Sys}/GameConfig/GYQP01.ini | 0 Data/{User => Sys}/GameConfig/GYRE41.ini | 0 Data/{User => Sys}/GameConfig/GYWD41.ini | 0 Data/{User => Sys}/GameConfig/GYWEE9.ini | 0 Data/{User => Sys}/GameConfig/GYWP41.ini | 0 Data/{User => Sys}/GameConfig/GZ2E01.ini | 0 Data/{User => Sys}/GameConfig/GZ2J01.ini | 0 Data/{User => Sys}/GameConfig/GZ2P01.ini | 0 Data/{User => Sys}/GameConfig/GZ3E70.ini | 0 Data/{User => Sys}/GameConfig/GZ3PB2.ini | 0 Data/{User => Sys}/GameConfig/GZEE70.ini | 0 Data/{User => Sys}/GameConfig/GZLE01.ini | 0 Data/{User => Sys}/GameConfig/GZLJ01.ini | 0 Data/{User => Sys}/GameConfig/GZLP01.ini | 0 Data/{User => Sys}/GameConfig/GZMP7D.ini | 0 Data/{User => Sys}/GameConfig/GZPE70.ini | 0 Data/{User => Sys}/GameConfig/GZPP70.ini | 0 Data/{User => Sys}/GameConfig/GZSE70.ini | 0 Data/{User => Sys}/GameConfig/GZWE01.ini | 0 Data/{User => Sys}/GameConfig/GZWP01.ini | 0 Data/{User => Sys}/GameConfig/HAAA01.ini | 0 Data/{User => Sys}/GameConfig/HACA01.ini | 0 Data/{User => Sys}/GameConfig/HADE01.ini | 0 Data/{User => Sys}/GameConfig/HAXXHB.ini | 0 Data/{User => Sys}/GameConfig/HAYA01.ini | 0 Data/{User => Sys}/GameConfig/HCFE01.ini | 0 Data/{User => Sys}/GameConfig/JAAE01.ini | 0 Data/{User => Sys}/GameConfig/JACP01.ini | 0 Data/{User => Sys}/GameConfig/JADE01.ini | 0 Data/{User => Sys}/GameConfig/JAEE01.ini | 0 Data/{User => Sys}/GameConfig/JBKE01.ini | 0 Data/{User => Sys}/GameConfig/JBKP01.ini | 0 Data/{User => Sys}/GameConfig/JCBE01.ini | 0 Data/{User => Sys}/GameConfig/JCWE01.ini | 0 Data/{User => Sys}/GameConfig/JODIHB.ini | 0 Data/{User => Sys}/GameConfig/NAAE01.ini | 0 Data/{User => Sys}/GameConfig/NAAP01.ini | 0 Data/{User => Sys}/GameConfig/NABE01.ini | 0 Data/{User => Sys}/GameConfig/NACE01.ini | 0 Data/{User => Sys}/GameConfig/NAEE01.ini | 0 Data/{User => Sys}/GameConfig/NAFP01.ini | 0 Data/{User => Sys}/GameConfig/NAHE01.ini | 0 Data/{User => Sys}/GameConfig/NAKE01.ini | 0 Data/{User => Sys}/GameConfig/NAKP01.ini | 0 Data/{User => Sys}/GameConfig/NANE01.ini | 0 Data/{User => Sys}/GameConfig/NARP01.ini | 0 Data/{User => Sys}/GameConfig/PC6E01.ini | 0 Data/{User => Sys}/GameConfig/PH_PRESETS.ini | 0 Data/{User => Sys}/GameConfig/PM4E01.ini | 0 Data/{User => Sys}/GameConfig/PRJE01.ini | 0 Data/{User => Sys}/GameConfig/PZLE01.ini | 0 Data/{User => Sys}/GameConfig/PZLJ01.ini | 0 Data/{User => Sys}/GameConfig/PZLP01.ini | 0 Data/{User => Sys}/GameConfig/R22E01.ini | 0 Data/{User => Sys}/GameConfig/R22J01.ini | 0 Data/{User => Sys}/GameConfig/R22P01.ini | 0 Data/{User => Sys}/GameConfig/R29P52.ini | 0 Data/{User => Sys}/GameConfig/R2GEXJ.ini | 0 Data/{User => Sys}/GameConfig/R2GJAF.ini | 0 Data/{User => Sys}/GameConfig/R2GP99.ini | 0 Data/{User => Sys}/GameConfig/R2JJAF.ini | 0 Data/{User => Sys}/GameConfig/R2KP54.ini | 0 Data/{User => Sys}/GameConfig/R2TE41.ini | 0 Data/{User => Sys}/GameConfig/R2UE8P.ini | 0 Data/{User => Sys}/GameConfig/R2VJ01.ini | 0 Data/{User => Sys}/GameConfig/R2VP01.ini | 0 Data/{User => Sys}/GameConfig/R3BE8P.ini | 0 Data/{User => Sys}/GameConfig/R3BJ8P.ini | 0 Data/{User => Sys}/GameConfig/R3BP8P.ini | 0 Data/{User => Sys}/GameConfig/R3CE20.ini | 0 Data/{User => Sys}/GameConfig/R3DES5.ini | 0 Data/{User => Sys}/GameConfig/R3DPS5.ini | 0 Data/{User => Sys}/GameConfig/R3GXUG.ini | 0 Data/{User => Sys}/GameConfig/R3ME01.ini | 0 Data/{User => Sys}/GameConfig/R3MP01.ini | 0 Data/{User => Sys}/GameConfig/R3NEXS.ini | 0 Data/{User => Sys}/GameConfig/R3NPH3.ini | 0 Data/{User => Sys}/GameConfig/R3OE01.ini | 0 Data/{User => Sys}/GameConfig/R3OJ01.ini | 0 Data/{User => Sys}/GameConfig/R3OP01.ini | 0 Data/{User => Sys}/GameConfig/R3RE8P.ini | 0 Data/{User => Sys}/GameConfig/R3RP8P.ini | 0 Data/{User => Sys}/GameConfig/R3SP52.ini | 0 Data/{User => Sys}/GameConfig/R3TP54.ini | 0 Data/{User => Sys}/GameConfig/R46ENS.ini | 0 Data/{User => Sys}/GameConfig/R49P01.ini | 0 Data/{User => Sys}/GameConfig/R4BPGT.ini | 0 Data/{User => Sys}/GameConfig/R4EE01.ini | 0 Data/{User => Sys}/GameConfig/R4EJ01.ini | 0 Data/{User => Sys}/GameConfig/R4EP01.ini | 0 Data/{User => Sys}/GameConfig/R4QE01.ini | 0 Data/{User => Sys}/GameConfig/R4QJ01.ini | 0 Data/{User => Sys}/GameConfig/R4QK01.ini | 0 Data/{User => Sys}/GameConfig/R4QP01.ini | 0 Data/{User => Sys}/GameConfig/R4RP69.ini | 0 Data/{User => Sys}/GameConfig/R4ZJ01.ini | 0 Data/{User => Sys}/GameConfig/R5DE5G.ini | 0 Data/{User => Sys}/GameConfig/R5IE4Q.ini | 0 Data/{User => Sys}/GameConfig/R5IP4Q.ini | 0 Data/{User => Sys}/GameConfig/R5IX4Q.ini | 0 Data/{User => Sys}/GameConfig/R5VE41.ini | 0 Data/{User => Sys}/GameConfig/R5VP41.ini | 0 Data/{User => Sys}/GameConfig/R5VX41.ini | 0 Data/{User => Sys}/GameConfig/R5WEA4.ini | 0 Data/{User => Sys}/GameConfig/R5WJA4.ini | 0 Data/{User => Sys}/GameConfig/R64E01.ini | 0 Data/{User => Sys}/GameConfig/R64J01.ini | 0 Data/{User => Sys}/GameConfig/R64K01.ini | 0 Data/{User => Sys}/GameConfig/R64P01.ini | 0 Data/{User => Sys}/GameConfig/R69E36.ini | 0 Data/{User => Sys}/GameConfig/R6BE78.ini | 0 Data/{User => Sys}/GameConfig/R6BJ78.ini | 0 Data/{User => Sys}/GameConfig/R6BK78.ini | 0 Data/{User => Sys}/GameConfig/R6BP78.ini | 0 Data/{User => Sys}/GameConfig/R6BX78.ini | 0 Data/{User => Sys}/GameConfig/R6NY41.ini | 0 Data/{User => Sys}/GameConfig/R6TEA4.ini | 0 Data/{User => Sys}/GameConfig/R6YEXS.ini | 0 Data/{User => Sys}/GameConfig/R6YPH3.ini | 0 Data/{User => Sys}/GameConfig/R7EE8P.ini | 0 Data/{User => Sys}/GameConfig/R7EJ8P.ini | 0 Data/{User => Sys}/GameConfig/R7EP8P.ini | 0 Data/{User => Sys}/GameConfig/R7FEGD.ini | 0 Data/{User => Sys}/GameConfig/R7FJGD.ini | 0 Data/{User => Sys}/GameConfig/R7FPGD.ini | 0 Data/{User => Sys}/GameConfig/R7GEAF.ini | 0 Data/{User => Sys}/GameConfig/R7GJAF.ini | 0 Data/{User => Sys}/GameConfig/R7GPAF.ini | 0 Data/{User => Sys}/GameConfig/R7PE01.ini | 0 Data/{User => Sys}/GameConfig/R7PP01.ini | 0 Data/{User => Sys}/GameConfig/R7XE69.ini | 0 Data/{User => Sys}/GameConfig/R7XJ13.ini | 0 Data/{User => Sys}/GameConfig/R7XP69.ini | 0 Data/{User => Sys}/GameConfig/R84EE9.ini | 0 Data/{User => Sys}/GameConfig/R84J99.ini | 0 Data/{User => Sys}/GameConfig/R84P99.ini | 0 Data/{User => Sys}/GameConfig/R8AE01.ini | 0 Data/{User => Sys}/GameConfig/R8AJ01.ini | 0 Data/{User => Sys}/GameConfig/R8AP01.ini | 0 Data/{User => Sys}/GameConfig/R8DEA4.ini | 0 Data/{User => Sys}/GameConfig/R8DJA4.ini | 0 Data/{User => Sys}/GameConfig/R8DPA4.ini | 0 Data/{User => Sys}/GameConfig/R8JEWR.ini | 0 Data/{User => Sys}/GameConfig/R8JPWR.ini | 0 Data/{User => Sys}/GameConfig/R8LE20.ini | 0 Data/{User => Sys}/GameConfig/R8LP7J.ini | 0 Data/{User => Sys}/GameConfig/R8PE01.ini | 0 Data/{User => Sys}/GameConfig/R8PJ01.ini | 0 Data/{User => Sys}/GameConfig/R8PK01.ini | 0 Data/{User => Sys}/GameConfig/R8PP01.ini | 0 Data/{User => Sys}/GameConfig/R8XE52.ini | 0 Data/{User => Sys}/GameConfig/R96EAF.ini | 0 Data/{User => Sys}/GameConfig/R9FP36.ini | 0 Data/{User => Sys}/GameConfig/R9IE01.ini | 0 Data/{User => Sys}/GameConfig/RB4E08.ini | 0 Data/{User => Sys}/GameConfig/RB4P08.ini | 0 Data/{User => Sys}/GameConfig/RBBE18.ini | 0 Data/{User => Sys}/GameConfig/RBBJ18.ini | 0 Data/{User => Sys}/GameConfig/RBBP99.ini | 0 Data/{User => Sys}/GameConfig/RBHE08.ini | 0 Data/{User => Sys}/GameConfig/RBHJ08.ini | 0 Data/{User => Sys}/GameConfig/RBHP08.ini | 0 Data/{User => Sys}/GameConfig/RBIEE9.ini | 0 Data/{User => Sys}/GameConfig/RBIJ99.ini | 0 Data/{User => Sys}/GameConfig/RBIP99.ini | 0 Data/{User => Sys}/GameConfig/RBKE69.ini | 0 Data/{User => Sys}/GameConfig/RBME5G.ini | 0 Data/{User => Sys}/GameConfig/RBQPUG.ini | 0 Data/{User => Sys}/GameConfig/RBTP8P.ini | 0 Data/{User => Sys}/GameConfig/RBUE08.ini | 0 Data/{User => Sys}/GameConfig/RBUP08.ini | 0 Data/{User => Sys}/GameConfig/RBWE01.ini | 0 Data/{User => Sys}/GameConfig/RBWJ01.ini | 0 Data/{User => Sys}/GameConfig/RBWP01.ini | 0 Data/{User => Sys}/GameConfig/RBXJ8P.ini | 0 Data/{User => Sys}/GameConfig/RBZXUG.ini | 0 Data/{User => Sys}/GameConfig/RCJE8P.ini | 0 Data/{User => Sys}/GameConfig/RCJP8P.ini | 0 Data/{User => Sys}/GameConfig/RCKPGN.ini | 0 Data/{User => Sys}/GameConfig/RCPE18.ini | 0 Data/{User => Sys}/GameConfig/RD2E41.ini | 0 Data/{User => Sys}/GameConfig/RD2J41.ini | 0 Data/{User => Sys}/GameConfig/RD2K41.ini | 0 Data/{User => Sys}/GameConfig/RD2P41.ini | 0 Data/{User => Sys}/GameConfig/RD2X41.ini | 0 Data/{User => Sys}/GameConfig/RDBPAF.ini | 0 Data/{User => Sys}/GameConfig/RDFP41.ini | 0 Data/{User => Sys}/GameConfig/RDGPA4.ini | 0 Data/{User => Sys}/GameConfig/RDHP78.ini | 0 Data/{User => Sys}/GameConfig/RDIE41.ini | 0 Data/{User => Sys}/GameConfig/RDKE01.ini | 0 Data/{User => Sys}/GameConfig/RDQEGD.ini | 0 Data/{User => Sys}/GameConfig/RDSE70.ini | 0 Data/{User => Sys}/GameConfig/RDSJAF.ini | 0 Data/{User => Sys}/GameConfig/RDSPAF.ini | 0 Data/{User => Sys}/GameConfig/RDVE41.ini | 0 Data/{User => Sys}/GameConfig/RDXP18.ini | 0 Data/{User => Sys}/GameConfig/RDZJ01.ini | 0 Data/{User => Sys}/GameConfig/RDZP01.ini | 0 Data/{User => Sys}/GameConfig/RE4E08.ini | 0 Data/{User => Sys}/GameConfig/RE4J08.ini | 0 Data/{User => Sys}/GameConfig/RE4P08.ini | 0 Data/{User => Sys}/GameConfig/REDE41.ini | 0 Data/{User => Sys}/GameConfig/REDJ41.ini | 0 Data/{User => Sys}/GameConfig/REDP41.ini | 0 Data/{User => Sys}/GameConfig/RELJAB.ini | 0 Data/{User => Sys}/GameConfig/RELS01.ini | 0 Data/{User => Sys}/GameConfig/RENE8P.ini | 0 Data/{User => Sys}/GameConfig/RENJ8P.ini | 0 Data/{User => Sys}/GameConfig/RENP8P.ini | 0 Data/{User => Sys}/GameConfig/REXP01.ini | 0 Data/{User => Sys}/GameConfig/RF4P6M.ini | 0 Data/{User => Sys}/GameConfig/RF7J08.ini | 0 Data/{User => Sys}/GameConfig/RFBE01.ini | 0 Data/{User => Sys}/GameConfig/RFBJ01.ini | 0 Data/{User => Sys}/GameConfig/RFBP01.ini | 0 Data/{User => Sys}/GameConfig/RFCEGD.ini | 0 Data/{User => Sys}/GameConfig/RFCJGD.ini | 0 Data/{User => Sys}/GameConfig/RFCPGD.ini | 0 Data/{User => Sys}/GameConfig/RFEE01.ini | 0 Data/{User => Sys}/GameConfig/RFEJ01.ini | 0 Data/{User => Sys}/GameConfig/RFEP01.ini | 0 Data/{User => Sys}/GameConfig/RFFEGD.ini | 0 Data/{User => Sys}/GameConfig/RFFJGD.ini | 0 Data/{User => Sys}/GameConfig/RFFPGD.ini | 0 Data/{User => Sys}/GameConfig/RFQP69.ini | 0 Data/{User => Sys}/GameConfig/RFSEEB.ini | 0 Data/{User => Sys}/GameConfig/RFSJ8P.ini | 0 Data/{User => Sys}/GameConfig/RG5PWR.ini | 0 Data/{User => Sys}/GameConfig/RGAE8P.ini | 0 Data/{User => Sys}/GameConfig/RGHE52.ini | 0 Data/{User => Sys}/GameConfig/RGLE7D.ini | 0 Data/{User => Sys}/GameConfig/RGQE70.ini | 0 Data/{User => Sys}/GameConfig/RGVP52.ini | 0 Data/{User => Sys}/GameConfig/RH2P41.ini | 0 Data/{User => Sys}/GameConfig/RH8E4F.ini | 0 Data/{User => Sys}/GameConfig/RH8JEL.ini | 0 Data/{User => Sys}/GameConfig/RH8P4F.ini | 0 Data/{User => Sys}/GameConfig/RH8X4F.ini | 0 Data/{User => Sys}/GameConfig/RHAE01.ini | 0 Data/{User => Sys}/GameConfig/RHAJ01.ini | 0 Data/{User => Sys}/GameConfig/RHAK01.ini | 0 Data/{User => Sys}/GameConfig/RHAP01.ini | 0 Data/{User => Sys}/GameConfig/RHAW01.ini | 0 Data/{User => Sys}/GameConfig/RHDE8P.ini | 0 Data/{User => Sys}/GameConfig/RHDJ8P.ini | 0 Data/{User => Sys}/GameConfig/RHDP8P.ini | 0 Data/{User => Sys}/GameConfig/RHMEE9.ini | 0 Data/{User => Sys}/GameConfig/RHMP99.ini | 0 Data/{User => Sys}/GameConfig/RHOE8P.ini | 0 Data/{User => Sys}/GameConfig/RHOJ8P.ini | 0 Data/{User => Sys}/GameConfig/RHOP8P.ini | 0 Data/{User => Sys}/GameConfig/RHTP54.ini | 0 Data/{User => Sys}/GameConfig/RHUP7J.ini | 0 Data/{User => Sys}/GameConfig/RIBPKM.ini | 0 Data/{User => Sys}/GameConfig/RIHP8P.ini | 0 Data/{User => Sys}/GameConfig/RIJE69.ini | 0 Data/{User => Sys}/GameConfig/RINE08.ini | 0 Data/{User => Sys}/GameConfig/RINP08.ini | 0 Data/{User => Sys}/GameConfig/RIPEAF.ini | 0 Data/{User => Sys}/GameConfig/RIPJAF.ini | 0 Data/{User => Sys}/GameConfig/RIPPAF.ini | 0 Data/{User => Sys}/GameConfig/RIUJAF.ini | 0 Data/{User => Sys}/GameConfig/RIUPAF.ini | 0 Data/{User => Sys}/GameConfig/RIVEXJ.ini | 0 Data/{User => Sys}/GameConfig/RJ3P7J.ini | 0 Data/{User => Sys}/GameConfig/RJAP52.ini | 0 Data/{User => Sys}/GameConfig/RJCP52.ini | 0 Data/{User => Sys}/GameConfig/RJSXUG.ini | 0 Data/{User => Sys}/GameConfig/RK2EEB.ini | 0 Data/{User => Sys}/GameConfig/RK2JEB.ini | 0 Data/{User => Sys}/GameConfig/RK2P01.ini | 0 Data/{User => Sys}/GameConfig/RK5E01.ini | 0 Data/{User => Sys}/GameConfig/RKDEEB.ini | 0 Data/{User => Sys}/GameConfig/RKDJEB.ini | 0 Data/{User => Sys}/GameConfig/RKDP01.ini | 0 Data/{User => Sys}/GameConfig/RKDPEB.ini | 0 Data/{User => Sys}/GameConfig/RKIPUG.ini | 0 Data/{User => Sys}/GameConfig/RKMP5D.ini | 0 Data/{User => Sys}/GameConfig/RKSPUG.ini | 0 Data/{User => Sys}/GameConfig/RLBEWR.ini | 0 Data/{User => Sys}/GameConfig/RLEEFS.ini | 0 Data/{User => Sys}/GameConfig/RLGE64.ini | 0 Data/{User => Sys}/GameConfig/RLGJ52.ini | 0 Data/{User => Sys}/GameConfig/RLGP64.ini | 0 Data/{User => Sys}/GameConfig/RLJPKM.ini | 0 Data/{User => Sys}/GameConfig/RLXEMJ.ini | 0 Data/{User => Sys}/GameConfig/RM2E69.ini | 0 Data/{User => Sys}/GameConfig/RM3E01.ini | 0 Data/{User => Sys}/GameConfig/RM3J01.ini | 0 Data/{User => Sys}/GameConfig/RM3P01.ini | 0 Data/{User => Sys}/GameConfig/RM6EEB.ini | 0 Data/{User => Sys}/GameConfig/RM8E01.ini | 0 Data/{User => Sys}/GameConfig/RM8J01.ini | 0 Data/{User => Sys}/GameConfig/RM8K01.ini | 0 Data/{User => Sys}/GameConfig/RM8P01.ini | 0 Data/{User => Sys}/GameConfig/RMAE01.ini | 0 Data/{User => Sys}/GameConfig/RMAP01.ini | 0 Data/{User => Sys}/GameConfig/RMCE01.ini | 0 Data/{User => Sys}/GameConfig/RMCJ01.ini | 0 Data/{User => Sys}/GameConfig/RMCK01.ini | 0 Data/{User => Sys}/GameConfig/RMCP01.ini | 0 Data/{User => Sys}/GameConfig/RMGE01.ini | 0 Data/{User => Sys}/GameConfig/RMGJ01.ini | 0 Data/{User => Sys}/GameConfig/RMGK01.ini | 0 Data/{User => Sys}/GameConfig/RMGP01.ini | 0 Data/{User => Sys}/GameConfig/RMHE08.ini | 0 Data/{User => Sys}/GameConfig/RMHJ08.ini | 0 Data/{User => Sys}/GameConfig/RMHP08.ini | 0 Data/{User => Sys}/GameConfig/RMKE01.ini | 0 Data/{User => Sys}/GameConfig/RMKJ01.ini | 0 Data/{User => Sys}/GameConfig/RMKP01.ini | 0 Data/{User => Sys}/GameConfig/RMLEH4.ini | 0 Data/{User => Sys}/GameConfig/RMLJH4.ini | 0 Data/{User => Sys}/GameConfig/RMLK52.ini | 0 Data/{User => Sys}/GameConfig/RMLP7U.ini | 0 Data/{User => Sys}/GameConfig/RMLPH4.ini | 0 Data/{User => Sys}/GameConfig/RMSE52.ini | 0 Data/{User => Sys}/GameConfig/RNEEDA.ini | 0 Data/{User => Sys}/GameConfig/RNEJDA.ini | 0 Data/{User => Sys}/GameConfig/RNEPDA.ini | 0 Data/{User => Sys}/GameConfig/RNHE41.ini | 0 Data/{User => Sys}/GameConfig/RNMXUG.ini | 0 Data/{User => Sys}/GameConfig/RNOJ01.ini | 0 Data/{User => Sys}/GameConfig/RNOP01.ini | 0 Data/{User => Sys}/GameConfig/RO2P7N.ini | 0 Data/{User => Sys}/GameConfig/RO3EXJ.ini | 0 Data/{User => Sys}/GameConfig/RO3J99.ini | 0 Data/{User => Sys}/GameConfig/RO3P99.ini | 0 Data/{User => Sys}/GameConfig/RO7P7D.ini | 0 Data/{User => Sys}/GameConfig/RO8E7D.ini | 0 Data/{User => Sys}/GameConfig/RO9EFS.ini | 0 Data/{User => Sys}/GameConfig/RO9PNK.ini | 0 Data/{User => Sys}/GameConfig/ROAE36.ini | 0 Data/{User => Sys}/GameConfig/ROAP36.ini | 0 Data/{User => Sys}/GameConfig/ROCPNK.ini | 0 Data/{User => Sys}/GameConfig/RODE01.ini | 0 Data/{User => Sys}/GameConfig/RODJ01.ini | 0 Data/{User => Sys}/GameConfig/RODK01.ini | 0 Data/{User => Sys}/GameConfig/RODP01.ini | 0 Data/{User => Sys}/GameConfig/ROLE8P.ini | 0 Data/{User => Sys}/GameConfig/ROLJ01.ini | 0 Data/{User => Sys}/GameConfig/ROLK01.ini | 0 Data/{User => Sys}/GameConfig/ROLP8P.ini | 0 Data/{User => Sys}/GameConfig/RONEG9.ini | 0 Data/{User => Sys}/GameConfig/RONJG9.ini | 0 Data/{User => Sys}/GameConfig/RONPG9.ini | 0 Data/{User => Sys}/GameConfig/ROUJAF.ini | 0 Data/{User => Sys}/GameConfig/ROUPAF.ini | 0 Data/{User => Sys}/GameConfig/ROWE08.ini | 0 Data/{User => Sys}/GameConfig/ROWJ08.ini | 0 Data/{User => Sys}/GameConfig/ROWP08.ini | 0 Data/{User => Sys}/GameConfig/RP7P52.ini | 0 Data/{User => Sys}/GameConfig/RPBE01.ini | 0 Data/{User => Sys}/GameConfig/RPBJ01.ini | 0 Data/{User => Sys}/GameConfig/RPBP01.ini | 0 Data/{User => Sys}/GameConfig/RPDPGN.ini | 0 Data/{User => Sys}/GameConfig/RPJE7U.ini | 0 Data/{User => Sys}/GameConfig/RPJJ99.ini | 0 Data/{User => Sys}/GameConfig/RPPE41.ini | 0 Data/{User => Sys}/GameConfig/RPWZ41.ini | 0 Data/{User => Sys}/GameConfig/RPYP9B.ini | 0 Data/{User => Sys}/GameConfig/RQ6EJJ.ini | 0 Data/{User => Sys}/GameConfig/RQ6PKM.ini | 0 Data/{User => Sys}/GameConfig/RQ6XKM.ini | 0 Data/{User => Sys}/GameConfig/RQBENR.ini | 0 Data/{User => Sys}/GameConfig/RQLE64.ini | 0 Data/{User => Sys}/GameConfig/RQOP69.ini | 0 Data/{User => Sys}/GameConfig/RQREXJ.ini | 0 Data/{User => Sys}/GameConfig/RQRJAF.ini | 0 Data/{User => Sys}/GameConfig/RQRPAF.ini | 0 Data/{User => Sys}/GameConfig/RR2PUG.ini | 0 Data/{User => Sys}/GameConfig/RR5P70.ini | 0 Data/{User => Sys}/GameConfig/RRAXUG.ini | 0 Data/{User => Sys}/GameConfig/RRBE41.ini | 0 Data/{User => Sys}/GameConfig/RRBJ41.ini | 0 Data/{User => Sys}/GameConfig/RRBP41.ini | 0 Data/{User => Sys}/GameConfig/RRKE70.ini | 0 Data/{User => Sys}/GameConfig/RRKP70.ini | 0 Data/{User => Sys}/GameConfig/RRMX69.ini | 0 Data/{User => Sys}/GameConfig/RRXXUG.ini | 0 Data/{User => Sys}/GameConfig/RRYPHY.ini | 0 Data/{User => Sys}/GameConfig/RRZEGY.ini | 0 Data/{User => Sys}/GameConfig/RRZPGY.ini | 0 Data/{User => Sys}/GameConfig/RS5EC8.ini | 0 Data/{User => Sys}/GameConfig/RS5JC8.ini | 0 Data/{User => Sys}/GameConfig/RS5PC8.ini | 0 Data/{User => Sys}/GameConfig/RS8J8N.ini | 0 Data/{User => Sys}/GameConfig/RS9E8P.ini | 0 Data/{User => Sys}/GameConfig/RS9P8P.ini | 0 Data/{User => Sys}/GameConfig/RSBE01.ini | 0 Data/{User => Sys}/GameConfig/RSBJ01.ini | 0 Data/{User => Sys}/GameConfig/RSBP01.ini | 0 Data/{User => Sys}/GameConfig/RSFE7U.ini | 0 Data/{User => Sys}/GameConfig/RSFJ99.ini | 0 Data/{User => Sys}/GameConfig/RSFP99.ini | 0 Data/{User => Sys}/GameConfig/RSIE69.ini | 0 Data/{User => Sys}/GameConfig/RSIJ13.ini | 0 Data/{User => Sys}/GameConfig/RSIP69.ini | 0 Data/{User => Sys}/GameConfig/RSLEAF.ini | 0 Data/{User => Sys}/GameConfig/RSLJAF.ini | 0 Data/{User => Sys}/GameConfig/RSLKAF.ini | 0 Data/{User => Sys}/GameConfig/RSLPAF.ini | 0 Data/{User => Sys}/GameConfig/RSME8P.ini | 0 Data/{User => Sys}/GameConfig/RSMP8P.ini | 0 Data/{User => Sys}/GameConfig/RSPE01.ini | 0 Data/{User => Sys}/GameConfig/RSPP01.ini | 0 Data/{User => Sys}/GameConfig/RSRE8P.ini | 0 Data/{User => Sys}/GameConfig/RSRP8P.ini | 0 Data/{User => Sys}/GameConfig/RSTP64.ini | 0 Data/{User => Sys}/GameConfig/RSUP41.ini | 0 Data/{User => Sys}/GameConfig/RSVE8P.ini | 0 Data/{User => Sys}/GameConfig/RSVJ8P.ini | 0 Data/{User => Sys}/GameConfig/RSVP8P.ini | 0 Data/{User => Sys}/GameConfig/RSWP08.ini | 0 Data/{User => Sys}/GameConfig/RSXE69.ini | 0 Data/{User => Sys}/GameConfig/RSXJ13.ini | 0 Data/{User => Sys}/GameConfig/RSXK69.ini | 0 Data/{User => Sys}/GameConfig/RSXP69.ini | 0 Data/{User => Sys}/GameConfig/RSZPGT.ini | 0 Data/{User => Sys}/GameConfig/RT3E54.ini | 0 Data/{User => Sys}/GameConfig/RT3JEL.ini | 0 Data/{User => Sys}/GameConfig/RT3P54.ini | 0 Data/{User => Sys}/GameConfig/RT4EAF.ini | 0 Data/{User => Sys}/GameConfig/RT4JAF.ini | 0 Data/{User => Sys}/GameConfig/RT4PAF.ini | 0 Data/{User => Sys}/GameConfig/RT5E8P.ini | 0 Data/{User => Sys}/GameConfig/RT5P8P.ini | 0 Data/{User => Sys}/GameConfig/RT9E52.ini | 0 Data/{User => Sys}/GameConfig/RTBP52.ini | 0 Data/{User => Sys}/GameConfig/RTCP41.ini | 0 Data/{User => Sys}/GameConfig/RTHE52.ini | 0 Data/{User => Sys}/GameConfig/RTME41.ini | 0 Data/{User => Sys}/GameConfig/RTMP41.ini | 0 Data/{User => Sys}/GameConfig/RTNE41.ini | 0 Data/{User => Sys}/GameConfig/RTNJCQ.ini | 0 Data/{User => Sys}/GameConfig/RTNP41.ini | 0 Data/{User => Sys}/GameConfig/RTZE08.ini | 0 Data/{User => Sys}/GameConfig/RTZJ08.ini | 0 Data/{User => Sys}/GameConfig/RTZK08.ini | 0 Data/{User => Sys}/GameConfig/RTZP08.ini | 0 Data/{User => Sys}/GameConfig/RUCXRT.ini | 0 Data/{User => Sys}/GameConfig/RUUE01.ini | 0 Data/{User => Sys}/GameConfig/RUUJ01.ini | 0 Data/{User => Sys}/GameConfig/RUUK01.ini | 0 Data/{User => Sys}/GameConfig/RUUP01.ini | 0 Data/{User => Sys}/GameConfig/RUYE41.ini | 0 Data/{User => Sys}/GameConfig/RVKEXJ.ini | 0 Data/{User => Sys}/GameConfig/RVKP99.ini | 0 Data/{User => Sys}/GameConfig/RVOPPL.ini | 0 Data/{User => Sys}/GameConfig/RVQP41.ini | 0 Data/{User => Sys}/GameConfig/RVSE69.ini | 0 Data/{User => Sys}/GameConfig/RVSP69.ini | 0 Data/{User => Sys}/GameConfig/RVUP8P.ini | 0 Data/{User => Sys}/GameConfig/RVVP78.ini | 0 Data/{User => Sys}/GameConfig/RVZP52.ini | 0 Data/{User => Sys}/GameConfig/RW9X78.ini | 0 Data/{User => Sys}/GameConfig/RWBXUG.ini | 0 Data/{User => Sys}/GameConfig/RWEPA4.ini | 0 Data/{User => Sys}/GameConfig/RWLE01.ini | 0 Data/{User => Sys}/GameConfig/RWRE4F.ini | 0 Data/{User => Sys}/GameConfig/RWRP4F.ini | 0 Data/{User => Sys}/GameConfig/RWSE8P.ini | 0 Data/{User => Sys}/GameConfig/RWSJ01.ini | 0 Data/{User => Sys}/GameConfig/RWSK01.ini | 0 Data/{User => Sys}/GameConfig/RWSP8P.ini | 0 Data/{User => Sys}/GameConfig/RWUX52.ini | 0 Data/{User => Sys}/GameConfig/RX3E01.ini | 0 Data/{User => Sys}/GameConfig/RX9P69.ini | 0 Data/{User => Sys}/GameConfig/RX9Y69.ini | 0 Data/{User => Sys}/GameConfig/RXXE4Q.ini | 0 Data/{User => Sys}/GameConfig/RXXJ4Q.ini | 0 Data/{User => Sys}/GameConfig/RXXP4Q.ini | 0 Data/{User => Sys}/GameConfig/RYBE69.ini | 0 Data/{User => Sys}/GameConfig/RYOEA4.ini | 0 Data/{User => Sys}/GameConfig/RYQP69.ini | 0 Data/{User => Sys}/GameConfig/RYXP7J.ini | 0 Data/{User => Sys}/GameConfig/RZ9PG9.ini | 0 Data/{User => Sys}/GameConfig/RZDE01.ini | 0 Data/{User => Sys}/GameConfig/RZDJ01.ini | 0 Data/{User => Sys}/GameConfig/RZDK01.ini | 0 Data/{User => Sys}/GameConfig/RZDP01.ini | 0 Data/{User => Sys}/GameConfig/RZJD69.ini | 0 Data/{User => Sys}/GameConfig/RZJE69.ini | 0 Data/{User => Sys}/GameConfig/RZJJ13.ini | 0 Data/{User => Sys}/GameConfig/RZJP69.ini | 0 Data/{User => Sys}/GameConfig/RZPE01.ini | 0 Data/{User => Sys}/GameConfig/RZTE01.ini | 0 Data/{User => Sys}/GameConfig/RZTJ01.ini | 0 Data/{User => Sys}/GameConfig/RZTK01.ini | 0 Data/{User => Sys}/GameConfig/RZTP01.ini | 0 Data/{User => Sys}/GameConfig/RZTW01.ini | 0 Data/{User => Sys}/GameConfig/RZZE8P.ini | 0 Data/{User => Sys}/GameConfig/RZZJEL.ini | 0 Data/{User => Sys}/GameConfig/RZZP8P.ini | 0 Data/{User => Sys}/GameConfig/S2IP8P.ini | 0 Data/{User => Sys}/GameConfig/S2LE01.ini | 0 Data/{User => Sys}/GameConfig/S2LJ01.ini | 0 Data/{User => Sys}/GameConfig/S2LP01.ini | 0 Data/{User => Sys}/GameConfig/S2TJAF.ini | 0 Data/{User => Sys}/GameConfig/S2WE78.ini | 0 Data/{User => Sys}/GameConfig/S2WP78.ini | 0 Data/{User => Sys}/GameConfig/S3BEWR.ini | 0 Data/{User => Sys}/GameConfig/S3BPWR.ini | 0 Data/{User => Sys}/GameConfig/S59E01.ini | 0 Data/{User => Sys}/GameConfig/S59JC8.ini | 0 Data/{User => Sys}/GameConfig/S59P01.ini | 0 Data/{User => Sys}/GameConfig/S72E01.ini | 0 Data/{User => Sys}/GameConfig/S72J01.ini | 0 Data/{User => Sys}/GameConfig/S75E69.ini | 0 Data/{User => Sys}/GameConfig/S75P69.ini | 0 Data/{User => Sys}/GameConfig/SAKENS.ini | 0 Data/{User => Sys}/GameConfig/SAKPNS.ini | 0 Data/{User => Sys}/GameConfig/SB3E08.ini | 0 Data/{User => Sys}/GameConfig/SB3J08.ini | 0 Data/{User => Sys}/GameConfig/SB3P08.ini | 0 Data/{User => Sys}/GameConfig/SB4E01.ini | 0 Data/{User => Sys}/GameConfig/SB4J01.ini | 0 Data/{User => Sys}/GameConfig/SB4P01.ini | 0 Data/{User => Sys}/GameConfig/SBDE08.ini | 0 Data/{User => Sys}/GameConfig/SBDJ08.ini | 0 Data/{User => Sys}/GameConfig/SBDK08.ini | 0 Data/{User => Sys}/GameConfig/SBDP08.ini | 0 Data/{User => Sys}/GameConfig/SBLE5G.ini | 0 Data/{User => Sys}/GameConfig/SBNEG9.ini | 0 Data/{User => Sys}/GameConfig/SBVE78.ini | 0 Data/{User => Sys}/GameConfig/SC2E8P.ini | 0 Data/{User => Sys}/GameConfig/SC2P8P.ini | 0 Data/{User => Sys}/GameConfig/SC4E64.ini | 0 Data/{User => Sys}/GameConfig/SC4P64.ini | 0 Data/{User => Sys}/GameConfig/SC7D52.ini | 0 Data/{User => Sys}/GameConfig/SC7E52.ini | 0 Data/{User => Sys}/GameConfig/SC7F52.ini | 0 Data/{User => Sys}/GameConfig/SC7I52.ini | 0 Data/{User => Sys}/GameConfig/SC7P52.ini | 0 Data/{User => Sys}/GameConfig/SC7S52.ini | 0 Data/{User => Sys}/GameConfig/SC8E01.ini | 0 Data/{User => Sys}/GameConfig/SC8J01.ini | 0 Data/{User => Sys}/GameConfig/SC8P01.ini | 0 Data/{User => Sys}/GameConfig/SCAE18.ini | 0 Data/{User => Sys}/GameConfig/SCAJ18.ini | 0 Data/{User => Sys}/GameConfig/SCAP18.ini | 0 Data/{User => Sys}/GameConfig/SCYE4Q.ini | 0 Data/{User => Sys}/GameConfig/SCYP4Q.ini | 0 Data/{User => Sys}/GameConfig/SCYX4Q.ini | 0 Data/{User => Sys}/GameConfig/SCYY4Q.ini | 0 Data/{User => Sys}/GameConfig/SCYZ4Q.ini | 0 Data/{User => Sys}/GameConfig/SD2E41.ini | 0 Data/{User => Sys}/GameConfig/SD2J01.ini | 0 Data/{User => Sys}/GameConfig/SD2P41.ini | 0 Data/{User => Sys}/GameConfig/SD2Y41.ini | 0 Data/{User => Sys}/GameConfig/SDBE78.ini | 0 Data/{User => Sys}/GameConfig/SDBP78.ini | 0 Data/{User => Sys}/GameConfig/SDFE4Q.ini | 0 Data/{User => Sys}/GameConfig/SDNE41.ini | 0 Data/{User => Sys}/GameConfig/SDNP41.ini | 0 Data/{User => Sys}/GameConfig/SDWE18.ini | 0 Data/{User => Sys}/GameConfig/SDWJ18.ini | 0 Data/{User => Sys}/GameConfig/SDWP18.ini | 0 Data/{User => Sys}/GameConfig/SE2P69.ini | 0 Data/{User => Sys}/GameConfig/SEAE69.ini | 0 Data/{User => Sys}/GameConfig/SEAJ13.ini | 0 Data/{User => Sys}/GameConfig/SEAP69.ini | 0 Data/{User => Sys}/GameConfig/SEME4Q.ini | 0 Data/{User => Sys}/GameConfig/SEMJ01.ini | 0 Data/{User => Sys}/GameConfig/SEMP4Q.ini | 0 Data/{User => Sys}/GameConfig/SEMX4Q.ini | 0 Data/{User => Sys}/GameConfig/SEMY4Q.ini | 0 Data/{User => Sys}/GameConfig/SEMZ4Q.ini | 0 Data/{User => Sys}/GameConfig/SERE4Q.ini | 0 Data/{User => Sys}/GameConfig/SERF4Q.ini | 0 Data/{User => Sys}/GameConfig/SERP4Q.ini | 0 Data/{User => Sys}/GameConfig/SF8E01.ini | 0 Data/{User => Sys}/GameConfig/SF8J01.ini | 0 Data/{User => Sys}/GameConfig/SF8P01.ini | 0 Data/{User => Sys}/GameConfig/SFIE01.ini | 0 Data/{User => Sys}/GameConfig/SFIP01.ini | 0 Data/{User => Sys}/GameConfig/SFWE69.ini | 0 Data/{User => Sys}/GameConfig/SFWP69.ini | 0 Data/{User => Sys}/GameConfig/SGAP8P.ini | 0 Data/{User => Sys}/GameConfig/SH6E52.ini | 0 Data/{User => Sys}/GameConfig/SHDE52.ini | 0 Data/{User => Sys}/GameConfig/SHLPA4.ini | 0 Data/{User => Sys}/GameConfig/SILE78.ini | 0 Data/{User => Sys}/GameConfig/SILP78.ini | 0 Data/{User => Sys}/GameConfig/SJBE52.ini | 0 Data/{User => Sys}/GameConfig/SJBP52.ini | 0 Data/{User => Sys}/GameConfig/SJDE41.ini | 0 Data/{User => Sys}/GameConfig/SJDP41.ini | 0 Data/{User => Sys}/GameConfig/SJDY41.ini | 0 Data/{User => Sys}/GameConfig/SJDZ41.ini | 0 Data/{User => Sys}/GameConfig/SJXD41.ini | 0 Data/{User => Sys}/GameConfig/SJXE41.ini | 0 Data/{User => Sys}/GameConfig/SJXP41.ini | 0 Data/{User => Sys}/GameConfig/SK3EEB.ini | 0 Data/{User => Sys}/GameConfig/SK4E52.ini | 0 Data/{User => Sys}/GameConfig/SKJE78.ini | 0 Data/{User => Sys}/GameConfig/SKVE20.ini | 0 Data/{User => Sys}/GameConfig/SLSEXJ.ini | 0 Data/{User => Sys}/GameConfig/SLSJ01.ini | 0 Data/{User => Sys}/GameConfig/SLSP01.ini | 0 Data/{User => Sys}/GameConfig/SLWE41.ini | 0 Data/{User => Sys}/GameConfig/SMBE8P.ini | 0 Data/{User => Sys}/GameConfig/SMBP8P.ini | 0 Data/{User => Sys}/GameConfig/SMFE4Q.ini | 0 Data/{User => Sys}/GameConfig/SMFP4Q.ini | 0 Data/{User => Sys}/GameConfig/SMNE01.ini | 0 Data/{User => Sys}/GameConfig/SMNJ01.ini | 0 Data/{User => Sys}/GameConfig/SMNK01.ini | 0 Data/{User => Sys}/GameConfig/SMNP01.ini | 0 Data/{User => Sys}/GameConfig/SMNW01.ini | 0 Data/{User => Sys}/GameConfig/SMOE41.ini | 0 Data/{User => Sys}/GameConfig/SMOP41.ini | 0 Data/{User => Sys}/GameConfig/SMOX41.ini | 0 Data/{User => Sys}/GameConfig/SN4EDA.ini | 0 Data/{User => Sys}/GameConfig/SN4JDA.ini | 0 Data/{User => Sys}/GameConfig/SN4XGT.ini | 0 Data/{User => Sys}/GameConfig/SNCE8P.ini | 0 Data/{User => Sys}/GameConfig/SNCJ8P.ini | 0 Data/{User => Sys}/GameConfig/SNCP8P.ini | 0 Data/{User => Sys}/GameConfig/SNDE20.ini | 0 Data/{User => Sys}/GameConfig/SNJE69.ini | 0 Data/{User => Sys}/GameConfig/SNJP69.ini | 0 Data/{User => Sys}/GameConfig/SO3EE9.ini | 0 Data/{User => Sys}/GameConfig/SO3J99.ini | 0 Data/{User => Sys}/GameConfig/SOJE41.ini | 0 Data/{User => Sys}/GameConfig/SOJP41.ini | 0 Data/{User => Sys}/GameConfig/SOUE01.ini | 0 Data/{User => Sys}/GameConfig/SOUJ01.ini | 0 Data/{User => Sys}/GameConfig/SOUK01.ini | 0 Data/{User => Sys}/GameConfig/SOUP01.ini | 0 Data/{User => Sys}/GameConfig/SPDE52.ini | 0 Data/{User => Sys}/GameConfig/SPDP52.ini | 0 Data/{User => Sys}/GameConfig/SPPEFS.ini | 0 Data/{User => Sys}/GameConfig/SPTJEB.ini | 0 Data/{User => Sys}/GameConfig/SPVEA4.ini | 0 Data/{User => Sys}/GameConfig/SPVPA4.ini | 0 Data/{User => Sys}/GameConfig/SPVXA4.ini | 0 Data/{User => Sys}/GameConfig/SPVYA4.ini | 0 Data/{User => Sys}/GameConfig/SQME52.ini | 0 Data/{User => Sys}/GameConfig/SQMP52.ini | 0 Data/{User => Sys}/GameConfig/SR5E41.ini | 0 Data/{User => Sys}/GameConfig/SRQE41.ini | 0 Data/{User => Sys}/GameConfig/SRQP41.ini | 0 Data/{User => Sys}/GameConfig/SS3EWR.ini | 0 Data/{User => Sys}/GameConfig/SSQE01.ini | 0 Data/{User => Sys}/GameConfig/SSQJ01.ini | 0 Data/{User => Sys}/GameConfig/SSQP01.ini | 0 Data/{User => Sys}/GameConfig/SSRE20.ini | 0 Data/{User => Sys}/GameConfig/SSRPXT.ini | 0 Data/{User => Sys}/GameConfig/SSZE5G.ini | 0 Data/{User => Sys}/GameConfig/STEETR.ini | 0 Data/{User => Sys}/GameConfig/STHP8P.ini | 0 Data/{User => Sys}/GameConfig/STKE08.ini | 0 Data/{User => Sys}/GameConfig/STKJ08.ini | 0 Data/{User => Sys}/GameConfig/STKP08.ini | 0 Data/{User => Sys}/GameConfig/SUKE01.ini | 0 Data/{User => Sys}/GameConfig/SUKJ01.ini | 0 Data/{User => Sys}/GameConfig/SUKP01.ini | 0 Data/{User => Sys}/GameConfig/SVBE52.ini | 0 Data/{User => Sys}/GameConfig/SVBP52.ini | 0 Data/{User => Sys}/GameConfig/SVME01.ini | 0 Data/{User => Sys}/GameConfig/SVMJ01.ini | 0 Data/{User => Sys}/GameConfig/SVMP01.ini | 0 Data/{User => Sys}/GameConfig/SWAE52.ini | 0 Data/{User => Sys}/GameConfig/SX3J01.ini | 0 Data/{User => Sys}/GameConfig/SX3P01.ini | 0 Data/{User => Sys}/GameConfig/SX4J01.ini | 0 Data/{User => Sys}/GameConfig/SX4P01.ini | 0 Data/{User => Sys}/GameConfig/SX8E52.ini | 0 Data/{User => Sys}/GameConfig/SXBP52.ini | 0 Data/{User => Sys}/GameConfig/SXCE52.ini | 0 Data/{User => Sys}/GameConfig/SXCP52.ini | 0 Data/{User => Sys}/GameConfig/SXDE52.ini | 0 Data/{User => Sys}/GameConfig/SXEE52.ini | 0 Data/{User => Sys}/GameConfig/SZAE69.ini | 0 Data/{User => Sys}/GameConfig/SZAP69.ini | 0 Data/{User => Sys}/GameConfig/SZBE69.ini | 0 Data/{User => Sys}/GameConfig/SZBP69.ini | 0 Data/{User => Sys}/GameConfig/UGPE01.ini | 0 Data/{User => Sys}/GameConfig/UGPP01.ini | 0 Data/{User => Sys}/GameConfig/W2GE08.ini | 0 Data/{User => Sys}/GameConfig/W2GP08.ini | 0 Data/{User => Sys}/GameConfig/W2MEBB.ini | 0 Data/{User => Sys}/GameConfig/W3GE08.ini | 0 Data/{User => Sys}/GameConfig/W3GP08.ini | 0 Data/{User => Sys}/GameConfig/W8CEXS.ini | 0 Data/{User => Sys}/GameConfig/W8CPXS.ini | 0 Data/{User => Sys}/GameConfig/WA4P01.ini | 0 Data/{User => Sys}/GameConfig/WALE01.ini | 0 Data/{User => Sys}/GameConfig/WAYETJ.ini | 0 Data/{User => Sys}/GameConfig/WB2ETL.ini | 0 Data/{User => Sys}/GameConfig/WB3ETL.ini | 0 Data/{User => Sys}/GameConfig/WB6EGL.ini | 0 Data/{User => Sys}/GameConfig/WBLPGD.ini | 0 Data/{User => Sys}/GameConfig/WBME01.ini | 0 Data/{User => Sys}/GameConfig/WBQE18.ini | 0 Data/{User => Sys}/GameConfig/WBXETL.ini | 0 Data/{User => Sys}/GameConfig/WBYETL.ini | 0 Data/{User => Sys}/GameConfig/WBZETL.ini | 0 Data/{User => Sys}/GameConfig/WC6EUP.ini | 0 Data/{User => Sys}/GameConfig/WCHEJS.ini | 0 Data/{User => Sys}/GameConfig/WCVENV.ini | 0 Data/{User => Sys}/GameConfig/WD9EA4.ini | 0 Data/{User => Sys}/GameConfig/WDME01.ini | 0 Data/{User => Sys}/GameConfig/WDMP01.ini | 0 Data/{User => Sys}/GameConfig/WERP18.ini | 0 Data/{User => Sys}/GameConfig/WF4EGD.ini | 0 Data/{User => Sys}/GameConfig/WFLE01.ini | 0 Data/{User => Sys}/GameConfig/WFUEQQ.ini | 0 Data/{User => Sys}/GameConfig/WGDEA4.ini | 0 Data/{User => Sys}/GameConfig/WGDPA4.ini | 0 Data/{User => Sys}/GameConfig/WGOEWG.ini | 0 Data/{User => Sys}/GameConfig/WGOPWG.ini | 0 Data/{User => Sys}/GameConfig/WGSE08.ini | 0 Data/{User => Sys}/GameConfig/WGSP08.ini | 0 Data/{User => Sys}/GameConfig/WGYEHN.ini | 0 Data/{User => Sys}/GameConfig/WHFETY.ini | 0 Data/{User => Sys}/GameConfig/WHWEFJ.ini | 0 Data/{User => Sys}/GameConfig/WHWPFJ.ini | 0 Data/{User => Sys}/GameConfig/WICPKQ.ini | 0 Data/{User => Sys}/GameConfig/WIDEUN.ini | 0 Data/{User => Sys}/GameConfig/WILETL.ini | 0 Data/{User => Sys}/GameConfig/WIYETL.ini | 0 Data/{User => Sys}/GameConfig/WJEEJX.ini | 0 Data/{User => Sys}/GameConfig/WKTJA4.ini | 0 Data/{User => Sys}/GameConfig/WKTPA4.ini | 0 Data/{User => Sys}/GameConfig/WLOEHL.ini | 0 Data/{User => Sys}/GameConfig/WLWEHL.ini | 0 Data/{User => Sys}/GameConfig/WM8E18.ini | 0 Data/{User => Sys}/GameConfig/WMBP01.ini | 0 Data/{User => Sys}/GameConfig/WMMEAF.ini | 0 Data/{User => Sys}/GameConfig/WOTEM0.ini | 0 Data/{User => Sys}/GameConfig/WPCE01.ini | 0 Data/{User => Sys}/GameConfig/WPJEJW.ini | 0 Data/{User => Sys}/GameConfig/WPPEXS.ini | 0 Data/{User => Sys}/GameConfig/WPPJJF.ini | 0 Data/{User => Sys}/GameConfig/WPSE01.ini | 0 Data/{User => Sys}/GameConfig/WPUEGD.ini | 0 Data/{User => Sys}/GameConfig/WPYPPY.ini | 0 Data/{User => Sys}/GameConfig/WR9E08.ini | 0 Data/{User => Sys}/GameConfig/WR9P08.ini | 0 Data/{User => Sys}/GameConfig/WRGEHU.ini | 0 Data/{User => Sys}/GameConfig/WRIPGD.ini | 0 Data/{User => Sys}/GameConfig/WRUPXS.ini | 0 Data/{User => Sys}/GameConfig/WRXE08.ini | 0 Data/{User => Sys}/GameConfig/WSNE8P.ini | 0 Data/{User => Sys}/GameConfig/WTEELU.ini | 0 Data/{User => Sys}/GameConfig/WTKEGL.ini | 0 Data/{User => Sys}/GameConfig/WTRPXS.ini | 0 Data/{User => Sys}/GameConfig/WTTPTW.ini | 0 Data/{User => Sys}/GameConfig/WTXPJS.ini | 0 Data/{User => Sys}/GameConfig/WWRE01.ini | 0 Data/{User => Sys}/GameConfig/WZIPTW.ini | 0 Data/{User => Sys}/GameConfig/WZPPRZ.ini | 0 Source/Core/Common/Src/CommonPaths.h | 6 ------ Source/Core/DolphinWX/CMakeLists.txt | 6 +++--- Source/Core/DolphinWX/Src/Main.cpp | 4 ++-- 1529 files changed, 5 insertions(+), 12 deletions(-) rename Data/{User => Sys}/GameConfig/D43E01.ini (100%) rename Data/{User => Sys}/GameConfig/D43J01.ini (100%) rename Data/{User => Sys}/GameConfig/D43P01.ini (100%) rename Data/{User => Sys}/GameConfig/D43U01.ini (100%) rename Data/{User => Sys}/GameConfig/DTLX01.ini (100%) rename Data/{User => Sys}/GameConfig/DVDXDV.ini (100%) rename Data/{User => Sys}/GameConfig/FABP01.ini (100%) rename Data/{User => Sys}/GameConfig/FBYE01.ini (100%) rename Data/{User => Sys}/GameConfig/G2BE5G.ini (100%) rename Data/{User => Sys}/GameConfig/G2BP7D.ini (100%) rename Data/{User => Sys}/GameConfig/G2CE52.ini (100%) rename Data/{User => Sys}/GameConfig/G2FE78.ini (100%) rename Data/{User => Sys}/GameConfig/G2GJB2.ini (100%) rename Data/{User => Sys}/GameConfig/G2ME01.ini (100%) rename Data/{User => Sys}/GameConfig/G2MP01.ini (100%) rename Data/{User => Sys}/GameConfig/G2OE41.ini (100%) rename Data/{User => Sys}/GameConfig/G2OP41.ini (100%) rename Data/{User => Sys}/GameConfig/G2RE52.ini (100%) rename Data/{User => Sys}/GameConfig/G2TE52.ini (100%) rename Data/{User => Sys}/GameConfig/G2VE08.ini (100%) rename Data/{User => Sys}/GameConfig/G2VP08.ini (100%) rename Data/{User => Sys}/GameConfig/G2XE8P.ini (100%) rename Data/{User => Sys}/GameConfig/G2XP8P.ini (100%) rename Data/{User => Sys}/GameConfig/G3AD69.ini (100%) rename Data/{User => Sys}/GameConfig/G3AE69.ini (100%) rename Data/{User => Sys}/GameConfig/G3AF69.ini (100%) rename Data/{User => Sys}/GameConfig/G3AP69.ini (100%) rename Data/{User => Sys}/GameConfig/G3DE6L.ini (100%) rename Data/{User => Sys}/GameConfig/G3EE51.ini (100%) rename Data/{User => Sys}/GameConfig/G3FE69.ini (100%) rename Data/{User => Sys}/GameConfig/G3FF69.ini (100%) rename Data/{User => Sys}/GameConfig/G3FP69.ini (100%) rename Data/{User => Sys}/GameConfig/G3JEAF.ini (100%) rename Data/{User => Sys}/GameConfig/G3LE8P.ini (100%) rename Data/{User => Sys}/GameConfig/G3NJDA.ini (100%) rename Data/{User => Sys}/GameConfig/G3QEA4.ini (100%) rename Data/{User => Sys}/GameConfig/G3RD52.ini (100%) rename Data/{User => Sys}/GameConfig/G3RE52.ini (100%) rename Data/{User => Sys}/GameConfig/G3RF52.ini (100%) rename Data/{User => Sys}/GameConfig/G3RP52.ini (100%) rename Data/{User => Sys}/GameConfig/G3SE41.ini (100%) rename Data/{User => Sys}/GameConfig/G3VE69.ini (100%) rename Data/{User => Sys}/GameConfig/G3XE52.ini (100%) rename Data/{User => Sys}/GameConfig/G3XP52.ini (100%) rename Data/{User => Sys}/GameConfig/G4AEE9.ini (100%) rename Data/{User => Sys}/GameConfig/G4BE08.ini (100%) rename Data/{User => Sys}/GameConfig/G4BP08.ini (100%) rename Data/{User => Sys}/GameConfig/G4CE54.ini (100%) rename Data/{User => Sys}/GameConfig/G4FD69.ini (100%) rename Data/{User => Sys}/GameConfig/G4FE69.ini (100%) rename Data/{User => Sys}/GameConfig/G4FF69.ini (100%) rename Data/{User => Sys}/GameConfig/G4FP69.ini (100%) rename Data/{User => Sys}/GameConfig/G4GEE9.ini (100%) rename Data/{User => Sys}/GameConfig/G4ME69.ini (100%) rename Data/{User => Sys}/GameConfig/G4MP69.ini (100%) rename Data/{User => Sys}/GameConfig/G4NJDA.ini (100%) rename Data/{User => Sys}/GameConfig/G4QE01.ini (100%) rename Data/{User => Sys}/GameConfig/G4QP01.ini (100%) rename Data/{User => Sys}/GameConfig/G4SE01.ini (100%) rename Data/{User => Sys}/GameConfig/G4SP01.ini (100%) rename Data/{User => Sys}/GameConfig/G4ZE69.ini (100%) rename Data/{User => Sys}/GameConfig/G5DE78.ini (100%) rename Data/{User => Sys}/GameConfig/G5DP78.ini (100%) rename Data/{User => Sys}/GameConfig/G5SE7D.ini (100%) rename Data/{User => Sys}/GameConfig/G5SP7D.ini (100%) rename Data/{User => Sys}/GameConfig/G63E41.ini (100%) rename Data/{User => Sys}/GameConfig/G63P41.ini (100%) rename Data/{User => Sys}/GameConfig/G6FE69.ini (100%) rename Data/{User => Sys}/GameConfig/G6NE69.ini (100%) rename Data/{User => Sys}/GameConfig/G6NP69.ini (100%) rename Data/{User => Sys}/GameConfig/G6QE08.ini (100%) rename Data/{User => Sys}/GameConfig/G6TE5G.ini (100%) rename Data/{User => Sys}/GameConfig/G6TP5G.ini (100%) rename Data/{User => Sys}/GameConfig/G89EAF.ini (100%) rename Data/{User => Sys}/GameConfig/G8FE8P.ini (100%) rename Data/{User => Sys}/GameConfig/G8ME01.ini (100%) rename Data/{User => Sys}/GameConfig/G8MJ01.ini (100%) rename Data/{User => Sys}/GameConfig/G8MP01.ini (100%) rename Data/{User => Sys}/GameConfig/G8OJ18.ini (100%) rename Data/{User => Sys}/GameConfig/G8SJAF.ini (100%) rename Data/{User => Sys}/GameConfig/G8WE01.ini (100%) rename Data/{User => Sys}/GameConfig/G8WP01.ini (100%) rename Data/{User => Sys}/GameConfig/G9BEE9.ini (100%) rename Data/{User => Sys}/GameConfig/G9RE7D.ini (100%) rename Data/{User => Sys}/GameConfig/G9SE8P.ini (100%) rename Data/{User => Sys}/GameConfig/G9SJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/G9SP8P.ini (100%) rename Data/{User => Sys}/GameConfig/G9TD52.ini (100%) rename Data/{User => Sys}/GameConfig/G9TE52.ini (100%) rename Data/{User => Sys}/GameConfig/G9TF52.ini (100%) rename Data/{User => Sys}/GameConfig/G9TI52.ini (100%) rename Data/{User => Sys}/GameConfig/G9TP52.ini (100%) rename Data/{User => Sys}/GameConfig/GA2E51.ini (100%) rename Data/{User => Sys}/GameConfig/GA3E51.ini (100%) rename Data/{User => Sys}/GameConfig/GA4E51.ini (100%) rename Data/{User => Sys}/GameConfig/GA7E70.ini (100%) rename Data/{User => Sys}/GameConfig/GABEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GACE5H.ini (100%) rename Data/{User => Sys}/GameConfig/GAFE01.ini (100%) rename Data/{User => Sys}/GameConfig/GAFJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GAFP01.ini (100%) rename Data/{User => Sys}/GameConfig/GAFU01.ini (100%) rename Data/{User => Sys}/GameConfig/GAGP70.ini (100%) rename Data/{User => Sys}/GameConfig/GAHEGG.ini (100%) rename Data/{User => Sys}/GameConfig/GALE01.ini (100%) rename Data/{User => Sys}/GameConfig/GALJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GALP01.ini (100%) rename Data/{User => Sys}/GameConfig/GAME5H.ini (100%) rename Data/{User => Sys}/GameConfig/GANE7U.ini (100%) rename Data/{User => Sys}/GameConfig/GAPE52.ini (100%) rename Data/{User => Sys}/GameConfig/GAQE6S.ini (100%) rename Data/{User => Sys}/GameConfig/GARE5H.ini (100%) rename Data/{User => Sys}/GameConfig/GATE51.ini (100%) rename Data/{User => Sys}/GameConfig/GATP51.ini (100%) rename Data/{User => Sys}/GameConfig/GAUE08.ini (100%) rename Data/{User => Sys}/GameConfig/GAUJ08.ini (100%) rename Data/{User => Sys}/GameConfig/GAVE78.ini (100%) rename Data/{User => Sys}/GameConfig/GAVP78.ini (100%) rename Data/{User => Sys}/GameConfig/GAVY78.ini (100%) rename Data/{User => Sys}/GameConfig/GAXE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GAZD69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZE69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZF69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZH69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZI69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZJ69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZM69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZP69.ini (100%) rename Data/{User => Sys}/GameConfig/GAZS69.ini (100%) rename Data/{User => Sys}/GameConfig/GB3E51.ini (100%) rename Data/{User => Sys}/GameConfig/GB4E51.ini (100%) rename Data/{User => Sys}/GameConfig/GB4P51.ini (100%) rename Data/{User => Sys}/GameConfig/GBDE5G.ini (100%) rename Data/{User => Sys}/GameConfig/GBDS7D.ini (100%) rename Data/{User => Sys}/GameConfig/GBFE70.ini (100%) rename Data/{User => Sys}/GameConfig/GBGE5G.ini (100%) rename Data/{User => Sys}/GameConfig/GBGP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GBHDC8.ini (100%) rename Data/{User => Sys}/GameConfig/GBHEC8.ini (100%) rename Data/{User => Sys}/GameConfig/GBHFC8.ini (100%) rename Data/{User => Sys}/GameConfig/GBHPC8.ini (100%) rename Data/{User => Sys}/GameConfig/GBIE08.ini (100%) rename Data/{User => Sys}/GameConfig/GBIP08.ini (100%) rename Data/{User => Sys}/GameConfig/GBKE70.ini (100%) rename Data/{User => Sys}/GameConfig/GBLE52.ini (100%) rename Data/{User => Sys}/GameConfig/GBLP52.ini (100%) rename Data/{User => Sys}/GameConfig/GBLPGL.ini (100%) rename Data/{User => Sys}/GameConfig/GBME7F.ini (100%) rename Data/{User => Sys}/GameConfig/GBMP7F.ini (100%) rename Data/{User => Sys}/GameConfig/GBOP51.ini (100%) rename Data/{User => Sys}/GameConfig/GBQE78.ini (100%) rename Data/{User => Sys}/GameConfig/GBSE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GBSP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GBTE70.ini (100%) rename Data/{User => Sys}/GameConfig/GBVE41.ini (100%) rename Data/{User => Sys}/GameConfig/GBVP41.ini (100%) rename Data/{User => Sys}/GameConfig/GBWD64.ini (100%) rename Data/{User => Sys}/GameConfig/GBWE64.ini (100%) rename Data/{User => Sys}/GameConfig/GBWF64.ini (100%) rename Data/{User => Sys}/GameConfig/GBWP64.ini (100%) rename Data/{User => Sys}/GameConfig/GBXE51.ini (100%) rename Data/{User => Sys}/GameConfig/GBYE0A.ini (100%) rename Data/{User => Sys}/GameConfig/GBZE08.ini (100%) rename Data/{User => Sys}/GameConfig/GBZP08.ini (100%) rename Data/{User => Sys}/GameConfig/GC2E9G.ini (100%) rename Data/{User => Sys}/GameConfig/GC3D78.ini (100%) rename Data/{User => Sys}/GameConfig/GC3E78.ini (100%) rename Data/{User => Sys}/GameConfig/GC3F78.ini (100%) rename Data/{User => Sys}/GameConfig/GC3P78.ini (100%) rename Data/{User => Sys}/GameConfig/GC4JBN.ini (100%) rename Data/{User => Sys}/GameConfig/GC5PNK.ini (100%) rename Data/{User => Sys}/GameConfig/GC6E01.ini (100%) rename Data/{User => Sys}/GameConfig/GC6P01.ini (100%) rename Data/{User => Sys}/GameConfig/GC7PNK.ini (100%) rename Data/{User => Sys}/GameConfig/GC9P6S.ini (100%) rename Data/{User => Sys}/GameConfig/GCAE5H.ini (100%) rename Data/{User => Sys}/GameConfig/GCBE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GCBP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GCCE01.ini (100%) rename Data/{User => Sys}/GameConfig/GCCP01.ini (100%) rename Data/{User => Sys}/GameConfig/GCDE08.ini (100%) rename Data/{User => Sys}/GameConfig/GCDP08.ini (100%) rename Data/{User => Sys}/GameConfig/GCEE41.ini (100%) rename Data/{User => Sys}/GameConfig/GCEP41.ini (100%) rename Data/{User => Sys}/GameConfig/GCFE9G.ini (100%) rename Data/{User => Sys}/GameConfig/GCGE41.ini (100%) rename Data/{User => Sys}/GameConfig/GCHE78.ini (100%) rename Data/{User => Sys}/GameConfig/GCJE41.ini (100%) rename Data/{User => Sys}/GameConfig/GCJP41.ini (100%) rename Data/{User => Sys}/GameConfig/GCLP69.ini (100%) rename Data/{User => Sys}/GameConfig/GCNE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GCNP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GCOE52.ini (100%) rename Data/{User => Sys}/GameConfig/GCOPDV.ini (100%) rename Data/{User => Sys}/GameConfig/GCPE6S.ini (100%) rename Data/{User => Sys}/GameConfig/GCPP6S.ini (100%) rename Data/{User => Sys}/GameConfig/GCQE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GCQP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GCSEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GCTE51.ini (100%) rename Data/{User => Sys}/GameConfig/GCTP51.ini (100%) rename Data/{User => Sys}/GameConfig/GCVEEB.ini (100%) rename Data/{User => Sys}/GameConfig/GCZE69.ini (100%) rename Data/{User => Sys}/GameConfig/GCZP69.ini (100%) rename Data/{User => Sys}/GameConfig/GD4E6S.ini (100%) rename Data/{User => Sys}/GameConfig/GD6EB2.ini (100%) rename Data/{User => Sys}/GameConfig/GD6P70.ini (100%) rename Data/{User => Sys}/GameConfig/GD7PB2.ini (100%) rename Data/{User => Sys}/GameConfig/GD9E69.ini (100%) rename Data/{User => Sys}/GameConfig/GD9P69.ini (100%) rename Data/{User => Sys}/GameConfig/GDDE41.ini (100%) rename Data/{User => Sys}/GameConfig/GDEE71.ini (100%) rename Data/{User => Sys}/GameConfig/GDFE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GDFP5D.ini (100%) rename Data/{User => Sys}/GameConfig/GDGE7H.ini (100%) rename Data/{User => Sys}/GameConfig/GDGP78.ini (100%) rename Data/{User => Sys}/GameConfig/GDIE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GDIP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GDJEB2.ini (100%) rename Data/{User => Sys}/GameConfig/GDKEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GDLEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GDME01.ini (100%) rename Data/{User => Sys}/GameConfig/GDQP6S.ini (100%) rename Data/{User => Sys}/GameConfig/GDREAF.ini (100%) rename Data/{User => Sys}/GameConfig/GDSE78.ini (100%) rename Data/{User => Sys}/GameConfig/GDSP78.ini (100%) rename Data/{User => Sys}/GameConfig/GDTE69.ini (100%) rename Data/{User => Sys}/GameConfig/GDVE6L.ini (100%) rename Data/{User => Sys}/GameConfig/GDVP6L.ini (100%) rename Data/{User => Sys}/GameConfig/GDWEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GE4E7D.ini (100%) rename Data/{User => Sys}/GameConfig/GE5EA4.ini (100%) rename Data/{User => Sys}/GameConfig/GE9E5D.ini (100%) rename Data/{User => Sys}/GameConfig/GEAE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GEAP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GEBEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GEDE01.ini (100%) rename Data/{User => Sys}/GameConfig/GEDP01.ini (100%) rename Data/{User => Sys}/GameConfig/GEME7F.ini (100%) rename Data/{User => Sys}/GameConfig/GEND69.ini (100%) rename Data/{User => Sys}/GameConfig/GENE69.ini (100%) rename Data/{User => Sys}/GameConfig/GENP69.ini (100%) rename Data/{User => Sys}/GameConfig/GENS69.ini (100%) rename Data/{User => Sys}/GameConfig/GEOE08.ini (100%) rename Data/{User => Sys}/GameConfig/GEOP08.ini (100%) rename Data/{User => Sys}/GameConfig/GESEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GEWE41.ini (100%) rename Data/{User => Sys}/GameConfig/GEXE52.ini (100%) rename Data/{User => Sys}/GameConfig/GEYE69.ini (100%) rename Data/{User => Sys}/GameConfig/GEZE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GEZP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GF2E69.ini (100%) rename Data/{User => Sys}/GameConfig/GF4E52.ini (100%) rename Data/{User => Sys}/GameConfig/GF4F52.ini (100%) rename Data/{User => Sys}/GameConfig/GF4P52.ini (100%) rename Data/{User => Sys}/GameConfig/GF5E69.ini (100%) rename Data/{User => Sys}/GameConfig/GF6E69.ini (100%) rename Data/{User => Sys}/GameConfig/GF6F69.ini (100%) rename Data/{User => Sys}/GameConfig/GF7E01.ini (100%) rename Data/{User => Sys}/GameConfig/GF7P01.ini (100%) rename Data/{User => Sys}/GameConfig/GF8E69.ini (100%) rename Data/{User => Sys}/GameConfig/GF8P69.ini (100%) rename Data/{User => Sys}/GameConfig/GFAD69.ini (100%) rename Data/{User => Sys}/GameConfig/GFAE69.ini (100%) rename Data/{User => Sys}/GameConfig/GFAP69.ini (100%) rename Data/{User => Sys}/GameConfig/GFAS69.ini (100%) rename Data/{User => Sys}/GameConfig/GFBE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GFCP69.ini (100%) rename Data/{User => Sys}/GameConfig/GFDD69.ini (100%) rename Data/{User => Sys}/GameConfig/GFDE69.ini (100%) rename Data/{User => Sys}/GameConfig/GFEE01.ini (100%) rename Data/{User => Sys}/GameConfig/GFEJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GFEP01.ini (100%) rename Data/{User => Sys}/GameConfig/GFFE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GFGEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GFHP6V.ini (100%) rename Data/{User => Sys}/GameConfig/GFKE69.ini (100%) rename Data/{User => Sys}/GameConfig/GFPEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GFQEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GFTE01.ini (100%) rename Data/{User => Sys}/GameConfig/GFTP01.ini (100%) rename Data/{User => Sys}/GameConfig/GFUE4Z.ini (100%) rename Data/{User => Sys}/GameConfig/GFYE69.ini (100%) rename Data/{User => Sys}/GameConfig/GFYP69.ini (100%) rename Data/{User => Sys}/GameConfig/GFZE01.ini (100%) rename Data/{User => Sys}/GameConfig/GFZJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GFZP01.ini (100%) rename Data/{User => Sys}/GameConfig/GG4E08.ini (100%) rename Data/{User => Sys}/GameConfig/GG4P08.ini (100%) rename Data/{User => Sys}/GameConfig/GG5E52.ini (100%) rename Data/{User => Sys}/GameConfig/GGAJB2.ini (100%) rename Data/{User => Sys}/GameConfig/GGCE0A.ini (100%) rename Data/{User => Sys}/GameConfig/GGCOSD.ini (100%) rename Data/{User => Sys}/GameConfig/GGEE41.ini (100%) rename Data/{User => Sys}/GameConfig/GGEP41.ini (100%) rename Data/{User => Sys}/GameConfig/GGEY41.ini (100%) rename Data/{User => Sys}/GameConfig/GGME00.ini (100%) rename Data/{User => Sys}/GameConfig/GGPJB2.ini (100%) rename Data/{User => Sys}/GameConfig/GGRE41.ini (100%) rename Data/{User => Sys}/GameConfig/GGSEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GGSJA4.ini (100%) rename Data/{User => Sys}/GameConfig/GGSPA4.ini (100%) rename Data/{User => Sys}/GameConfig/GGTE01.ini (100%) rename Data/{User => Sys}/GameConfig/GGTP01.ini (100%) rename Data/{User => Sys}/GameConfig/GGYE41.ini (100%) rename Data/{User => Sys}/GameConfig/GGYP41.ini (100%) rename Data/{User => Sys}/GameConfig/GGZE52.ini (100%) rename Data/{User => Sys}/GameConfig/GGZX52.ini (100%) rename Data/{User => Sys}/GameConfig/GH2E69.ini (100%) rename Data/{User => Sys}/GameConfig/GH2P69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4D69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4E69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4F69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4H69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4I69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4J69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4M69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4P69.ini (100%) rename Data/{User => Sys}/GameConfig/GH4S69.ini (100%) rename Data/{User => Sys}/GameConfig/GH5D52.ini (100%) rename Data/{User => Sys}/GameConfig/GH5E52.ini (100%) rename Data/{User => Sys}/GameConfig/GH5F52.ini (100%) rename Data/{User => Sys}/GameConfig/GH5P52.ini (100%) rename Data/{User => Sys}/GameConfig/GH6EAF.ini (100%) rename Data/{User => Sys}/GameConfig/GH7E5D.ini (100%) rename Data/{User => Sys}/GameConfig/GHAE08.ini (100%) rename Data/{User => Sys}/GameConfig/GHAP08.ini (100%) rename Data/{User => Sys}/GameConfig/GHBE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GHBP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GHCE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/GHCF4Q.ini (100%) rename Data/{User => Sys}/GameConfig/GHGEEB.ini (100%) rename Data/{User => Sys}/GameConfig/GHKE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GHLE69.ini (100%) rename Data/{User => Sys}/GameConfig/GHLJ69.ini (100%) rename Data/{User => Sys}/GameConfig/GHLP69.ini (100%) rename Data/{User => Sys}/GameConfig/GHLX69.ini (100%) rename Data/{User => Sys}/GameConfig/GHLY69.ini (100%) rename Data/{User => Sys}/GameConfig/GHLZ69.ini (100%) rename Data/{User => Sys}/GameConfig/GHMD4F.ini (100%) rename Data/{User => Sys}/GameConfig/GHME4F.ini (100%) rename Data/{User => Sys}/GameConfig/GHMF4F.ini (100%) rename Data/{User => Sys}/GameConfig/GHMP4F.ini (100%) rename Data/{User => Sys}/GameConfig/GHNE71.ini (100%) rename Data/{User => Sys}/GameConfig/GHQE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GHQP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GHRE78.ini (100%) rename Data/{User => Sys}/GameConfig/GHSE69.ini (100%) rename Data/{User => Sys}/GameConfig/GHSJ69.ini (100%) rename Data/{User => Sys}/GameConfig/GHSP69.ini (100%) rename Data/{User => Sys}/GameConfig/GHSX69.ini (100%) rename Data/{User => Sys}/GameConfig/GHSY69.ini (100%) rename Data/{User => Sys}/GameConfig/GHUE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GHVE08.ini (100%) rename Data/{User => Sys}/GameConfig/GHWE78.ini (100%) rename Data/{User => Sys}/GameConfig/GHYE6S.ini (100%) rename Data/{User => Sys}/GameConfig/GIAE7D.ini (100%) rename Data/{User => Sys}/GameConfig/GIBE4F.ini (100%) rename Data/{User => Sys}/GameConfig/GICE78.ini (100%) rename Data/{User => Sys}/GameConfig/GIGJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/GIKE70.ini (100%) rename Data/{User => Sys}/GameConfig/GIKP70.ini (100%) rename Data/{User => Sys}/GameConfig/GILE51.ini (100%) rename Data/{User => Sys}/GameConfig/GILP51.ini (100%) rename Data/{User => Sys}/GameConfig/GINE69.ini (100%) rename Data/{User => Sys}/GameConfig/GINX69.ini (100%) rename Data/{User => Sys}/GameConfig/GIPEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GIQE78.ini (100%) rename Data/{User => Sys}/GameConfig/GISE36.ini (100%) rename Data/{User => Sys}/GameConfig/GISP36.ini (100%) rename Data/{User => Sys}/GameConfig/GITE01.ini (100%) rename Data/{User => Sys}/GameConfig/GITP01.ini (100%) rename Data/{User => Sys}/GameConfig/GIVE4Z.ini (100%) rename Data/{User => Sys}/GameConfig/GIZE52.ini (100%) rename Data/{User => Sys}/GameConfig/GJ3PA4.ini (100%) rename Data/{User => Sys}/GameConfig/GJBE5G.ini (100%) rename Data/{User => Sys}/GameConfig/GJCE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GJDE5S.ini (100%) rename Data/{User => Sys}/GameConfig/GJKE52.ini (100%) rename Data/{User => Sys}/GameConfig/GJNE78.ini (100%) rename Data/{User => Sys}/GameConfig/GJSJ18.ini (100%) rename Data/{User => Sys}/GameConfig/GJUD78.ini (100%) rename Data/{User => Sys}/GameConfig/GJUE78.ini (100%) rename Data/{User => Sys}/GameConfig/GJUF78.ini (100%) rename Data/{User => Sys}/GameConfig/GJWE78.ini (100%) rename Data/{User => Sys}/GameConfig/GJXE51.ini (100%) rename Data/{User => Sys}/GameConfig/GJXP51.ini (100%) rename Data/{User => Sys}/GameConfig/GJZE52.ini (100%) rename Data/{User => Sys}/GameConfig/GK2D52.ini (100%) rename Data/{User => Sys}/GameConfig/GK2E52.ini (100%) rename Data/{User => Sys}/GameConfig/GK2F52.ini (100%) rename Data/{User => Sys}/GameConfig/GK2I52.ini (100%) rename Data/{User => Sys}/GameConfig/GK2P52.ini (100%) rename Data/{User => Sys}/GameConfig/GK4E01.ini (100%) rename Data/{User => Sys}/GameConfig/GK5E78.ini (100%) rename Data/{User => Sys}/GameConfig/GK5X78.ini (100%) rename Data/{User => Sys}/GameConfig/GK6JA4.ini (100%) rename Data/{User => Sys}/GameConfig/GK7E08.ini (100%) rename Data/{User => Sys}/GameConfig/GK7P08.ini (100%) rename Data/{User => Sys}/GameConfig/GK9EA4.ini (100%) rename Data/{User => Sys}/GameConfig/GKAE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GKBEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GKBPAF.ini (100%) rename Data/{User => Sys}/GameConfig/GKDP01.ini (100%) rename Data/{User => Sys}/GameConfig/GKFEGG.ini (100%) rename Data/{User => Sys}/GameConfig/GKGE01.ini (100%) rename Data/{User => Sys}/GameConfig/GKHEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GKHPA4.ini (100%) rename Data/{User => Sys}/GameConfig/GKJE78.ini (100%) rename Data/{User => Sys}/GameConfig/GKKE69.ini (100%) rename Data/{User => Sys}/GameConfig/GKLD69.ini (100%) rename Data/{User => Sys}/GameConfig/GKLE69.ini (100%) rename Data/{User => Sys}/GameConfig/GKLF69.ini (100%) rename Data/{User => Sys}/GameConfig/GKLI69.ini (100%) rename Data/{User => Sys}/GameConfig/GKLJ69.ini (100%) rename Data/{User => Sys}/GameConfig/GKLP69.ini (100%) rename Data/{User => Sys}/GameConfig/GKLS69.ini (100%) rename Data/{User => Sys}/GameConfig/GKME41.ini (100%) rename Data/{User => Sys}/GameConfig/GKMP41.ini (100%) rename Data/{User => Sys}/GameConfig/GKNEB2.ini (100%) rename Data/{User => Sys}/GameConfig/GKOE70.ini (100%) rename Data/{User => Sys}/GameConfig/GKOP6V.ini (100%) rename Data/{User => Sys}/GameConfig/GKOP70.ini (100%) rename Data/{User => Sys}/GameConfig/GKQJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GKSE52.ini (100%) rename Data/{User => Sys}/GameConfig/GKTJA4.ini (100%) rename Data/{User => Sys}/GameConfig/GKUE9G.ini (100%) rename Data/{User => Sys}/GameConfig/GKYE01.ini (100%) rename Data/{User => Sys}/GameConfig/GKYJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GKYP01.ini (100%) rename Data/{User => Sys}/GameConfig/GKZE9G.ini (100%) rename Data/{User => Sys}/GameConfig/GL5E4F.ini (100%) rename Data/{User => Sys}/GameConfig/GL7E64.ini (100%) rename Data/{User => Sys}/GameConfig/GL7P64.ini (100%) rename Data/{User => Sys}/GameConfig/GL8E4F.ini (100%) rename Data/{User => Sys}/GameConfig/GL8F4F.ini (100%) rename Data/{User => Sys}/GameConfig/GLBE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GLCE52.ini (100%) rename Data/{User => Sys}/GameConfig/GLCF52.ini (100%) rename Data/{User => Sys}/GameConfig/GLEE08.ini (100%) rename Data/{User => Sys}/GameConfig/GLEP08.ini (100%) rename Data/{User => Sys}/GameConfig/GLLE78.ini (100%) rename Data/{User => Sys}/GameConfig/GLME01.ini (100%) rename Data/{User => Sys}/GameConfig/GLMP01.ini (100%) rename Data/{User => Sys}/GameConfig/GLNE69.ini (100%) rename Data/{User => Sys}/GameConfig/GLNP69.ini (100%) rename Data/{User => Sys}/GameConfig/GLOE69.ini (100%) rename Data/{User => Sys}/GameConfig/GLOP69.ini (100%) rename Data/{User => Sys}/GameConfig/GLQE41.ini (100%) rename Data/{User => Sys}/GameConfig/GLRE64.ini (100%) rename Data/{User => Sys}/GameConfig/GLSD64.ini (100%) rename Data/{User => Sys}/GameConfig/GLSE64.ini (100%) rename Data/{User => Sys}/GameConfig/GLSF64.ini (100%) rename Data/{User => Sys}/GameConfig/GLSP64.ini (100%) rename Data/{User => Sys}/GameConfig/GLUE7U.ini (100%) rename Data/{User => Sys}/GameConfig/GLWE51.ini (100%) rename Data/{User => Sys}/GameConfig/GLYE69.ini (100%) rename Data/{User => Sys}/GameConfig/GLYP69.ini (100%) rename Data/{User => Sys}/GameConfig/GLZE69.ini (100%) rename Data/{User => Sys}/GameConfig/GLZF69.ini (100%) rename Data/{User => Sys}/GameConfig/GM2E8P.ini (100%) rename Data/{User => Sys}/GameConfig/GM2P8P.ini (100%) rename Data/{User => Sys}/GameConfig/GM3E69.ini (100%) rename Data/{User => Sys}/GameConfig/GM4E01.ini (100%) rename Data/{User => Sys}/GameConfig/GM4J01.ini (100%) rename Data/{User => Sys}/GameConfig/GM4P01.ini (100%) rename Data/{User => Sys}/GameConfig/GM5E7D.ini (100%) rename Data/{User => Sys}/GameConfig/GM5F7D.ini (100%) rename Data/{User => Sys}/GameConfig/GM5P7D.ini (100%) rename Data/{User => Sys}/GameConfig/GM6EE9.ini (100%) rename Data/{User => Sys}/GameConfig/GM6PE9.ini (100%) rename Data/{User => Sys}/GameConfig/GM8E01.ini (100%) rename Data/{User => Sys}/GameConfig/GM8J01.ini (100%) rename Data/{User => Sys}/GameConfig/GM8P01.ini (100%) rename Data/{User => Sys}/GameConfig/GMBE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GMBP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GMFS69.ini (100%) rename Data/{User => Sys}/GameConfig/GMHE52.ini (100%) rename Data/{User => Sys}/GameConfig/GMHF52.ini (100%) rename Data/{User => Sys}/GameConfig/GMHP52.ini (100%) rename Data/{User => Sys}/GameConfig/GMIE70.ini (100%) rename Data/{User => Sys}/GameConfig/GMIP70.ini (100%) rename Data/{User => Sys}/GameConfig/GMKD5D.ini (100%) rename Data/{User => Sys}/GameConfig/GMLEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GMNE78.ini (100%) rename Data/{User => Sys}/GameConfig/GMPE01.ini (100%) rename Data/{User => Sys}/GameConfig/GMPP01.ini (100%) rename Data/{User => Sys}/GameConfig/GMSE01.ini (100%) rename Data/{User => Sys}/GameConfig/GMSJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GMSP01.ini (100%) rename Data/{User => Sys}/GameConfig/GMTP69.ini (100%) rename Data/{User => Sys}/GameConfig/GMUE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GMXE70.ini (100%) rename Data/{User => Sys}/GameConfig/GN6E69.ini (100%) rename Data/{User => Sys}/GameConfig/GN8E69.ini (100%) rename Data/{User => Sys}/GameConfig/GN8P69.ini (100%) rename Data/{User => Sys}/GameConfig/GNDE69.ini (100%) rename Data/{User => Sys}/GameConfig/GNHE5d.ini (100%) rename Data/{User => Sys}/GameConfig/GNJEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GNLE69.ini (100%) rename Data/{User => Sys}/GameConfig/GNNE69.ini (100%) rename Data/{User => Sys}/GameConfig/GNOE78.ini (100%) rename Data/{User => Sys}/GameConfig/GNQE69.ini (100%) rename Data/{User => Sys}/GameConfig/GNRJDA.ini (100%) rename Data/{User => Sys}/GameConfig/GNUEDA.ini (100%) rename Data/{User => Sys}/GameConfig/GNWE69.ini (100%) rename Data/{User => Sys}/GameConfig/GNWP69.ini (100%) rename Data/{User => Sys}/GameConfig/GO2E4F.ini (100%) rename Data/{User => Sys}/GameConfig/GO7E69.ini (100%) rename Data/{User => Sys}/GameConfig/GO7F69.ini (100%) rename Data/{User => Sys}/GameConfig/GO7P69.ini (100%) rename Data/{User => Sys}/GameConfig/GOAE52.ini (100%) rename Data/{User => Sys}/GameConfig/GOBE4Z.ini (100%) rename Data/{User => Sys}/GameConfig/GOCE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GOGJB2.ini (100%) rename Data/{User => Sys}/GameConfig/GOME01.ini (100%) rename Data/{User => Sys}/GameConfig/GOMP01.ini (100%) rename Data/{User => Sys}/GameConfig/GONE69.ini (100%) rename Data/{User => Sys}/GameConfig/GOOE01.ini (100%) rename Data/{User => Sys}/GameConfig/GOPEB2.ini (100%) rename Data/{User => Sys}/GameConfig/GOPJB2.ini (100%) rename Data/{User => Sys}/GameConfig/GOQEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GOSE41.ini (100%) rename Data/{User => Sys}/GameConfig/GOSP41.ini (100%) rename Data/{User => Sys}/GameConfig/GOSX41.ini (100%) rename Data/{User => Sys}/GameConfig/GOWD69.ini (100%) rename Data/{User => Sys}/GameConfig/GOWE69.ini (100%) rename Data/{User => Sys}/GameConfig/GOWF69.ini (100%) rename Data/{User => Sys}/GameConfig/GOWJ69.ini (100%) rename Data/{User => Sys}/GameConfig/GOWP69.ini (100%) rename Data/{User => Sys}/GameConfig/GOYD69.ini (100%) rename Data/{User => Sys}/GameConfig/GOYE69.ini (100%) rename Data/{User => Sys}/GameConfig/GOYF69.ini (100%) rename Data/{User => Sys}/GameConfig/GOYP69.ini (100%) rename Data/{User => Sys}/GameConfig/GOYS69.ini (100%) rename Data/{User => Sys}/GameConfig/GP2E82.ini (100%) rename Data/{User => Sys}/GameConfig/GP2EAF.ini (100%) rename Data/{User => Sys}/GameConfig/GP4J18.ini (100%) rename Data/{User => Sys}/GameConfig/GP5E01.ini (100%) rename Data/{User => Sys}/GameConfig/GP5J01.ini (100%) rename Data/{User => Sys}/GameConfig/GP5P01.ini (100%) rename Data/{User => Sys}/GameConfig/GP6E01.ini (100%) rename Data/{User => Sys}/GameConfig/GP6J01.ini (100%) rename Data/{User => Sys}/GameConfig/GP6P01.ini (100%) rename Data/{User => Sys}/GameConfig/GP7E01.ini (100%) rename Data/{User => Sys}/GameConfig/GP7J01.ini (100%) rename Data/{User => Sys}/GameConfig/GP7P01.ini (100%) rename Data/{User => Sys}/GameConfig/GP8EAF.ini (100%) rename Data/{User => Sys}/GameConfig/GPAE01.ini (100%) rename Data/{User => Sys}/GameConfig/GPAJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GPAP01.ini (100%) rename Data/{User => Sys}/GameConfig/GPAU01.ini (100%) rename Data/{User => Sys}/GameConfig/GPDE51.ini (100%) rename Data/{User => Sys}/GameConfig/GPEJ2Q.ini (100%) rename Data/{User => Sys}/GameConfig/GPHD52.ini (100%) rename Data/{User => Sys}/GameConfig/GPHE52.ini (100%) rename Data/{User => Sys}/GameConfig/GPHP52.ini (100%) rename Data/{User => Sys}/GameConfig/GPIE01.ini (100%) rename Data/{User => Sys}/GameConfig/GPIP01.ini (100%) rename Data/{User => Sys}/GameConfig/GPKE41.ini (100%) rename Data/{User => Sys}/GameConfig/GPNE08.ini (100%) rename Data/{User => Sys}/GameConfig/GPNP08.ini (100%) rename Data/{User => Sys}/GameConfig/GPOE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GPOP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GPSE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GPSP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GPTE41.ini (100%) rename Data/{User => Sys}/GameConfig/GPTP41.ini (100%) rename Data/{User => Sys}/GameConfig/GPVE01.ini (100%) rename Data/{User => Sys}/GameConfig/GPVP01.ini (100%) rename Data/{User => Sys}/GameConfig/GPXP01.ini (100%) rename Data/{User => Sys}/GameConfig/GPZJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GQ8E69.ini (100%) rename Data/{User => Sys}/GameConfig/GQCD52.ini (100%) rename Data/{User => Sys}/GameConfig/GQCE52.ini (100%) rename Data/{User => Sys}/GameConfig/GQCF52.ini (100%) rename Data/{User => Sys}/GameConfig/GQCI52.ini (100%) rename Data/{User => Sys}/GameConfig/GQCP52.ini (100%) rename Data/{User => Sys}/GameConfig/GQCS52.ini (100%) rename Data/{User => Sys}/GameConfig/GQLE9G.ini (100%) rename Data/{User => Sys}/GameConfig/GQNE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GQSDAF.ini (100%) rename Data/{User => Sys}/GameConfig/GQSEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GQSFAF.ini (100%) rename Data/{User => Sys}/GameConfig/GQSPAF.ini (100%) rename Data/{User => Sys}/GameConfig/GQTE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/GQWE69.ini (100%) rename Data/{User => Sys}/GameConfig/GQWJ69.ini (100%) rename Data/{User => Sys}/GameConfig/GQWP69.ini (100%) rename Data/{User => Sys}/GameConfig/GQWX69.ini (100%) rename Data/{User => Sys}/GameConfig/GQXE69.ini (100%) rename Data/{User => Sys}/GameConfig/GR2E52.ini (100%) rename Data/{User => Sys}/GameConfig/GR6E78.ini (100%) rename Data/{User => Sys}/GameConfig/GR8D69.ini (100%) rename Data/{User => Sys}/GameConfig/GR8E69.ini (100%) rename Data/{User => Sys}/GameConfig/GR8F69.ini (100%) rename Data/{User => Sys}/GameConfig/GR8J69.ini (100%) rename Data/{User => Sys}/GameConfig/GR8P69.ini (100%) rename Data/{User => Sys}/GameConfig/GRAE5Z.ini (100%) rename Data/{User => Sys}/GameConfig/GRBE6S.ini (100%) rename Data/{User => Sys}/GameConfig/GRBP6S.ini (100%) rename Data/{User => Sys}/GameConfig/GREE08.ini (100%) rename Data/{User => Sys}/GameConfig/GREP08.ini (100%) rename Data/{User => Sys}/GameConfig/GRFE78.ini (100%) rename Data/{User => Sys}/GameConfig/GRHE41.ini (100%) rename Data/{User => Sys}/GameConfig/GRHP41.ini (100%) rename Data/{User => Sys}/GameConfig/GRJEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GRKE41.ini (100%) rename Data/{User => Sys}/GameConfig/GRKP7G.ini (100%) rename Data/{User => Sys}/GameConfig/GRLE41.ini (100%) rename Data/{User => Sys}/GameConfig/GRNE52.ini (100%) rename Data/{User => Sys}/GameConfig/GROP7J.ini (100%) rename Data/{User => Sys}/GameConfig/GRQE41.ini (100%) rename Data/{User => Sys}/GameConfig/GRSEAF.ini (100%) rename Data/{User => Sys}/GameConfig/GRSPAF.ini (100%) rename Data/{User => Sys}/GameConfig/GRUE78.ini (100%) rename Data/{User => Sys}/GameConfig/GRVEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GRYE41.ini (100%) rename Data/{User => Sys}/GameConfig/GS2D78.ini (100%) rename Data/{User => Sys}/GameConfig/GS2E78.ini (100%) rename Data/{User => Sys}/GameConfig/GS2F78.ini (100%) rename Data/{User => Sys}/GameConfig/GS2P78.ini (100%) rename Data/{User => Sys}/GameConfig/GS8P7D.ini (100%) rename Data/{User => Sys}/GameConfig/GSAE01.ini (100%) rename Data/{User => Sys}/GameConfig/GSAP01.ini (100%) rename Data/{User => Sys}/GameConfig/GSCE51.ini (100%) rename Data/{User => Sys}/GameConfig/GSEJB2.ini (100%) rename Data/{User => Sys}/GameConfig/GSMP52.ini (100%) rename Data/{User => Sys}/GameConfig/GSNE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GSNP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GSOE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GSOP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GSPE69.ini (100%) rename Data/{User => Sys}/GameConfig/GSSE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GSSJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/GSSP70.ini (100%) rename Data/{User => Sys}/GameConfig/GSSP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GSTE69.ini (100%) rename Data/{User => Sys}/GameConfig/GSTP69.ini (100%) rename Data/{User => Sys}/GameConfig/GSWE64.ini (100%) rename Data/{User => Sys}/GameConfig/GSWP64.ini (100%) rename Data/{User => Sys}/GameConfig/GSWS64.ini (100%) rename Data/{User => Sys}/GameConfig/GSZP41.ini (100%) rename Data/{User => Sys}/GameConfig/GT3D52.ini (100%) rename Data/{User => Sys}/GameConfig/GT3E52.ini (100%) rename Data/{User => Sys}/GameConfig/GT3F52.ini (100%) rename Data/{User => Sys}/GameConfig/GT3P52.ini (100%) rename Data/{User => Sys}/GameConfig/GT6E70.ini (100%) rename Data/{User => Sys}/GameConfig/GT7E41.ini (100%) rename Data/{User => Sys}/GameConfig/GT7P41.ini (100%) rename Data/{User => Sys}/GameConfig/GT7X41.ini (100%) rename Data/{User => Sys}/GameConfig/GT8E78.ini (100%) rename Data/{User => Sys}/GameConfig/GTCJBL.ini (100%) rename Data/{User => Sys}/GameConfig/GTEE01.ini (100%) rename Data/{User => Sys}/GameConfig/GTEP01.ini (100%) rename Data/{User => Sys}/GameConfig/GTFEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GTKE51.ini (100%) rename Data/{User => Sys}/GameConfig/GTKP51.ini (100%) rename Data/{User => Sys}/GameConfig/GTLE52.ini (100%) rename Data/{User => Sys}/GameConfig/GTLP52.ini (100%) rename Data/{User => Sys}/GameConfig/GTLX52.ini (100%) rename Data/{User => Sys}/GameConfig/GTSE4F.ini (100%) rename Data/{User => Sys}/GameConfig/GTSP4F.ini (100%) rename Data/{User => Sys}/GameConfig/GTUE8G.ini (100%) rename Data/{User => Sys}/GameConfig/GTWE70.ini (100%) rename Data/{User => Sys}/GameConfig/GTWP70.ini (100%) rename Data/{User => Sys}/GameConfig/GTYE69.ini (100%) rename Data/{User => Sys}/GameConfig/GTYP69.ini (100%) rename Data/{User => Sys}/GameConfig/GTZE41.ini (100%) rename Data/{User => Sys}/GameConfig/GTZP41.ini (100%) rename Data/{User => Sys}/GameConfig/GUBE69.ini (100%) rename Data/{User => Sys}/GameConfig/GUBP69.ini (100%) rename Data/{User => Sys}/GameConfig/GUCP69.ini (100%) rename Data/{User => Sys}/GameConfig/GUFE4Z.ini (100%) rename Data/{User => Sys}/GameConfig/GUGE69.ini (100%) rename Data/{User => Sys}/GameConfig/GUME52.ini (100%) rename Data/{User => Sys}/GameConfig/GUMP52.ini (100%) rename Data/{User => Sys}/GameConfig/GUNE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GUPE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GUPP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GUTE52.ini (100%) rename Data/{User => Sys}/GameConfig/GUVE51.ini (100%) rename Data/{User => Sys}/GameConfig/GUZE41.ini (100%) rename Data/{User => Sys}/GameConfig/GUZP41.ini (100%) rename Data/{User => Sys}/GameConfig/GV3E70.ini (100%) rename Data/{User => Sys}/GameConfig/GV3P70.ini (100%) rename Data/{User => Sys}/GameConfig/GVCE08.ini (100%) rename Data/{User => Sys}/GameConfig/GVCP08.ini (100%) rename Data/{User => Sys}/GameConfig/GVDE78.ini (100%) rename Data/{User => Sys}/GameConfig/GVHE4F.ini (100%) rename Data/{User => Sys}/GameConfig/GVJE08.ini (100%) rename Data/{User => Sys}/GameConfig/GVJJ08.ini (100%) rename Data/{User => Sys}/GameConfig/GVJP08.ini (100%) rename Data/{User => Sys}/GameConfig/GVKE52.ini (100%) rename Data/{User => Sys}/GameConfig/GVLD69.ini (100%) rename Data/{User => Sys}/GameConfig/GVLE69.ini (100%) rename Data/{User => Sys}/GameConfig/GVLF69.ini (100%) rename Data/{User => Sys}/GameConfig/GVLP69.ini (100%) rename Data/{User => Sys}/GameConfig/GVRE7H.ini (100%) rename Data/{User => Sys}/GameConfig/GVSE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GVSP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GW2E78.ini (100%) rename Data/{User => Sys}/GameConfig/GW2P78.ini (100%) rename Data/{User => Sys}/GameConfig/GW3E78.ini (100%) rename Data/{User => Sys}/GameConfig/GW3P78.ini (100%) rename Data/{User => Sys}/GameConfig/GW5E69.ini (100%) rename Data/{User => Sys}/GameConfig/GW7E69.ini (100%) rename Data/{User => Sys}/GameConfig/GW7P69.ini (100%) rename Data/{User => Sys}/GameConfig/GW8E52.ini (100%) rename Data/{User => Sys}/GameConfig/GW9E78.ini (100%) rename Data/{User => Sys}/GameConfig/GWAE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GWAF8P.ini (100%) rename Data/{User => Sys}/GameConfig/GWAP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GWBP41.ini (100%) rename Data/{User => Sys}/GameConfig/GWEE51.ini (100%) rename Data/{User => Sys}/GameConfig/GWEJB0.ini (100%) rename Data/{User => Sys}/GameConfig/GWEP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GWGP4F.ini (100%) rename Data/{User => Sys}/GameConfig/GWJE52.ini (100%) rename Data/{User => Sys}/GameConfig/GWKE41.ini (100%) rename Data/{User => Sys}/GameConfig/GWKP41.ini (100%) rename Data/{User => Sys}/GameConfig/GWLE6L.ini (100%) rename Data/{User => Sys}/GameConfig/GWLX6L.ini (100%) rename Data/{User => Sys}/GameConfig/GWME51.ini (100%) rename Data/{User => Sys}/GameConfig/GWOE5G.ini (100%) rename Data/{User => Sys}/GameConfig/GWPE78.ini (100%) rename Data/{User => Sys}/GameConfig/GWPJG2.ini (100%) rename Data/{User => Sys}/GameConfig/GWPP78.ini (100%) rename Data/{User => Sys}/GameConfig/GWQE52.ini (100%) rename Data/{User => Sys}/GameConfig/GWRE01.ini (100%) rename Data/{User => Sys}/GameConfig/GWRP01.ini (100%) rename Data/{User => Sys}/GameConfig/GWSEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GWTEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GWVE52.ini (100%) rename Data/{User => Sys}/GameConfig/GWWE01.ini (100%) rename Data/{User => Sys}/GameConfig/GWWP01.ini (100%) rename Data/{User => Sys}/GameConfig/GWYE41.ini (100%) rename Data/{User => Sys}/GameConfig/GWYX41.ini (100%) rename Data/{User => Sys}/GameConfig/GWZE01.ini (100%) rename Data/{User => Sys}/GameConfig/GWZP01.ini (100%) rename Data/{User => Sys}/GameConfig/GX2E52.ini (100%) rename Data/{User => Sys}/GameConfig/GX2P52.ini (100%) rename Data/{User => Sys}/GameConfig/GX3E41.ini (100%) rename Data/{User => Sys}/GameConfig/GX3P41.ini (100%) rename Data/{User => Sys}/GameConfig/GX3X41.ini (100%) rename Data/{User => Sys}/GameConfig/GXBE69.ini (100%) rename Data/{User => Sys}/GameConfig/GXBP69.ini (100%) rename Data/{User => Sys}/GameConfig/GXCE01.ini (100%) rename Data/{User => Sys}/GameConfig/GXEE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GXEP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GXFE69.ini (100%) rename Data/{User => Sys}/GameConfig/GXFF69.ini (100%) rename Data/{User => Sys}/GameConfig/GXFP69.ini (100%) rename Data/{User => Sys}/GameConfig/GXGE08.ini (100%) rename Data/{User => Sys}/GameConfig/GXLE52.ini (100%) rename Data/{User => Sys}/GameConfig/GXLP52.ini (100%) rename Data/{User => Sys}/GameConfig/GXME52.ini (100%) rename Data/{User => Sys}/GameConfig/GXNE5D.ini (100%) rename Data/{User => Sys}/GameConfig/GXOE69.ini (100%) rename Data/{User => Sys}/GameConfig/GXOX69.ini (100%) rename Data/{User => Sys}/GameConfig/GXRE08.ini (100%) rename Data/{User => Sys}/GameConfig/GXSE8P.ini (100%) rename Data/{User => Sys}/GameConfig/GXSP8P.ini (100%) rename Data/{User => Sys}/GameConfig/GXXE01.ini (100%) rename Data/{User => Sys}/GameConfig/GXXP01.ini (100%) rename Data/{User => Sys}/GameConfig/GY2E01.ini (100%) rename Data/{User => Sys}/GameConfig/GYAE78.ini (100%) rename Data/{User => Sys}/GameConfig/GYBP01.ini (100%) rename Data/{User => Sys}/GameConfig/GYFEA4.ini (100%) rename Data/{User => Sys}/GameConfig/GYKEB2.ini (100%) rename Data/{User => Sys}/GameConfig/GYQP01.ini (100%) rename Data/{User => Sys}/GameConfig/GYRE41.ini (100%) rename Data/{User => Sys}/GameConfig/GYWD41.ini (100%) rename Data/{User => Sys}/GameConfig/GYWEE9.ini (100%) rename Data/{User => Sys}/GameConfig/GYWP41.ini (100%) rename Data/{User => Sys}/GameConfig/GZ2E01.ini (100%) rename Data/{User => Sys}/GameConfig/GZ2J01.ini (100%) rename Data/{User => Sys}/GameConfig/GZ2P01.ini (100%) rename Data/{User => Sys}/GameConfig/GZ3E70.ini (100%) rename Data/{User => Sys}/GameConfig/GZ3PB2.ini (100%) rename Data/{User => Sys}/GameConfig/GZEE70.ini (100%) rename Data/{User => Sys}/GameConfig/GZLE01.ini (100%) rename Data/{User => Sys}/GameConfig/GZLJ01.ini (100%) rename Data/{User => Sys}/GameConfig/GZLP01.ini (100%) rename Data/{User => Sys}/GameConfig/GZMP7D.ini (100%) rename Data/{User => Sys}/GameConfig/GZPE70.ini (100%) rename Data/{User => Sys}/GameConfig/GZPP70.ini (100%) rename Data/{User => Sys}/GameConfig/GZSE70.ini (100%) rename Data/{User => Sys}/GameConfig/GZWE01.ini (100%) rename Data/{User => Sys}/GameConfig/GZWP01.ini (100%) rename Data/{User => Sys}/GameConfig/HAAA01.ini (100%) rename Data/{User => Sys}/GameConfig/HACA01.ini (100%) rename Data/{User => Sys}/GameConfig/HADE01.ini (100%) rename Data/{User => Sys}/GameConfig/HAXXHB.ini (100%) rename Data/{User => Sys}/GameConfig/HAYA01.ini (100%) rename Data/{User => Sys}/GameConfig/HCFE01.ini (100%) rename Data/{User => Sys}/GameConfig/JAAE01.ini (100%) rename Data/{User => Sys}/GameConfig/JACP01.ini (100%) rename Data/{User => Sys}/GameConfig/JADE01.ini (100%) rename Data/{User => Sys}/GameConfig/JAEE01.ini (100%) rename Data/{User => Sys}/GameConfig/JBKE01.ini (100%) rename Data/{User => Sys}/GameConfig/JBKP01.ini (100%) rename Data/{User => Sys}/GameConfig/JCBE01.ini (100%) rename Data/{User => Sys}/GameConfig/JCWE01.ini (100%) rename Data/{User => Sys}/GameConfig/JODIHB.ini (100%) rename Data/{User => Sys}/GameConfig/NAAE01.ini (100%) rename Data/{User => Sys}/GameConfig/NAAP01.ini (100%) rename Data/{User => Sys}/GameConfig/NABE01.ini (100%) rename Data/{User => Sys}/GameConfig/NACE01.ini (100%) rename Data/{User => Sys}/GameConfig/NAEE01.ini (100%) rename Data/{User => Sys}/GameConfig/NAFP01.ini (100%) rename Data/{User => Sys}/GameConfig/NAHE01.ini (100%) rename Data/{User => Sys}/GameConfig/NAKE01.ini (100%) rename Data/{User => Sys}/GameConfig/NAKP01.ini (100%) rename Data/{User => Sys}/GameConfig/NANE01.ini (100%) rename Data/{User => Sys}/GameConfig/NARP01.ini (100%) rename Data/{User => Sys}/GameConfig/PC6E01.ini (100%) rename Data/{User => Sys}/GameConfig/PH_PRESETS.ini (100%) rename Data/{User => Sys}/GameConfig/PM4E01.ini (100%) rename Data/{User => Sys}/GameConfig/PRJE01.ini (100%) rename Data/{User => Sys}/GameConfig/PZLE01.ini (100%) rename Data/{User => Sys}/GameConfig/PZLJ01.ini (100%) rename Data/{User => Sys}/GameConfig/PZLP01.ini (100%) rename Data/{User => Sys}/GameConfig/R22E01.ini (100%) rename Data/{User => Sys}/GameConfig/R22J01.ini (100%) rename Data/{User => Sys}/GameConfig/R22P01.ini (100%) rename Data/{User => Sys}/GameConfig/R29P52.ini (100%) rename Data/{User => Sys}/GameConfig/R2GEXJ.ini (100%) rename Data/{User => Sys}/GameConfig/R2GJAF.ini (100%) rename Data/{User => Sys}/GameConfig/R2GP99.ini (100%) rename Data/{User => Sys}/GameConfig/R2JJAF.ini (100%) rename Data/{User => Sys}/GameConfig/R2KP54.ini (100%) rename Data/{User => Sys}/GameConfig/R2TE41.ini (100%) rename Data/{User => Sys}/GameConfig/R2UE8P.ini (100%) rename Data/{User => Sys}/GameConfig/R2VJ01.ini (100%) rename Data/{User => Sys}/GameConfig/R2VP01.ini (100%) rename Data/{User => Sys}/GameConfig/R3BE8P.ini (100%) rename Data/{User => Sys}/GameConfig/R3BJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/R3BP8P.ini (100%) rename Data/{User => Sys}/GameConfig/R3CE20.ini (100%) rename Data/{User => Sys}/GameConfig/R3DES5.ini (100%) rename Data/{User => Sys}/GameConfig/R3DPS5.ini (100%) rename Data/{User => Sys}/GameConfig/R3GXUG.ini (100%) rename Data/{User => Sys}/GameConfig/R3ME01.ini (100%) rename Data/{User => Sys}/GameConfig/R3MP01.ini (100%) rename Data/{User => Sys}/GameConfig/R3NEXS.ini (100%) rename Data/{User => Sys}/GameConfig/R3NPH3.ini (100%) rename Data/{User => Sys}/GameConfig/R3OE01.ini (100%) rename Data/{User => Sys}/GameConfig/R3OJ01.ini (100%) rename Data/{User => Sys}/GameConfig/R3OP01.ini (100%) rename Data/{User => Sys}/GameConfig/R3RE8P.ini (100%) rename Data/{User => Sys}/GameConfig/R3RP8P.ini (100%) rename Data/{User => Sys}/GameConfig/R3SP52.ini (100%) rename Data/{User => Sys}/GameConfig/R3TP54.ini (100%) rename Data/{User => Sys}/GameConfig/R46ENS.ini (100%) rename Data/{User => Sys}/GameConfig/R49P01.ini (100%) rename Data/{User => Sys}/GameConfig/R4BPGT.ini (100%) rename Data/{User => Sys}/GameConfig/R4EE01.ini (100%) rename Data/{User => Sys}/GameConfig/R4EJ01.ini (100%) rename Data/{User => Sys}/GameConfig/R4EP01.ini (100%) rename Data/{User => Sys}/GameConfig/R4QE01.ini (100%) rename Data/{User => Sys}/GameConfig/R4QJ01.ini (100%) rename Data/{User => Sys}/GameConfig/R4QK01.ini (100%) rename Data/{User => Sys}/GameConfig/R4QP01.ini (100%) rename Data/{User => Sys}/GameConfig/R4RP69.ini (100%) rename Data/{User => Sys}/GameConfig/R4ZJ01.ini (100%) rename Data/{User => Sys}/GameConfig/R5DE5G.ini (100%) rename Data/{User => Sys}/GameConfig/R5IE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/R5IP4Q.ini (100%) rename Data/{User => Sys}/GameConfig/R5IX4Q.ini (100%) rename Data/{User => Sys}/GameConfig/R5VE41.ini (100%) rename Data/{User => Sys}/GameConfig/R5VP41.ini (100%) rename Data/{User => Sys}/GameConfig/R5VX41.ini (100%) rename Data/{User => Sys}/GameConfig/R5WEA4.ini (100%) rename Data/{User => Sys}/GameConfig/R5WJA4.ini (100%) rename Data/{User => Sys}/GameConfig/R64E01.ini (100%) rename Data/{User => Sys}/GameConfig/R64J01.ini (100%) rename Data/{User => Sys}/GameConfig/R64K01.ini (100%) rename Data/{User => Sys}/GameConfig/R64P01.ini (100%) rename Data/{User => Sys}/GameConfig/R69E36.ini (100%) rename Data/{User => Sys}/GameConfig/R6BE78.ini (100%) rename Data/{User => Sys}/GameConfig/R6BJ78.ini (100%) rename Data/{User => Sys}/GameConfig/R6BK78.ini (100%) rename Data/{User => Sys}/GameConfig/R6BP78.ini (100%) rename Data/{User => Sys}/GameConfig/R6BX78.ini (100%) rename Data/{User => Sys}/GameConfig/R6NY41.ini (100%) rename Data/{User => Sys}/GameConfig/R6TEA4.ini (100%) rename Data/{User => Sys}/GameConfig/R6YEXS.ini (100%) rename Data/{User => Sys}/GameConfig/R6YPH3.ini (100%) rename Data/{User => Sys}/GameConfig/R7EE8P.ini (100%) rename Data/{User => Sys}/GameConfig/R7EJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/R7EP8P.ini (100%) rename Data/{User => Sys}/GameConfig/R7FEGD.ini (100%) rename Data/{User => Sys}/GameConfig/R7FJGD.ini (100%) rename Data/{User => Sys}/GameConfig/R7FPGD.ini (100%) rename Data/{User => Sys}/GameConfig/R7GEAF.ini (100%) rename Data/{User => Sys}/GameConfig/R7GJAF.ini (100%) rename Data/{User => Sys}/GameConfig/R7GPAF.ini (100%) rename Data/{User => Sys}/GameConfig/R7PE01.ini (100%) rename Data/{User => Sys}/GameConfig/R7PP01.ini (100%) rename Data/{User => Sys}/GameConfig/R7XE69.ini (100%) rename Data/{User => Sys}/GameConfig/R7XJ13.ini (100%) rename Data/{User => Sys}/GameConfig/R7XP69.ini (100%) rename Data/{User => Sys}/GameConfig/R84EE9.ini (100%) rename Data/{User => Sys}/GameConfig/R84J99.ini (100%) rename Data/{User => Sys}/GameConfig/R84P99.ini (100%) rename Data/{User => Sys}/GameConfig/R8AE01.ini (100%) rename Data/{User => Sys}/GameConfig/R8AJ01.ini (100%) rename Data/{User => Sys}/GameConfig/R8AP01.ini (100%) rename Data/{User => Sys}/GameConfig/R8DEA4.ini (100%) rename Data/{User => Sys}/GameConfig/R8DJA4.ini (100%) rename Data/{User => Sys}/GameConfig/R8DPA4.ini (100%) rename Data/{User => Sys}/GameConfig/R8JEWR.ini (100%) rename Data/{User => Sys}/GameConfig/R8JPWR.ini (100%) rename Data/{User => Sys}/GameConfig/R8LE20.ini (100%) rename Data/{User => Sys}/GameConfig/R8LP7J.ini (100%) rename Data/{User => Sys}/GameConfig/R8PE01.ini (100%) rename Data/{User => Sys}/GameConfig/R8PJ01.ini (100%) rename Data/{User => Sys}/GameConfig/R8PK01.ini (100%) rename Data/{User => Sys}/GameConfig/R8PP01.ini (100%) rename Data/{User => Sys}/GameConfig/R8XE52.ini (100%) rename Data/{User => Sys}/GameConfig/R96EAF.ini (100%) rename Data/{User => Sys}/GameConfig/R9FP36.ini (100%) rename Data/{User => Sys}/GameConfig/R9IE01.ini (100%) rename Data/{User => Sys}/GameConfig/RB4E08.ini (100%) rename Data/{User => Sys}/GameConfig/RB4P08.ini (100%) rename Data/{User => Sys}/GameConfig/RBBE18.ini (100%) rename Data/{User => Sys}/GameConfig/RBBJ18.ini (100%) rename Data/{User => Sys}/GameConfig/RBBP99.ini (100%) rename Data/{User => Sys}/GameConfig/RBHE08.ini (100%) rename Data/{User => Sys}/GameConfig/RBHJ08.ini (100%) rename Data/{User => Sys}/GameConfig/RBHP08.ini (100%) rename Data/{User => Sys}/GameConfig/RBIEE9.ini (100%) rename Data/{User => Sys}/GameConfig/RBIJ99.ini (100%) rename Data/{User => Sys}/GameConfig/RBIP99.ini (100%) rename Data/{User => Sys}/GameConfig/RBKE69.ini (100%) rename Data/{User => Sys}/GameConfig/RBME5G.ini (100%) rename Data/{User => Sys}/GameConfig/RBQPUG.ini (100%) rename Data/{User => Sys}/GameConfig/RBTP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RBUE08.ini (100%) rename Data/{User => Sys}/GameConfig/RBUP08.ini (100%) rename Data/{User => Sys}/GameConfig/RBWE01.ini (100%) rename Data/{User => Sys}/GameConfig/RBWJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RBWP01.ini (100%) rename Data/{User => Sys}/GameConfig/RBXJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/RBZXUG.ini (100%) rename Data/{User => Sys}/GameConfig/RCJE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RCJP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RCKPGN.ini (100%) rename Data/{User => Sys}/GameConfig/RCPE18.ini (100%) rename Data/{User => Sys}/GameConfig/RD2E41.ini (100%) rename Data/{User => Sys}/GameConfig/RD2J41.ini (100%) rename Data/{User => Sys}/GameConfig/RD2K41.ini (100%) rename Data/{User => Sys}/GameConfig/RD2P41.ini (100%) rename Data/{User => Sys}/GameConfig/RD2X41.ini (100%) rename Data/{User => Sys}/GameConfig/RDBPAF.ini (100%) rename Data/{User => Sys}/GameConfig/RDFP41.ini (100%) rename Data/{User => Sys}/GameConfig/RDGPA4.ini (100%) rename Data/{User => Sys}/GameConfig/RDHP78.ini (100%) rename Data/{User => Sys}/GameConfig/RDIE41.ini (100%) rename Data/{User => Sys}/GameConfig/RDKE01.ini (100%) rename Data/{User => Sys}/GameConfig/RDQEGD.ini (100%) rename Data/{User => Sys}/GameConfig/RDSE70.ini (100%) rename Data/{User => Sys}/GameConfig/RDSJAF.ini (100%) rename Data/{User => Sys}/GameConfig/RDSPAF.ini (100%) rename Data/{User => Sys}/GameConfig/RDVE41.ini (100%) rename Data/{User => Sys}/GameConfig/RDXP18.ini (100%) rename Data/{User => Sys}/GameConfig/RDZJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RDZP01.ini (100%) rename Data/{User => Sys}/GameConfig/RE4E08.ini (100%) rename Data/{User => Sys}/GameConfig/RE4J08.ini (100%) rename Data/{User => Sys}/GameConfig/RE4P08.ini (100%) rename Data/{User => Sys}/GameConfig/REDE41.ini (100%) rename Data/{User => Sys}/GameConfig/REDJ41.ini (100%) rename Data/{User => Sys}/GameConfig/REDP41.ini (100%) rename Data/{User => Sys}/GameConfig/RELJAB.ini (100%) rename Data/{User => Sys}/GameConfig/RELS01.ini (100%) rename Data/{User => Sys}/GameConfig/RENE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RENJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/RENP8P.ini (100%) rename Data/{User => Sys}/GameConfig/REXP01.ini (100%) rename Data/{User => Sys}/GameConfig/RF4P6M.ini (100%) rename Data/{User => Sys}/GameConfig/RF7J08.ini (100%) rename Data/{User => Sys}/GameConfig/RFBE01.ini (100%) rename Data/{User => Sys}/GameConfig/RFBJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RFBP01.ini (100%) rename Data/{User => Sys}/GameConfig/RFCEGD.ini (100%) rename Data/{User => Sys}/GameConfig/RFCJGD.ini (100%) rename Data/{User => Sys}/GameConfig/RFCPGD.ini (100%) rename Data/{User => Sys}/GameConfig/RFEE01.ini (100%) rename Data/{User => Sys}/GameConfig/RFEJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RFEP01.ini (100%) rename Data/{User => Sys}/GameConfig/RFFEGD.ini (100%) rename Data/{User => Sys}/GameConfig/RFFJGD.ini (100%) rename Data/{User => Sys}/GameConfig/RFFPGD.ini (100%) rename Data/{User => Sys}/GameConfig/RFQP69.ini (100%) rename Data/{User => Sys}/GameConfig/RFSEEB.ini (100%) rename Data/{User => Sys}/GameConfig/RFSJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/RG5PWR.ini (100%) rename Data/{User => Sys}/GameConfig/RGAE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RGHE52.ini (100%) rename Data/{User => Sys}/GameConfig/RGLE7D.ini (100%) rename Data/{User => Sys}/GameConfig/RGQE70.ini (100%) rename Data/{User => Sys}/GameConfig/RGVP52.ini (100%) rename Data/{User => Sys}/GameConfig/RH2P41.ini (100%) rename Data/{User => Sys}/GameConfig/RH8E4F.ini (100%) rename Data/{User => Sys}/GameConfig/RH8JEL.ini (100%) rename Data/{User => Sys}/GameConfig/RH8P4F.ini (100%) rename Data/{User => Sys}/GameConfig/RH8X4F.ini (100%) rename Data/{User => Sys}/GameConfig/RHAE01.ini (100%) rename Data/{User => Sys}/GameConfig/RHAJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RHAK01.ini (100%) rename Data/{User => Sys}/GameConfig/RHAP01.ini (100%) rename Data/{User => Sys}/GameConfig/RHAW01.ini (100%) rename Data/{User => Sys}/GameConfig/RHDE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RHDJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/RHDP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RHMEE9.ini (100%) rename Data/{User => Sys}/GameConfig/RHMP99.ini (100%) rename Data/{User => Sys}/GameConfig/RHOE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RHOJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/RHOP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RHTP54.ini (100%) rename Data/{User => Sys}/GameConfig/RHUP7J.ini (100%) rename Data/{User => Sys}/GameConfig/RIBPKM.ini (100%) rename Data/{User => Sys}/GameConfig/RIHP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RIJE69.ini (100%) rename Data/{User => Sys}/GameConfig/RINE08.ini (100%) rename Data/{User => Sys}/GameConfig/RINP08.ini (100%) rename Data/{User => Sys}/GameConfig/RIPEAF.ini (100%) rename Data/{User => Sys}/GameConfig/RIPJAF.ini (100%) rename Data/{User => Sys}/GameConfig/RIPPAF.ini (100%) rename Data/{User => Sys}/GameConfig/RIUJAF.ini (100%) rename Data/{User => Sys}/GameConfig/RIUPAF.ini (100%) rename Data/{User => Sys}/GameConfig/RIVEXJ.ini (100%) rename Data/{User => Sys}/GameConfig/RJ3P7J.ini (100%) rename Data/{User => Sys}/GameConfig/RJAP52.ini (100%) rename Data/{User => Sys}/GameConfig/RJCP52.ini (100%) rename Data/{User => Sys}/GameConfig/RJSXUG.ini (100%) rename Data/{User => Sys}/GameConfig/RK2EEB.ini (100%) rename Data/{User => Sys}/GameConfig/RK2JEB.ini (100%) rename Data/{User => Sys}/GameConfig/RK2P01.ini (100%) rename Data/{User => Sys}/GameConfig/RK5E01.ini (100%) rename Data/{User => Sys}/GameConfig/RKDEEB.ini (100%) rename Data/{User => Sys}/GameConfig/RKDJEB.ini (100%) rename Data/{User => Sys}/GameConfig/RKDP01.ini (100%) rename Data/{User => Sys}/GameConfig/RKDPEB.ini (100%) rename Data/{User => Sys}/GameConfig/RKIPUG.ini (100%) rename Data/{User => Sys}/GameConfig/RKMP5D.ini (100%) rename Data/{User => Sys}/GameConfig/RKSPUG.ini (100%) rename Data/{User => Sys}/GameConfig/RLBEWR.ini (100%) rename Data/{User => Sys}/GameConfig/RLEEFS.ini (100%) rename Data/{User => Sys}/GameConfig/RLGE64.ini (100%) rename Data/{User => Sys}/GameConfig/RLGJ52.ini (100%) rename Data/{User => Sys}/GameConfig/RLGP64.ini (100%) rename Data/{User => Sys}/GameConfig/RLJPKM.ini (100%) rename Data/{User => Sys}/GameConfig/RLXEMJ.ini (100%) rename Data/{User => Sys}/GameConfig/RM2E69.ini (100%) rename Data/{User => Sys}/GameConfig/RM3E01.ini (100%) rename Data/{User => Sys}/GameConfig/RM3J01.ini (100%) rename Data/{User => Sys}/GameConfig/RM3P01.ini (100%) rename Data/{User => Sys}/GameConfig/RM6EEB.ini (100%) rename Data/{User => Sys}/GameConfig/RM8E01.ini (100%) rename Data/{User => Sys}/GameConfig/RM8J01.ini (100%) rename Data/{User => Sys}/GameConfig/RM8K01.ini (100%) rename Data/{User => Sys}/GameConfig/RM8P01.ini (100%) rename Data/{User => Sys}/GameConfig/RMAE01.ini (100%) rename Data/{User => Sys}/GameConfig/RMAP01.ini (100%) rename Data/{User => Sys}/GameConfig/RMCE01.ini (100%) rename Data/{User => Sys}/GameConfig/RMCJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RMCK01.ini (100%) rename Data/{User => Sys}/GameConfig/RMCP01.ini (100%) rename Data/{User => Sys}/GameConfig/RMGE01.ini (100%) rename Data/{User => Sys}/GameConfig/RMGJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RMGK01.ini (100%) rename Data/{User => Sys}/GameConfig/RMGP01.ini (100%) rename Data/{User => Sys}/GameConfig/RMHE08.ini (100%) rename Data/{User => Sys}/GameConfig/RMHJ08.ini (100%) rename Data/{User => Sys}/GameConfig/RMHP08.ini (100%) rename Data/{User => Sys}/GameConfig/RMKE01.ini (100%) rename Data/{User => Sys}/GameConfig/RMKJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RMKP01.ini (100%) rename Data/{User => Sys}/GameConfig/RMLEH4.ini (100%) rename Data/{User => Sys}/GameConfig/RMLJH4.ini (100%) rename Data/{User => Sys}/GameConfig/RMLK52.ini (100%) rename Data/{User => Sys}/GameConfig/RMLP7U.ini (100%) rename Data/{User => Sys}/GameConfig/RMLPH4.ini (100%) rename Data/{User => Sys}/GameConfig/RMSE52.ini (100%) rename Data/{User => Sys}/GameConfig/RNEEDA.ini (100%) rename Data/{User => Sys}/GameConfig/RNEJDA.ini (100%) rename Data/{User => Sys}/GameConfig/RNEPDA.ini (100%) rename Data/{User => Sys}/GameConfig/RNHE41.ini (100%) rename Data/{User => Sys}/GameConfig/RNMXUG.ini (100%) rename Data/{User => Sys}/GameConfig/RNOJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RNOP01.ini (100%) rename Data/{User => Sys}/GameConfig/RO2P7N.ini (100%) rename Data/{User => Sys}/GameConfig/RO3EXJ.ini (100%) rename Data/{User => Sys}/GameConfig/RO3J99.ini (100%) rename Data/{User => Sys}/GameConfig/RO3P99.ini (100%) rename Data/{User => Sys}/GameConfig/RO7P7D.ini (100%) rename Data/{User => Sys}/GameConfig/RO8E7D.ini (100%) rename Data/{User => Sys}/GameConfig/RO9EFS.ini (100%) rename Data/{User => Sys}/GameConfig/RO9PNK.ini (100%) rename Data/{User => Sys}/GameConfig/ROAE36.ini (100%) rename Data/{User => Sys}/GameConfig/ROAP36.ini (100%) rename Data/{User => Sys}/GameConfig/ROCPNK.ini (100%) rename Data/{User => Sys}/GameConfig/RODE01.ini (100%) rename Data/{User => Sys}/GameConfig/RODJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RODK01.ini (100%) rename Data/{User => Sys}/GameConfig/RODP01.ini (100%) rename Data/{User => Sys}/GameConfig/ROLE8P.ini (100%) rename Data/{User => Sys}/GameConfig/ROLJ01.ini (100%) rename Data/{User => Sys}/GameConfig/ROLK01.ini (100%) rename Data/{User => Sys}/GameConfig/ROLP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RONEG9.ini (100%) rename Data/{User => Sys}/GameConfig/RONJG9.ini (100%) rename Data/{User => Sys}/GameConfig/RONPG9.ini (100%) rename Data/{User => Sys}/GameConfig/ROUJAF.ini (100%) rename Data/{User => Sys}/GameConfig/ROUPAF.ini (100%) rename Data/{User => Sys}/GameConfig/ROWE08.ini (100%) rename Data/{User => Sys}/GameConfig/ROWJ08.ini (100%) rename Data/{User => Sys}/GameConfig/ROWP08.ini (100%) rename Data/{User => Sys}/GameConfig/RP7P52.ini (100%) rename Data/{User => Sys}/GameConfig/RPBE01.ini (100%) rename Data/{User => Sys}/GameConfig/RPBJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RPBP01.ini (100%) rename Data/{User => Sys}/GameConfig/RPDPGN.ini (100%) rename Data/{User => Sys}/GameConfig/RPJE7U.ini (100%) rename Data/{User => Sys}/GameConfig/RPJJ99.ini (100%) rename Data/{User => Sys}/GameConfig/RPPE41.ini (100%) rename Data/{User => Sys}/GameConfig/RPWZ41.ini (100%) rename Data/{User => Sys}/GameConfig/RPYP9B.ini (100%) rename Data/{User => Sys}/GameConfig/RQ6EJJ.ini (100%) rename Data/{User => Sys}/GameConfig/RQ6PKM.ini (100%) rename Data/{User => Sys}/GameConfig/RQ6XKM.ini (100%) rename Data/{User => Sys}/GameConfig/RQBENR.ini (100%) rename Data/{User => Sys}/GameConfig/RQLE64.ini (100%) rename Data/{User => Sys}/GameConfig/RQOP69.ini (100%) rename Data/{User => Sys}/GameConfig/RQREXJ.ini (100%) rename Data/{User => Sys}/GameConfig/RQRJAF.ini (100%) rename Data/{User => Sys}/GameConfig/RQRPAF.ini (100%) rename Data/{User => Sys}/GameConfig/RR2PUG.ini (100%) rename Data/{User => Sys}/GameConfig/RR5P70.ini (100%) rename Data/{User => Sys}/GameConfig/RRAXUG.ini (100%) rename Data/{User => Sys}/GameConfig/RRBE41.ini (100%) rename Data/{User => Sys}/GameConfig/RRBJ41.ini (100%) rename Data/{User => Sys}/GameConfig/RRBP41.ini (100%) rename Data/{User => Sys}/GameConfig/RRKE70.ini (100%) rename Data/{User => Sys}/GameConfig/RRKP70.ini (100%) rename Data/{User => Sys}/GameConfig/RRMX69.ini (100%) rename Data/{User => Sys}/GameConfig/RRXXUG.ini (100%) rename Data/{User => Sys}/GameConfig/RRYPHY.ini (100%) rename Data/{User => Sys}/GameConfig/RRZEGY.ini (100%) rename Data/{User => Sys}/GameConfig/RRZPGY.ini (100%) rename Data/{User => Sys}/GameConfig/RS5EC8.ini (100%) rename Data/{User => Sys}/GameConfig/RS5JC8.ini (100%) rename Data/{User => Sys}/GameConfig/RS5PC8.ini (100%) rename Data/{User => Sys}/GameConfig/RS8J8N.ini (100%) rename Data/{User => Sys}/GameConfig/RS9E8P.ini (100%) rename Data/{User => Sys}/GameConfig/RS9P8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSBE01.ini (100%) rename Data/{User => Sys}/GameConfig/RSBJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RSBP01.ini (100%) rename Data/{User => Sys}/GameConfig/RSFE7U.ini (100%) rename Data/{User => Sys}/GameConfig/RSFJ99.ini (100%) rename Data/{User => Sys}/GameConfig/RSFP99.ini (100%) rename Data/{User => Sys}/GameConfig/RSIE69.ini (100%) rename Data/{User => Sys}/GameConfig/RSIJ13.ini (100%) rename Data/{User => Sys}/GameConfig/RSIP69.ini (100%) rename Data/{User => Sys}/GameConfig/RSLEAF.ini (100%) rename Data/{User => Sys}/GameConfig/RSLJAF.ini (100%) rename Data/{User => Sys}/GameConfig/RSLKAF.ini (100%) rename Data/{User => Sys}/GameConfig/RSLPAF.ini (100%) rename Data/{User => Sys}/GameConfig/RSME8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSMP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSPE01.ini (100%) rename Data/{User => Sys}/GameConfig/RSPP01.ini (100%) rename Data/{User => Sys}/GameConfig/RSRE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSRP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSTP64.ini (100%) rename Data/{User => Sys}/GameConfig/RSUP41.ini (100%) rename Data/{User => Sys}/GameConfig/RSVE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSVJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSVP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RSWP08.ini (100%) rename Data/{User => Sys}/GameConfig/RSXE69.ini (100%) rename Data/{User => Sys}/GameConfig/RSXJ13.ini (100%) rename Data/{User => Sys}/GameConfig/RSXK69.ini (100%) rename Data/{User => Sys}/GameConfig/RSXP69.ini (100%) rename Data/{User => Sys}/GameConfig/RSZPGT.ini (100%) rename Data/{User => Sys}/GameConfig/RT3E54.ini (100%) rename Data/{User => Sys}/GameConfig/RT3JEL.ini (100%) rename Data/{User => Sys}/GameConfig/RT3P54.ini (100%) rename Data/{User => Sys}/GameConfig/RT4EAF.ini (100%) rename Data/{User => Sys}/GameConfig/RT4JAF.ini (100%) rename Data/{User => Sys}/GameConfig/RT4PAF.ini (100%) rename Data/{User => Sys}/GameConfig/RT5E8P.ini (100%) rename Data/{User => Sys}/GameConfig/RT5P8P.ini (100%) rename Data/{User => Sys}/GameConfig/RT9E52.ini (100%) rename Data/{User => Sys}/GameConfig/RTBP52.ini (100%) rename Data/{User => Sys}/GameConfig/RTCP41.ini (100%) rename Data/{User => Sys}/GameConfig/RTHE52.ini (100%) rename Data/{User => Sys}/GameConfig/RTME41.ini (100%) rename Data/{User => Sys}/GameConfig/RTMP41.ini (100%) rename Data/{User => Sys}/GameConfig/RTNE41.ini (100%) rename Data/{User => Sys}/GameConfig/RTNJCQ.ini (100%) rename Data/{User => Sys}/GameConfig/RTNP41.ini (100%) rename Data/{User => Sys}/GameConfig/RTZE08.ini (100%) rename Data/{User => Sys}/GameConfig/RTZJ08.ini (100%) rename Data/{User => Sys}/GameConfig/RTZK08.ini (100%) rename Data/{User => Sys}/GameConfig/RTZP08.ini (100%) rename Data/{User => Sys}/GameConfig/RUCXRT.ini (100%) rename Data/{User => Sys}/GameConfig/RUUE01.ini (100%) rename Data/{User => Sys}/GameConfig/RUUJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RUUK01.ini (100%) rename Data/{User => Sys}/GameConfig/RUUP01.ini (100%) rename Data/{User => Sys}/GameConfig/RUYE41.ini (100%) rename Data/{User => Sys}/GameConfig/RVKEXJ.ini (100%) rename Data/{User => Sys}/GameConfig/RVKP99.ini (100%) rename Data/{User => Sys}/GameConfig/RVOPPL.ini (100%) rename Data/{User => Sys}/GameConfig/RVQP41.ini (100%) rename Data/{User => Sys}/GameConfig/RVSE69.ini (100%) rename Data/{User => Sys}/GameConfig/RVSP69.ini (100%) rename Data/{User => Sys}/GameConfig/RVUP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RVVP78.ini (100%) rename Data/{User => Sys}/GameConfig/RVZP52.ini (100%) rename Data/{User => Sys}/GameConfig/RW9X78.ini (100%) rename Data/{User => Sys}/GameConfig/RWBXUG.ini (100%) rename Data/{User => Sys}/GameConfig/RWEPA4.ini (100%) rename Data/{User => Sys}/GameConfig/RWLE01.ini (100%) rename Data/{User => Sys}/GameConfig/RWRE4F.ini (100%) rename Data/{User => Sys}/GameConfig/RWRP4F.ini (100%) rename Data/{User => Sys}/GameConfig/RWSE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RWSJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RWSK01.ini (100%) rename Data/{User => Sys}/GameConfig/RWSP8P.ini (100%) rename Data/{User => Sys}/GameConfig/RWUX52.ini (100%) rename Data/{User => Sys}/GameConfig/RX3E01.ini (100%) rename Data/{User => Sys}/GameConfig/RX9P69.ini (100%) rename Data/{User => Sys}/GameConfig/RX9Y69.ini (100%) rename Data/{User => Sys}/GameConfig/RXXE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/RXXJ4Q.ini (100%) rename Data/{User => Sys}/GameConfig/RXXP4Q.ini (100%) rename Data/{User => Sys}/GameConfig/RYBE69.ini (100%) rename Data/{User => Sys}/GameConfig/RYOEA4.ini (100%) rename Data/{User => Sys}/GameConfig/RYQP69.ini (100%) rename Data/{User => Sys}/GameConfig/RYXP7J.ini (100%) rename Data/{User => Sys}/GameConfig/RZ9PG9.ini (100%) rename Data/{User => Sys}/GameConfig/RZDE01.ini (100%) rename Data/{User => Sys}/GameConfig/RZDJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RZDK01.ini (100%) rename Data/{User => Sys}/GameConfig/RZDP01.ini (100%) rename Data/{User => Sys}/GameConfig/RZJD69.ini (100%) rename Data/{User => Sys}/GameConfig/RZJE69.ini (100%) rename Data/{User => Sys}/GameConfig/RZJJ13.ini (100%) rename Data/{User => Sys}/GameConfig/RZJP69.ini (100%) rename Data/{User => Sys}/GameConfig/RZPE01.ini (100%) rename Data/{User => Sys}/GameConfig/RZTE01.ini (100%) rename Data/{User => Sys}/GameConfig/RZTJ01.ini (100%) rename Data/{User => Sys}/GameConfig/RZTK01.ini (100%) rename Data/{User => Sys}/GameConfig/RZTP01.ini (100%) rename Data/{User => Sys}/GameConfig/RZTW01.ini (100%) rename Data/{User => Sys}/GameConfig/RZZE8P.ini (100%) rename Data/{User => Sys}/GameConfig/RZZJEL.ini (100%) rename Data/{User => Sys}/GameConfig/RZZP8P.ini (100%) rename Data/{User => Sys}/GameConfig/S2IP8P.ini (100%) rename Data/{User => Sys}/GameConfig/S2LE01.ini (100%) rename Data/{User => Sys}/GameConfig/S2LJ01.ini (100%) rename Data/{User => Sys}/GameConfig/S2LP01.ini (100%) rename Data/{User => Sys}/GameConfig/S2TJAF.ini (100%) rename Data/{User => Sys}/GameConfig/S2WE78.ini (100%) rename Data/{User => Sys}/GameConfig/S2WP78.ini (100%) rename Data/{User => Sys}/GameConfig/S3BEWR.ini (100%) rename Data/{User => Sys}/GameConfig/S3BPWR.ini (100%) rename Data/{User => Sys}/GameConfig/S59E01.ini (100%) rename Data/{User => Sys}/GameConfig/S59JC8.ini (100%) rename Data/{User => Sys}/GameConfig/S59P01.ini (100%) rename Data/{User => Sys}/GameConfig/S72E01.ini (100%) rename Data/{User => Sys}/GameConfig/S72J01.ini (100%) rename Data/{User => Sys}/GameConfig/S75E69.ini (100%) rename Data/{User => Sys}/GameConfig/S75P69.ini (100%) rename Data/{User => Sys}/GameConfig/SAKENS.ini (100%) rename Data/{User => Sys}/GameConfig/SAKPNS.ini (100%) rename Data/{User => Sys}/GameConfig/SB3E08.ini (100%) rename Data/{User => Sys}/GameConfig/SB3J08.ini (100%) rename Data/{User => Sys}/GameConfig/SB3P08.ini (100%) rename Data/{User => Sys}/GameConfig/SB4E01.ini (100%) rename Data/{User => Sys}/GameConfig/SB4J01.ini (100%) rename Data/{User => Sys}/GameConfig/SB4P01.ini (100%) rename Data/{User => Sys}/GameConfig/SBDE08.ini (100%) rename Data/{User => Sys}/GameConfig/SBDJ08.ini (100%) rename Data/{User => Sys}/GameConfig/SBDK08.ini (100%) rename Data/{User => Sys}/GameConfig/SBDP08.ini (100%) rename Data/{User => Sys}/GameConfig/SBLE5G.ini (100%) rename Data/{User => Sys}/GameConfig/SBNEG9.ini (100%) rename Data/{User => Sys}/GameConfig/SBVE78.ini (100%) rename Data/{User => Sys}/GameConfig/SC2E8P.ini (100%) rename Data/{User => Sys}/GameConfig/SC2P8P.ini (100%) rename Data/{User => Sys}/GameConfig/SC4E64.ini (100%) rename Data/{User => Sys}/GameConfig/SC4P64.ini (100%) rename Data/{User => Sys}/GameConfig/SC7D52.ini (100%) rename Data/{User => Sys}/GameConfig/SC7E52.ini (100%) rename Data/{User => Sys}/GameConfig/SC7F52.ini (100%) rename Data/{User => Sys}/GameConfig/SC7I52.ini (100%) rename Data/{User => Sys}/GameConfig/SC7P52.ini (100%) rename Data/{User => Sys}/GameConfig/SC7S52.ini (100%) rename Data/{User => Sys}/GameConfig/SC8E01.ini (100%) rename Data/{User => Sys}/GameConfig/SC8J01.ini (100%) rename Data/{User => Sys}/GameConfig/SC8P01.ini (100%) rename Data/{User => Sys}/GameConfig/SCAE18.ini (100%) rename Data/{User => Sys}/GameConfig/SCAJ18.ini (100%) rename Data/{User => Sys}/GameConfig/SCAP18.ini (100%) rename Data/{User => Sys}/GameConfig/SCYE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SCYP4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SCYX4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SCYY4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SCYZ4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SD2E41.ini (100%) rename Data/{User => Sys}/GameConfig/SD2J01.ini (100%) rename Data/{User => Sys}/GameConfig/SD2P41.ini (100%) rename Data/{User => Sys}/GameConfig/SD2Y41.ini (100%) rename Data/{User => Sys}/GameConfig/SDBE78.ini (100%) rename Data/{User => Sys}/GameConfig/SDBP78.ini (100%) rename Data/{User => Sys}/GameConfig/SDFE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SDNE41.ini (100%) rename Data/{User => Sys}/GameConfig/SDNP41.ini (100%) rename Data/{User => Sys}/GameConfig/SDWE18.ini (100%) rename Data/{User => Sys}/GameConfig/SDWJ18.ini (100%) rename Data/{User => Sys}/GameConfig/SDWP18.ini (100%) rename Data/{User => Sys}/GameConfig/SE2P69.ini (100%) rename Data/{User => Sys}/GameConfig/SEAE69.ini (100%) rename Data/{User => Sys}/GameConfig/SEAJ13.ini (100%) rename Data/{User => Sys}/GameConfig/SEAP69.ini (100%) rename Data/{User => Sys}/GameConfig/SEME4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SEMJ01.ini (100%) rename Data/{User => Sys}/GameConfig/SEMP4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SEMX4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SEMY4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SEMZ4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SERE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SERF4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SERP4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SF8E01.ini (100%) rename Data/{User => Sys}/GameConfig/SF8J01.ini (100%) rename Data/{User => Sys}/GameConfig/SF8P01.ini (100%) rename Data/{User => Sys}/GameConfig/SFIE01.ini (100%) rename Data/{User => Sys}/GameConfig/SFIP01.ini (100%) rename Data/{User => Sys}/GameConfig/SFWE69.ini (100%) rename Data/{User => Sys}/GameConfig/SFWP69.ini (100%) rename Data/{User => Sys}/GameConfig/SGAP8P.ini (100%) rename Data/{User => Sys}/GameConfig/SH6E52.ini (100%) rename Data/{User => Sys}/GameConfig/SHDE52.ini (100%) rename Data/{User => Sys}/GameConfig/SHLPA4.ini (100%) rename Data/{User => Sys}/GameConfig/SILE78.ini (100%) rename Data/{User => Sys}/GameConfig/SILP78.ini (100%) rename Data/{User => Sys}/GameConfig/SJBE52.ini (100%) rename Data/{User => Sys}/GameConfig/SJBP52.ini (100%) rename Data/{User => Sys}/GameConfig/SJDE41.ini (100%) rename Data/{User => Sys}/GameConfig/SJDP41.ini (100%) rename Data/{User => Sys}/GameConfig/SJDY41.ini (100%) rename Data/{User => Sys}/GameConfig/SJDZ41.ini (100%) rename Data/{User => Sys}/GameConfig/SJXD41.ini (100%) rename Data/{User => Sys}/GameConfig/SJXE41.ini (100%) rename Data/{User => Sys}/GameConfig/SJXP41.ini (100%) rename Data/{User => Sys}/GameConfig/SK3EEB.ini (100%) rename Data/{User => Sys}/GameConfig/SK4E52.ini (100%) rename Data/{User => Sys}/GameConfig/SKJE78.ini (100%) rename Data/{User => Sys}/GameConfig/SKVE20.ini (100%) rename Data/{User => Sys}/GameConfig/SLSEXJ.ini (100%) rename Data/{User => Sys}/GameConfig/SLSJ01.ini (100%) rename Data/{User => Sys}/GameConfig/SLSP01.ini (100%) rename Data/{User => Sys}/GameConfig/SLWE41.ini (100%) rename Data/{User => Sys}/GameConfig/SMBE8P.ini (100%) rename Data/{User => Sys}/GameConfig/SMBP8P.ini (100%) rename Data/{User => Sys}/GameConfig/SMFE4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SMFP4Q.ini (100%) rename Data/{User => Sys}/GameConfig/SMNE01.ini (100%) rename Data/{User => Sys}/GameConfig/SMNJ01.ini (100%) rename Data/{User => Sys}/GameConfig/SMNK01.ini (100%) rename Data/{User => Sys}/GameConfig/SMNP01.ini (100%) rename Data/{User => Sys}/GameConfig/SMNW01.ini (100%) rename Data/{User => Sys}/GameConfig/SMOE41.ini (100%) rename Data/{User => Sys}/GameConfig/SMOP41.ini (100%) rename Data/{User => Sys}/GameConfig/SMOX41.ini (100%) rename Data/{User => Sys}/GameConfig/SN4EDA.ini (100%) rename Data/{User => Sys}/GameConfig/SN4JDA.ini (100%) rename Data/{User => Sys}/GameConfig/SN4XGT.ini (100%) rename Data/{User => Sys}/GameConfig/SNCE8P.ini (100%) rename Data/{User => Sys}/GameConfig/SNCJ8P.ini (100%) rename Data/{User => Sys}/GameConfig/SNCP8P.ini (100%) rename Data/{User => Sys}/GameConfig/SNDE20.ini (100%) rename Data/{User => Sys}/GameConfig/SNJE69.ini (100%) rename Data/{User => Sys}/GameConfig/SNJP69.ini (100%) rename Data/{User => Sys}/GameConfig/SO3EE9.ini (100%) rename Data/{User => Sys}/GameConfig/SO3J99.ini (100%) rename Data/{User => Sys}/GameConfig/SOJE41.ini (100%) rename Data/{User => Sys}/GameConfig/SOJP41.ini (100%) rename Data/{User => Sys}/GameConfig/SOUE01.ini (100%) rename Data/{User => Sys}/GameConfig/SOUJ01.ini (100%) rename Data/{User => Sys}/GameConfig/SOUK01.ini (100%) rename Data/{User => Sys}/GameConfig/SOUP01.ini (100%) rename Data/{User => Sys}/GameConfig/SPDE52.ini (100%) rename Data/{User => Sys}/GameConfig/SPDP52.ini (100%) rename Data/{User => Sys}/GameConfig/SPPEFS.ini (100%) rename Data/{User => Sys}/GameConfig/SPTJEB.ini (100%) rename Data/{User => Sys}/GameConfig/SPVEA4.ini (100%) rename Data/{User => Sys}/GameConfig/SPVPA4.ini (100%) rename Data/{User => Sys}/GameConfig/SPVXA4.ini (100%) rename Data/{User => Sys}/GameConfig/SPVYA4.ini (100%) rename Data/{User => Sys}/GameConfig/SQME52.ini (100%) rename Data/{User => Sys}/GameConfig/SQMP52.ini (100%) rename Data/{User => Sys}/GameConfig/SR5E41.ini (100%) rename Data/{User => Sys}/GameConfig/SRQE41.ini (100%) rename Data/{User => Sys}/GameConfig/SRQP41.ini (100%) rename Data/{User => Sys}/GameConfig/SS3EWR.ini (100%) rename Data/{User => Sys}/GameConfig/SSQE01.ini (100%) rename Data/{User => Sys}/GameConfig/SSQJ01.ini (100%) rename Data/{User => Sys}/GameConfig/SSQP01.ini (100%) rename Data/{User => Sys}/GameConfig/SSRE20.ini (100%) rename Data/{User => Sys}/GameConfig/SSRPXT.ini (100%) rename Data/{User => Sys}/GameConfig/SSZE5G.ini (100%) rename Data/{User => Sys}/GameConfig/STEETR.ini (100%) rename Data/{User => Sys}/GameConfig/STHP8P.ini (100%) rename Data/{User => Sys}/GameConfig/STKE08.ini (100%) rename Data/{User => Sys}/GameConfig/STKJ08.ini (100%) rename Data/{User => Sys}/GameConfig/STKP08.ini (100%) rename Data/{User => Sys}/GameConfig/SUKE01.ini (100%) rename Data/{User => Sys}/GameConfig/SUKJ01.ini (100%) rename Data/{User => Sys}/GameConfig/SUKP01.ini (100%) rename Data/{User => Sys}/GameConfig/SVBE52.ini (100%) rename Data/{User => Sys}/GameConfig/SVBP52.ini (100%) rename Data/{User => Sys}/GameConfig/SVME01.ini (100%) rename Data/{User => Sys}/GameConfig/SVMJ01.ini (100%) rename Data/{User => Sys}/GameConfig/SVMP01.ini (100%) rename Data/{User => Sys}/GameConfig/SWAE52.ini (100%) rename Data/{User => Sys}/GameConfig/SX3J01.ini (100%) rename Data/{User => Sys}/GameConfig/SX3P01.ini (100%) rename Data/{User => Sys}/GameConfig/SX4J01.ini (100%) rename Data/{User => Sys}/GameConfig/SX4P01.ini (100%) rename Data/{User => Sys}/GameConfig/SX8E52.ini (100%) rename Data/{User => Sys}/GameConfig/SXBP52.ini (100%) rename Data/{User => Sys}/GameConfig/SXCE52.ini (100%) rename Data/{User => Sys}/GameConfig/SXCP52.ini (100%) rename Data/{User => Sys}/GameConfig/SXDE52.ini (100%) rename Data/{User => Sys}/GameConfig/SXEE52.ini (100%) rename Data/{User => Sys}/GameConfig/SZAE69.ini (100%) rename Data/{User => Sys}/GameConfig/SZAP69.ini (100%) rename Data/{User => Sys}/GameConfig/SZBE69.ini (100%) rename Data/{User => Sys}/GameConfig/SZBP69.ini (100%) rename Data/{User => Sys}/GameConfig/UGPE01.ini (100%) rename Data/{User => Sys}/GameConfig/UGPP01.ini (100%) rename Data/{User => Sys}/GameConfig/W2GE08.ini (100%) rename Data/{User => Sys}/GameConfig/W2GP08.ini (100%) rename Data/{User => Sys}/GameConfig/W2MEBB.ini (100%) rename Data/{User => Sys}/GameConfig/W3GE08.ini (100%) rename Data/{User => Sys}/GameConfig/W3GP08.ini (100%) rename Data/{User => Sys}/GameConfig/W8CEXS.ini (100%) rename Data/{User => Sys}/GameConfig/W8CPXS.ini (100%) rename Data/{User => Sys}/GameConfig/WA4P01.ini (100%) rename Data/{User => Sys}/GameConfig/WALE01.ini (100%) rename Data/{User => Sys}/GameConfig/WAYETJ.ini (100%) rename Data/{User => Sys}/GameConfig/WB2ETL.ini (100%) rename Data/{User => Sys}/GameConfig/WB3ETL.ini (100%) rename Data/{User => Sys}/GameConfig/WB6EGL.ini (100%) rename Data/{User => Sys}/GameConfig/WBLPGD.ini (100%) rename Data/{User => Sys}/GameConfig/WBME01.ini (100%) rename Data/{User => Sys}/GameConfig/WBQE18.ini (100%) rename Data/{User => Sys}/GameConfig/WBXETL.ini (100%) rename Data/{User => Sys}/GameConfig/WBYETL.ini (100%) rename Data/{User => Sys}/GameConfig/WBZETL.ini (100%) rename Data/{User => Sys}/GameConfig/WC6EUP.ini (100%) rename Data/{User => Sys}/GameConfig/WCHEJS.ini (100%) rename Data/{User => Sys}/GameConfig/WCVENV.ini (100%) rename Data/{User => Sys}/GameConfig/WD9EA4.ini (100%) rename Data/{User => Sys}/GameConfig/WDME01.ini (100%) rename Data/{User => Sys}/GameConfig/WDMP01.ini (100%) rename Data/{User => Sys}/GameConfig/WERP18.ini (100%) rename Data/{User => Sys}/GameConfig/WF4EGD.ini (100%) rename Data/{User => Sys}/GameConfig/WFLE01.ini (100%) rename Data/{User => Sys}/GameConfig/WFUEQQ.ini (100%) rename Data/{User => Sys}/GameConfig/WGDEA4.ini (100%) rename Data/{User => Sys}/GameConfig/WGDPA4.ini (100%) rename Data/{User => Sys}/GameConfig/WGOEWG.ini (100%) rename Data/{User => Sys}/GameConfig/WGOPWG.ini (100%) rename Data/{User => Sys}/GameConfig/WGSE08.ini (100%) rename Data/{User => Sys}/GameConfig/WGSP08.ini (100%) rename Data/{User => Sys}/GameConfig/WGYEHN.ini (100%) rename Data/{User => Sys}/GameConfig/WHFETY.ini (100%) rename Data/{User => Sys}/GameConfig/WHWEFJ.ini (100%) rename Data/{User => Sys}/GameConfig/WHWPFJ.ini (100%) rename Data/{User => Sys}/GameConfig/WICPKQ.ini (100%) rename Data/{User => Sys}/GameConfig/WIDEUN.ini (100%) rename Data/{User => Sys}/GameConfig/WILETL.ini (100%) rename Data/{User => Sys}/GameConfig/WIYETL.ini (100%) rename Data/{User => Sys}/GameConfig/WJEEJX.ini (100%) rename Data/{User => Sys}/GameConfig/WKTJA4.ini (100%) rename Data/{User => Sys}/GameConfig/WKTPA4.ini (100%) rename Data/{User => Sys}/GameConfig/WLOEHL.ini (100%) rename Data/{User => Sys}/GameConfig/WLWEHL.ini (100%) rename Data/{User => Sys}/GameConfig/WM8E18.ini (100%) rename Data/{User => Sys}/GameConfig/WMBP01.ini (100%) rename Data/{User => Sys}/GameConfig/WMMEAF.ini (100%) rename Data/{User => Sys}/GameConfig/WOTEM0.ini (100%) rename Data/{User => Sys}/GameConfig/WPCE01.ini (100%) rename Data/{User => Sys}/GameConfig/WPJEJW.ini (100%) rename Data/{User => Sys}/GameConfig/WPPEXS.ini (100%) rename Data/{User => Sys}/GameConfig/WPPJJF.ini (100%) rename Data/{User => Sys}/GameConfig/WPSE01.ini (100%) rename Data/{User => Sys}/GameConfig/WPUEGD.ini (100%) rename Data/{User => Sys}/GameConfig/WPYPPY.ini (100%) rename Data/{User => Sys}/GameConfig/WR9E08.ini (100%) rename Data/{User => Sys}/GameConfig/WR9P08.ini (100%) rename Data/{User => Sys}/GameConfig/WRGEHU.ini (100%) rename Data/{User => Sys}/GameConfig/WRIPGD.ini (100%) rename Data/{User => Sys}/GameConfig/WRUPXS.ini (100%) rename Data/{User => Sys}/GameConfig/WRXE08.ini (100%) rename Data/{User => Sys}/GameConfig/WSNE8P.ini (100%) rename Data/{User => Sys}/GameConfig/WTEELU.ini (100%) rename Data/{User => Sys}/GameConfig/WTKEGL.ini (100%) rename Data/{User => Sys}/GameConfig/WTRPXS.ini (100%) rename Data/{User => Sys}/GameConfig/WTTPTW.ini (100%) rename Data/{User => Sys}/GameConfig/WTXPJS.ini (100%) rename Data/{User => Sys}/GameConfig/WWRE01.ini (100%) rename Data/{User => Sys}/GameConfig/WZIPTW.ini (100%) rename Data/{User => Sys}/GameConfig/WZPPRZ.ini (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fcdeeca8fb..a1e1fa5537 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -778,7 +778,6 @@ add_subdirectory(Source) # Install shared data files # if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) - install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN) install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN) endif() if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")) diff --git a/Data/User/GameConfig/D43E01.ini b/Data/Sys/GameConfig/D43E01.ini similarity index 100% rename from Data/User/GameConfig/D43E01.ini rename to Data/Sys/GameConfig/D43E01.ini diff --git a/Data/User/GameConfig/D43J01.ini b/Data/Sys/GameConfig/D43J01.ini similarity index 100% rename from Data/User/GameConfig/D43J01.ini rename to Data/Sys/GameConfig/D43J01.ini diff --git a/Data/User/GameConfig/D43P01.ini b/Data/Sys/GameConfig/D43P01.ini similarity index 100% rename from Data/User/GameConfig/D43P01.ini rename to Data/Sys/GameConfig/D43P01.ini diff --git a/Data/User/GameConfig/D43U01.ini b/Data/Sys/GameConfig/D43U01.ini similarity index 100% rename from Data/User/GameConfig/D43U01.ini rename to Data/Sys/GameConfig/D43U01.ini diff --git a/Data/User/GameConfig/DTLX01.ini b/Data/Sys/GameConfig/DTLX01.ini similarity index 100% rename from Data/User/GameConfig/DTLX01.ini rename to Data/Sys/GameConfig/DTLX01.ini diff --git a/Data/User/GameConfig/DVDXDV.ini b/Data/Sys/GameConfig/DVDXDV.ini similarity index 100% rename from Data/User/GameConfig/DVDXDV.ini rename to Data/Sys/GameConfig/DVDXDV.ini diff --git a/Data/User/GameConfig/FABP01.ini b/Data/Sys/GameConfig/FABP01.ini similarity index 100% rename from Data/User/GameConfig/FABP01.ini rename to Data/Sys/GameConfig/FABP01.ini diff --git a/Data/User/GameConfig/FBYE01.ini b/Data/Sys/GameConfig/FBYE01.ini similarity index 100% rename from Data/User/GameConfig/FBYE01.ini rename to Data/Sys/GameConfig/FBYE01.ini diff --git a/Data/User/GameConfig/G2BE5G.ini b/Data/Sys/GameConfig/G2BE5G.ini similarity index 100% rename from Data/User/GameConfig/G2BE5G.ini rename to Data/Sys/GameConfig/G2BE5G.ini diff --git a/Data/User/GameConfig/G2BP7D.ini b/Data/Sys/GameConfig/G2BP7D.ini similarity index 100% rename from Data/User/GameConfig/G2BP7D.ini rename to Data/Sys/GameConfig/G2BP7D.ini diff --git a/Data/User/GameConfig/G2CE52.ini b/Data/Sys/GameConfig/G2CE52.ini similarity index 100% rename from Data/User/GameConfig/G2CE52.ini rename to Data/Sys/GameConfig/G2CE52.ini diff --git a/Data/User/GameConfig/G2FE78.ini b/Data/Sys/GameConfig/G2FE78.ini similarity index 100% rename from Data/User/GameConfig/G2FE78.ini rename to Data/Sys/GameConfig/G2FE78.ini diff --git a/Data/User/GameConfig/G2GJB2.ini b/Data/Sys/GameConfig/G2GJB2.ini similarity index 100% rename from Data/User/GameConfig/G2GJB2.ini rename to Data/Sys/GameConfig/G2GJB2.ini diff --git a/Data/User/GameConfig/G2ME01.ini b/Data/Sys/GameConfig/G2ME01.ini similarity index 100% rename from Data/User/GameConfig/G2ME01.ini rename to Data/Sys/GameConfig/G2ME01.ini diff --git a/Data/User/GameConfig/G2MP01.ini b/Data/Sys/GameConfig/G2MP01.ini similarity index 100% rename from Data/User/GameConfig/G2MP01.ini rename to Data/Sys/GameConfig/G2MP01.ini diff --git a/Data/User/GameConfig/G2OE41.ini b/Data/Sys/GameConfig/G2OE41.ini similarity index 100% rename from Data/User/GameConfig/G2OE41.ini rename to Data/Sys/GameConfig/G2OE41.ini diff --git a/Data/User/GameConfig/G2OP41.ini b/Data/Sys/GameConfig/G2OP41.ini similarity index 100% rename from Data/User/GameConfig/G2OP41.ini rename to Data/Sys/GameConfig/G2OP41.ini diff --git a/Data/User/GameConfig/G2RE52.ini b/Data/Sys/GameConfig/G2RE52.ini similarity index 100% rename from Data/User/GameConfig/G2RE52.ini rename to Data/Sys/GameConfig/G2RE52.ini diff --git a/Data/User/GameConfig/G2TE52.ini b/Data/Sys/GameConfig/G2TE52.ini similarity index 100% rename from Data/User/GameConfig/G2TE52.ini rename to Data/Sys/GameConfig/G2TE52.ini diff --git a/Data/User/GameConfig/G2VE08.ini b/Data/Sys/GameConfig/G2VE08.ini similarity index 100% rename from Data/User/GameConfig/G2VE08.ini rename to Data/Sys/GameConfig/G2VE08.ini diff --git a/Data/User/GameConfig/G2VP08.ini b/Data/Sys/GameConfig/G2VP08.ini similarity index 100% rename from Data/User/GameConfig/G2VP08.ini rename to Data/Sys/GameConfig/G2VP08.ini diff --git a/Data/User/GameConfig/G2XE8P.ini b/Data/Sys/GameConfig/G2XE8P.ini similarity index 100% rename from Data/User/GameConfig/G2XE8P.ini rename to Data/Sys/GameConfig/G2XE8P.ini diff --git a/Data/User/GameConfig/G2XP8P.ini b/Data/Sys/GameConfig/G2XP8P.ini similarity index 100% rename from Data/User/GameConfig/G2XP8P.ini rename to Data/Sys/GameConfig/G2XP8P.ini diff --git a/Data/User/GameConfig/G3AD69.ini b/Data/Sys/GameConfig/G3AD69.ini similarity index 100% rename from Data/User/GameConfig/G3AD69.ini rename to Data/Sys/GameConfig/G3AD69.ini diff --git a/Data/User/GameConfig/G3AE69.ini b/Data/Sys/GameConfig/G3AE69.ini similarity index 100% rename from Data/User/GameConfig/G3AE69.ini rename to Data/Sys/GameConfig/G3AE69.ini diff --git a/Data/User/GameConfig/G3AF69.ini b/Data/Sys/GameConfig/G3AF69.ini similarity index 100% rename from Data/User/GameConfig/G3AF69.ini rename to Data/Sys/GameConfig/G3AF69.ini diff --git a/Data/User/GameConfig/G3AP69.ini b/Data/Sys/GameConfig/G3AP69.ini similarity index 100% rename from Data/User/GameConfig/G3AP69.ini rename to Data/Sys/GameConfig/G3AP69.ini diff --git a/Data/User/GameConfig/G3DE6L.ini b/Data/Sys/GameConfig/G3DE6L.ini similarity index 100% rename from Data/User/GameConfig/G3DE6L.ini rename to Data/Sys/GameConfig/G3DE6L.ini diff --git a/Data/User/GameConfig/G3EE51.ini b/Data/Sys/GameConfig/G3EE51.ini similarity index 100% rename from Data/User/GameConfig/G3EE51.ini rename to Data/Sys/GameConfig/G3EE51.ini diff --git a/Data/User/GameConfig/G3FE69.ini b/Data/Sys/GameConfig/G3FE69.ini similarity index 100% rename from Data/User/GameConfig/G3FE69.ini rename to Data/Sys/GameConfig/G3FE69.ini diff --git a/Data/User/GameConfig/G3FF69.ini b/Data/Sys/GameConfig/G3FF69.ini similarity index 100% rename from Data/User/GameConfig/G3FF69.ini rename to Data/Sys/GameConfig/G3FF69.ini diff --git a/Data/User/GameConfig/G3FP69.ini b/Data/Sys/GameConfig/G3FP69.ini similarity index 100% rename from Data/User/GameConfig/G3FP69.ini rename to Data/Sys/GameConfig/G3FP69.ini diff --git a/Data/User/GameConfig/G3JEAF.ini b/Data/Sys/GameConfig/G3JEAF.ini similarity index 100% rename from Data/User/GameConfig/G3JEAF.ini rename to Data/Sys/GameConfig/G3JEAF.ini diff --git a/Data/User/GameConfig/G3LE8P.ini b/Data/Sys/GameConfig/G3LE8P.ini similarity index 100% rename from Data/User/GameConfig/G3LE8P.ini rename to Data/Sys/GameConfig/G3LE8P.ini diff --git a/Data/User/GameConfig/G3NJDA.ini b/Data/Sys/GameConfig/G3NJDA.ini similarity index 100% rename from Data/User/GameConfig/G3NJDA.ini rename to Data/Sys/GameConfig/G3NJDA.ini diff --git a/Data/User/GameConfig/G3QEA4.ini b/Data/Sys/GameConfig/G3QEA4.ini similarity index 100% rename from Data/User/GameConfig/G3QEA4.ini rename to Data/Sys/GameConfig/G3QEA4.ini diff --git a/Data/User/GameConfig/G3RD52.ini b/Data/Sys/GameConfig/G3RD52.ini similarity index 100% rename from Data/User/GameConfig/G3RD52.ini rename to Data/Sys/GameConfig/G3RD52.ini diff --git a/Data/User/GameConfig/G3RE52.ini b/Data/Sys/GameConfig/G3RE52.ini similarity index 100% rename from Data/User/GameConfig/G3RE52.ini rename to Data/Sys/GameConfig/G3RE52.ini diff --git a/Data/User/GameConfig/G3RF52.ini b/Data/Sys/GameConfig/G3RF52.ini similarity index 100% rename from Data/User/GameConfig/G3RF52.ini rename to Data/Sys/GameConfig/G3RF52.ini diff --git a/Data/User/GameConfig/G3RP52.ini b/Data/Sys/GameConfig/G3RP52.ini similarity index 100% rename from Data/User/GameConfig/G3RP52.ini rename to Data/Sys/GameConfig/G3RP52.ini diff --git a/Data/User/GameConfig/G3SE41.ini b/Data/Sys/GameConfig/G3SE41.ini similarity index 100% rename from Data/User/GameConfig/G3SE41.ini rename to Data/Sys/GameConfig/G3SE41.ini diff --git a/Data/User/GameConfig/G3VE69.ini b/Data/Sys/GameConfig/G3VE69.ini similarity index 100% rename from Data/User/GameConfig/G3VE69.ini rename to Data/Sys/GameConfig/G3VE69.ini diff --git a/Data/User/GameConfig/G3XE52.ini b/Data/Sys/GameConfig/G3XE52.ini similarity index 100% rename from Data/User/GameConfig/G3XE52.ini rename to Data/Sys/GameConfig/G3XE52.ini diff --git a/Data/User/GameConfig/G3XP52.ini b/Data/Sys/GameConfig/G3XP52.ini similarity index 100% rename from Data/User/GameConfig/G3XP52.ini rename to Data/Sys/GameConfig/G3XP52.ini diff --git a/Data/User/GameConfig/G4AEE9.ini b/Data/Sys/GameConfig/G4AEE9.ini similarity index 100% rename from Data/User/GameConfig/G4AEE9.ini rename to Data/Sys/GameConfig/G4AEE9.ini diff --git a/Data/User/GameConfig/G4BE08.ini b/Data/Sys/GameConfig/G4BE08.ini similarity index 100% rename from Data/User/GameConfig/G4BE08.ini rename to Data/Sys/GameConfig/G4BE08.ini diff --git a/Data/User/GameConfig/G4BP08.ini b/Data/Sys/GameConfig/G4BP08.ini similarity index 100% rename from Data/User/GameConfig/G4BP08.ini rename to Data/Sys/GameConfig/G4BP08.ini diff --git a/Data/User/GameConfig/G4CE54.ini b/Data/Sys/GameConfig/G4CE54.ini similarity index 100% rename from Data/User/GameConfig/G4CE54.ini rename to Data/Sys/GameConfig/G4CE54.ini diff --git a/Data/User/GameConfig/G4FD69.ini b/Data/Sys/GameConfig/G4FD69.ini similarity index 100% rename from Data/User/GameConfig/G4FD69.ini rename to Data/Sys/GameConfig/G4FD69.ini diff --git a/Data/User/GameConfig/G4FE69.ini b/Data/Sys/GameConfig/G4FE69.ini similarity index 100% rename from Data/User/GameConfig/G4FE69.ini rename to Data/Sys/GameConfig/G4FE69.ini diff --git a/Data/User/GameConfig/G4FF69.ini b/Data/Sys/GameConfig/G4FF69.ini similarity index 100% rename from Data/User/GameConfig/G4FF69.ini rename to Data/Sys/GameConfig/G4FF69.ini diff --git a/Data/User/GameConfig/G4FP69.ini b/Data/Sys/GameConfig/G4FP69.ini similarity index 100% rename from Data/User/GameConfig/G4FP69.ini rename to Data/Sys/GameConfig/G4FP69.ini diff --git a/Data/User/GameConfig/G4GEE9.ini b/Data/Sys/GameConfig/G4GEE9.ini similarity index 100% rename from Data/User/GameConfig/G4GEE9.ini rename to Data/Sys/GameConfig/G4GEE9.ini diff --git a/Data/User/GameConfig/G4ME69.ini b/Data/Sys/GameConfig/G4ME69.ini similarity index 100% rename from Data/User/GameConfig/G4ME69.ini rename to Data/Sys/GameConfig/G4ME69.ini diff --git a/Data/User/GameConfig/G4MP69.ini b/Data/Sys/GameConfig/G4MP69.ini similarity index 100% rename from Data/User/GameConfig/G4MP69.ini rename to Data/Sys/GameConfig/G4MP69.ini diff --git a/Data/User/GameConfig/G4NJDA.ini b/Data/Sys/GameConfig/G4NJDA.ini similarity index 100% rename from Data/User/GameConfig/G4NJDA.ini rename to Data/Sys/GameConfig/G4NJDA.ini diff --git a/Data/User/GameConfig/G4QE01.ini b/Data/Sys/GameConfig/G4QE01.ini similarity index 100% rename from Data/User/GameConfig/G4QE01.ini rename to Data/Sys/GameConfig/G4QE01.ini diff --git a/Data/User/GameConfig/G4QP01.ini b/Data/Sys/GameConfig/G4QP01.ini similarity index 100% rename from Data/User/GameConfig/G4QP01.ini rename to Data/Sys/GameConfig/G4QP01.ini diff --git a/Data/User/GameConfig/G4SE01.ini b/Data/Sys/GameConfig/G4SE01.ini similarity index 100% rename from Data/User/GameConfig/G4SE01.ini rename to Data/Sys/GameConfig/G4SE01.ini diff --git a/Data/User/GameConfig/G4SP01.ini b/Data/Sys/GameConfig/G4SP01.ini similarity index 100% rename from Data/User/GameConfig/G4SP01.ini rename to Data/Sys/GameConfig/G4SP01.ini diff --git a/Data/User/GameConfig/G4ZE69.ini b/Data/Sys/GameConfig/G4ZE69.ini similarity index 100% rename from Data/User/GameConfig/G4ZE69.ini rename to Data/Sys/GameConfig/G4ZE69.ini diff --git a/Data/User/GameConfig/G5DE78.ini b/Data/Sys/GameConfig/G5DE78.ini similarity index 100% rename from Data/User/GameConfig/G5DE78.ini rename to Data/Sys/GameConfig/G5DE78.ini diff --git a/Data/User/GameConfig/G5DP78.ini b/Data/Sys/GameConfig/G5DP78.ini similarity index 100% rename from Data/User/GameConfig/G5DP78.ini rename to Data/Sys/GameConfig/G5DP78.ini diff --git a/Data/User/GameConfig/G5SE7D.ini b/Data/Sys/GameConfig/G5SE7D.ini similarity index 100% rename from Data/User/GameConfig/G5SE7D.ini rename to Data/Sys/GameConfig/G5SE7D.ini diff --git a/Data/User/GameConfig/G5SP7D.ini b/Data/Sys/GameConfig/G5SP7D.ini similarity index 100% rename from Data/User/GameConfig/G5SP7D.ini rename to Data/Sys/GameConfig/G5SP7D.ini diff --git a/Data/User/GameConfig/G63E41.ini b/Data/Sys/GameConfig/G63E41.ini similarity index 100% rename from Data/User/GameConfig/G63E41.ini rename to Data/Sys/GameConfig/G63E41.ini diff --git a/Data/User/GameConfig/G63P41.ini b/Data/Sys/GameConfig/G63P41.ini similarity index 100% rename from Data/User/GameConfig/G63P41.ini rename to Data/Sys/GameConfig/G63P41.ini diff --git a/Data/User/GameConfig/G6FE69.ini b/Data/Sys/GameConfig/G6FE69.ini similarity index 100% rename from Data/User/GameConfig/G6FE69.ini rename to Data/Sys/GameConfig/G6FE69.ini diff --git a/Data/User/GameConfig/G6NE69.ini b/Data/Sys/GameConfig/G6NE69.ini similarity index 100% rename from Data/User/GameConfig/G6NE69.ini rename to Data/Sys/GameConfig/G6NE69.ini diff --git a/Data/User/GameConfig/G6NP69.ini b/Data/Sys/GameConfig/G6NP69.ini similarity index 100% rename from Data/User/GameConfig/G6NP69.ini rename to Data/Sys/GameConfig/G6NP69.ini diff --git a/Data/User/GameConfig/G6QE08.ini b/Data/Sys/GameConfig/G6QE08.ini similarity index 100% rename from Data/User/GameConfig/G6QE08.ini rename to Data/Sys/GameConfig/G6QE08.ini diff --git a/Data/User/GameConfig/G6TE5G.ini b/Data/Sys/GameConfig/G6TE5G.ini similarity index 100% rename from Data/User/GameConfig/G6TE5G.ini rename to Data/Sys/GameConfig/G6TE5G.ini diff --git a/Data/User/GameConfig/G6TP5G.ini b/Data/Sys/GameConfig/G6TP5G.ini similarity index 100% rename from Data/User/GameConfig/G6TP5G.ini rename to Data/Sys/GameConfig/G6TP5G.ini diff --git a/Data/User/GameConfig/G89EAF.ini b/Data/Sys/GameConfig/G89EAF.ini similarity index 100% rename from Data/User/GameConfig/G89EAF.ini rename to Data/Sys/GameConfig/G89EAF.ini diff --git a/Data/User/GameConfig/G8FE8P.ini b/Data/Sys/GameConfig/G8FE8P.ini similarity index 100% rename from Data/User/GameConfig/G8FE8P.ini rename to Data/Sys/GameConfig/G8FE8P.ini diff --git a/Data/User/GameConfig/G8ME01.ini b/Data/Sys/GameConfig/G8ME01.ini similarity index 100% rename from Data/User/GameConfig/G8ME01.ini rename to Data/Sys/GameConfig/G8ME01.ini diff --git a/Data/User/GameConfig/G8MJ01.ini b/Data/Sys/GameConfig/G8MJ01.ini similarity index 100% rename from Data/User/GameConfig/G8MJ01.ini rename to Data/Sys/GameConfig/G8MJ01.ini diff --git a/Data/User/GameConfig/G8MP01.ini b/Data/Sys/GameConfig/G8MP01.ini similarity index 100% rename from Data/User/GameConfig/G8MP01.ini rename to Data/Sys/GameConfig/G8MP01.ini diff --git a/Data/User/GameConfig/G8OJ18.ini b/Data/Sys/GameConfig/G8OJ18.ini similarity index 100% rename from Data/User/GameConfig/G8OJ18.ini rename to Data/Sys/GameConfig/G8OJ18.ini diff --git a/Data/User/GameConfig/G8SJAF.ini b/Data/Sys/GameConfig/G8SJAF.ini similarity index 100% rename from Data/User/GameConfig/G8SJAF.ini rename to Data/Sys/GameConfig/G8SJAF.ini diff --git a/Data/User/GameConfig/G8WE01.ini b/Data/Sys/GameConfig/G8WE01.ini similarity index 100% rename from Data/User/GameConfig/G8WE01.ini rename to Data/Sys/GameConfig/G8WE01.ini diff --git a/Data/User/GameConfig/G8WP01.ini b/Data/Sys/GameConfig/G8WP01.ini similarity index 100% rename from Data/User/GameConfig/G8WP01.ini rename to Data/Sys/GameConfig/G8WP01.ini diff --git a/Data/User/GameConfig/G9BEE9.ini b/Data/Sys/GameConfig/G9BEE9.ini similarity index 100% rename from Data/User/GameConfig/G9BEE9.ini rename to Data/Sys/GameConfig/G9BEE9.ini diff --git a/Data/User/GameConfig/G9RE7D.ini b/Data/Sys/GameConfig/G9RE7D.ini similarity index 100% rename from Data/User/GameConfig/G9RE7D.ini rename to Data/Sys/GameConfig/G9RE7D.ini diff --git a/Data/User/GameConfig/G9SE8P.ini b/Data/Sys/GameConfig/G9SE8P.ini similarity index 100% rename from Data/User/GameConfig/G9SE8P.ini rename to Data/Sys/GameConfig/G9SE8P.ini diff --git a/Data/User/GameConfig/G9SJ8P.ini b/Data/Sys/GameConfig/G9SJ8P.ini similarity index 100% rename from Data/User/GameConfig/G9SJ8P.ini rename to Data/Sys/GameConfig/G9SJ8P.ini diff --git a/Data/User/GameConfig/G9SP8P.ini b/Data/Sys/GameConfig/G9SP8P.ini similarity index 100% rename from Data/User/GameConfig/G9SP8P.ini rename to Data/Sys/GameConfig/G9SP8P.ini diff --git a/Data/User/GameConfig/G9TD52.ini b/Data/Sys/GameConfig/G9TD52.ini similarity index 100% rename from Data/User/GameConfig/G9TD52.ini rename to Data/Sys/GameConfig/G9TD52.ini diff --git a/Data/User/GameConfig/G9TE52.ini b/Data/Sys/GameConfig/G9TE52.ini similarity index 100% rename from Data/User/GameConfig/G9TE52.ini rename to Data/Sys/GameConfig/G9TE52.ini diff --git a/Data/User/GameConfig/G9TF52.ini b/Data/Sys/GameConfig/G9TF52.ini similarity index 100% rename from Data/User/GameConfig/G9TF52.ini rename to Data/Sys/GameConfig/G9TF52.ini diff --git a/Data/User/GameConfig/G9TI52.ini b/Data/Sys/GameConfig/G9TI52.ini similarity index 100% rename from Data/User/GameConfig/G9TI52.ini rename to Data/Sys/GameConfig/G9TI52.ini diff --git a/Data/User/GameConfig/G9TP52.ini b/Data/Sys/GameConfig/G9TP52.ini similarity index 100% rename from Data/User/GameConfig/G9TP52.ini rename to Data/Sys/GameConfig/G9TP52.ini diff --git a/Data/User/GameConfig/GA2E51.ini b/Data/Sys/GameConfig/GA2E51.ini similarity index 100% rename from Data/User/GameConfig/GA2E51.ini rename to Data/Sys/GameConfig/GA2E51.ini diff --git a/Data/User/GameConfig/GA3E51.ini b/Data/Sys/GameConfig/GA3E51.ini similarity index 100% rename from Data/User/GameConfig/GA3E51.ini rename to Data/Sys/GameConfig/GA3E51.ini diff --git a/Data/User/GameConfig/GA4E51.ini b/Data/Sys/GameConfig/GA4E51.ini similarity index 100% rename from Data/User/GameConfig/GA4E51.ini rename to Data/Sys/GameConfig/GA4E51.ini diff --git a/Data/User/GameConfig/GA7E70.ini b/Data/Sys/GameConfig/GA7E70.ini similarity index 100% rename from Data/User/GameConfig/GA7E70.ini rename to Data/Sys/GameConfig/GA7E70.ini diff --git a/Data/User/GameConfig/GABEAF.ini b/Data/Sys/GameConfig/GABEAF.ini similarity index 100% rename from Data/User/GameConfig/GABEAF.ini rename to Data/Sys/GameConfig/GABEAF.ini diff --git a/Data/User/GameConfig/GACE5H.ini b/Data/Sys/GameConfig/GACE5H.ini similarity index 100% rename from Data/User/GameConfig/GACE5H.ini rename to Data/Sys/GameConfig/GACE5H.ini diff --git a/Data/User/GameConfig/GAFE01.ini b/Data/Sys/GameConfig/GAFE01.ini similarity index 100% rename from Data/User/GameConfig/GAFE01.ini rename to Data/Sys/GameConfig/GAFE01.ini diff --git a/Data/User/GameConfig/GAFJ01.ini b/Data/Sys/GameConfig/GAFJ01.ini similarity index 100% rename from Data/User/GameConfig/GAFJ01.ini rename to Data/Sys/GameConfig/GAFJ01.ini diff --git a/Data/User/GameConfig/GAFP01.ini b/Data/Sys/GameConfig/GAFP01.ini similarity index 100% rename from Data/User/GameConfig/GAFP01.ini rename to Data/Sys/GameConfig/GAFP01.ini diff --git a/Data/User/GameConfig/GAFU01.ini b/Data/Sys/GameConfig/GAFU01.ini similarity index 100% rename from Data/User/GameConfig/GAFU01.ini rename to Data/Sys/GameConfig/GAFU01.ini diff --git a/Data/User/GameConfig/GAGP70.ini b/Data/Sys/GameConfig/GAGP70.ini similarity index 100% rename from Data/User/GameConfig/GAGP70.ini rename to Data/Sys/GameConfig/GAGP70.ini diff --git a/Data/User/GameConfig/GAHEGG.ini b/Data/Sys/GameConfig/GAHEGG.ini similarity index 100% rename from Data/User/GameConfig/GAHEGG.ini rename to Data/Sys/GameConfig/GAHEGG.ini diff --git a/Data/User/GameConfig/GALE01.ini b/Data/Sys/GameConfig/GALE01.ini similarity index 100% rename from Data/User/GameConfig/GALE01.ini rename to Data/Sys/GameConfig/GALE01.ini diff --git a/Data/User/GameConfig/GALJ01.ini b/Data/Sys/GameConfig/GALJ01.ini similarity index 100% rename from Data/User/GameConfig/GALJ01.ini rename to Data/Sys/GameConfig/GALJ01.ini diff --git a/Data/User/GameConfig/GALP01.ini b/Data/Sys/GameConfig/GALP01.ini similarity index 100% rename from Data/User/GameConfig/GALP01.ini rename to Data/Sys/GameConfig/GALP01.ini diff --git a/Data/User/GameConfig/GAME5H.ini b/Data/Sys/GameConfig/GAME5H.ini similarity index 100% rename from Data/User/GameConfig/GAME5H.ini rename to Data/Sys/GameConfig/GAME5H.ini diff --git a/Data/User/GameConfig/GANE7U.ini b/Data/Sys/GameConfig/GANE7U.ini similarity index 100% rename from Data/User/GameConfig/GANE7U.ini rename to Data/Sys/GameConfig/GANE7U.ini diff --git a/Data/User/GameConfig/GAPE52.ini b/Data/Sys/GameConfig/GAPE52.ini similarity index 100% rename from Data/User/GameConfig/GAPE52.ini rename to Data/Sys/GameConfig/GAPE52.ini diff --git a/Data/User/GameConfig/GAQE6S.ini b/Data/Sys/GameConfig/GAQE6S.ini similarity index 100% rename from Data/User/GameConfig/GAQE6S.ini rename to Data/Sys/GameConfig/GAQE6S.ini diff --git a/Data/User/GameConfig/GARE5H.ini b/Data/Sys/GameConfig/GARE5H.ini similarity index 100% rename from Data/User/GameConfig/GARE5H.ini rename to Data/Sys/GameConfig/GARE5H.ini diff --git a/Data/User/GameConfig/GATE51.ini b/Data/Sys/GameConfig/GATE51.ini similarity index 100% rename from Data/User/GameConfig/GATE51.ini rename to Data/Sys/GameConfig/GATE51.ini diff --git a/Data/User/GameConfig/GATP51.ini b/Data/Sys/GameConfig/GATP51.ini similarity index 100% rename from Data/User/GameConfig/GATP51.ini rename to Data/Sys/GameConfig/GATP51.ini diff --git a/Data/User/GameConfig/GAUE08.ini b/Data/Sys/GameConfig/GAUE08.ini similarity index 100% rename from Data/User/GameConfig/GAUE08.ini rename to Data/Sys/GameConfig/GAUE08.ini diff --git a/Data/User/GameConfig/GAUJ08.ini b/Data/Sys/GameConfig/GAUJ08.ini similarity index 100% rename from Data/User/GameConfig/GAUJ08.ini rename to Data/Sys/GameConfig/GAUJ08.ini diff --git a/Data/User/GameConfig/GAVE78.ini b/Data/Sys/GameConfig/GAVE78.ini similarity index 100% rename from Data/User/GameConfig/GAVE78.ini rename to Data/Sys/GameConfig/GAVE78.ini diff --git a/Data/User/GameConfig/GAVP78.ini b/Data/Sys/GameConfig/GAVP78.ini similarity index 100% rename from Data/User/GameConfig/GAVP78.ini rename to Data/Sys/GameConfig/GAVP78.ini diff --git a/Data/User/GameConfig/GAVY78.ini b/Data/Sys/GameConfig/GAVY78.ini similarity index 100% rename from Data/User/GameConfig/GAVY78.ini rename to Data/Sys/GameConfig/GAVY78.ini diff --git a/Data/User/GameConfig/GAXE5D.ini b/Data/Sys/GameConfig/GAXE5D.ini similarity index 100% rename from Data/User/GameConfig/GAXE5D.ini rename to Data/Sys/GameConfig/GAXE5D.ini diff --git a/Data/User/GameConfig/GAZD69.ini b/Data/Sys/GameConfig/GAZD69.ini similarity index 100% rename from Data/User/GameConfig/GAZD69.ini rename to Data/Sys/GameConfig/GAZD69.ini diff --git a/Data/User/GameConfig/GAZE69.ini b/Data/Sys/GameConfig/GAZE69.ini similarity index 100% rename from Data/User/GameConfig/GAZE69.ini rename to Data/Sys/GameConfig/GAZE69.ini diff --git a/Data/User/GameConfig/GAZF69.ini b/Data/Sys/GameConfig/GAZF69.ini similarity index 100% rename from Data/User/GameConfig/GAZF69.ini rename to Data/Sys/GameConfig/GAZF69.ini diff --git a/Data/User/GameConfig/GAZH69.ini b/Data/Sys/GameConfig/GAZH69.ini similarity index 100% rename from Data/User/GameConfig/GAZH69.ini rename to Data/Sys/GameConfig/GAZH69.ini diff --git a/Data/User/GameConfig/GAZI69.ini b/Data/Sys/GameConfig/GAZI69.ini similarity index 100% rename from Data/User/GameConfig/GAZI69.ini rename to Data/Sys/GameConfig/GAZI69.ini diff --git a/Data/User/GameConfig/GAZJ69.ini b/Data/Sys/GameConfig/GAZJ69.ini similarity index 100% rename from Data/User/GameConfig/GAZJ69.ini rename to Data/Sys/GameConfig/GAZJ69.ini diff --git a/Data/User/GameConfig/GAZM69.ini b/Data/Sys/GameConfig/GAZM69.ini similarity index 100% rename from Data/User/GameConfig/GAZM69.ini rename to Data/Sys/GameConfig/GAZM69.ini diff --git a/Data/User/GameConfig/GAZP69.ini b/Data/Sys/GameConfig/GAZP69.ini similarity index 100% rename from Data/User/GameConfig/GAZP69.ini rename to Data/Sys/GameConfig/GAZP69.ini diff --git a/Data/User/GameConfig/GAZS69.ini b/Data/Sys/GameConfig/GAZS69.ini similarity index 100% rename from Data/User/GameConfig/GAZS69.ini rename to Data/Sys/GameConfig/GAZS69.ini diff --git a/Data/User/GameConfig/GB3E51.ini b/Data/Sys/GameConfig/GB3E51.ini similarity index 100% rename from Data/User/GameConfig/GB3E51.ini rename to Data/Sys/GameConfig/GB3E51.ini diff --git a/Data/User/GameConfig/GB4E51.ini b/Data/Sys/GameConfig/GB4E51.ini similarity index 100% rename from Data/User/GameConfig/GB4E51.ini rename to Data/Sys/GameConfig/GB4E51.ini diff --git a/Data/User/GameConfig/GB4P51.ini b/Data/Sys/GameConfig/GB4P51.ini similarity index 100% rename from Data/User/GameConfig/GB4P51.ini rename to Data/Sys/GameConfig/GB4P51.ini diff --git a/Data/User/GameConfig/GBDE5G.ini b/Data/Sys/GameConfig/GBDE5G.ini similarity index 100% rename from Data/User/GameConfig/GBDE5G.ini rename to Data/Sys/GameConfig/GBDE5G.ini diff --git a/Data/User/GameConfig/GBDS7D.ini b/Data/Sys/GameConfig/GBDS7D.ini similarity index 100% rename from Data/User/GameConfig/GBDS7D.ini rename to Data/Sys/GameConfig/GBDS7D.ini diff --git a/Data/User/GameConfig/GBFE70.ini b/Data/Sys/GameConfig/GBFE70.ini similarity index 100% rename from Data/User/GameConfig/GBFE70.ini rename to Data/Sys/GameConfig/GBFE70.ini diff --git a/Data/User/GameConfig/GBGE5G.ini b/Data/Sys/GameConfig/GBGE5G.ini similarity index 100% rename from Data/User/GameConfig/GBGE5G.ini rename to Data/Sys/GameConfig/GBGE5G.ini diff --git a/Data/User/GameConfig/GBGP7D.ini b/Data/Sys/GameConfig/GBGP7D.ini similarity index 100% rename from Data/User/GameConfig/GBGP7D.ini rename to Data/Sys/GameConfig/GBGP7D.ini diff --git a/Data/User/GameConfig/GBHDC8.ini b/Data/Sys/GameConfig/GBHDC8.ini similarity index 100% rename from Data/User/GameConfig/GBHDC8.ini rename to Data/Sys/GameConfig/GBHDC8.ini diff --git a/Data/User/GameConfig/GBHEC8.ini b/Data/Sys/GameConfig/GBHEC8.ini similarity index 100% rename from Data/User/GameConfig/GBHEC8.ini rename to Data/Sys/GameConfig/GBHEC8.ini diff --git a/Data/User/GameConfig/GBHFC8.ini b/Data/Sys/GameConfig/GBHFC8.ini similarity index 100% rename from Data/User/GameConfig/GBHFC8.ini rename to Data/Sys/GameConfig/GBHFC8.ini diff --git a/Data/User/GameConfig/GBHPC8.ini b/Data/Sys/GameConfig/GBHPC8.ini similarity index 100% rename from Data/User/GameConfig/GBHPC8.ini rename to Data/Sys/GameConfig/GBHPC8.ini diff --git a/Data/User/GameConfig/GBIE08.ini b/Data/Sys/GameConfig/GBIE08.ini similarity index 100% rename from Data/User/GameConfig/GBIE08.ini rename to Data/Sys/GameConfig/GBIE08.ini diff --git a/Data/User/GameConfig/GBIP08.ini b/Data/Sys/GameConfig/GBIP08.ini similarity index 100% rename from Data/User/GameConfig/GBIP08.ini rename to Data/Sys/GameConfig/GBIP08.ini diff --git a/Data/User/GameConfig/GBKE70.ini b/Data/Sys/GameConfig/GBKE70.ini similarity index 100% rename from Data/User/GameConfig/GBKE70.ini rename to Data/Sys/GameConfig/GBKE70.ini diff --git a/Data/User/GameConfig/GBLE52.ini b/Data/Sys/GameConfig/GBLE52.ini similarity index 100% rename from Data/User/GameConfig/GBLE52.ini rename to Data/Sys/GameConfig/GBLE52.ini diff --git a/Data/User/GameConfig/GBLP52.ini b/Data/Sys/GameConfig/GBLP52.ini similarity index 100% rename from Data/User/GameConfig/GBLP52.ini rename to Data/Sys/GameConfig/GBLP52.ini diff --git a/Data/User/GameConfig/GBLPGL.ini b/Data/Sys/GameConfig/GBLPGL.ini similarity index 100% rename from Data/User/GameConfig/GBLPGL.ini rename to Data/Sys/GameConfig/GBLPGL.ini diff --git a/Data/User/GameConfig/GBME7F.ini b/Data/Sys/GameConfig/GBME7F.ini similarity index 100% rename from Data/User/GameConfig/GBME7F.ini rename to Data/Sys/GameConfig/GBME7F.ini diff --git a/Data/User/GameConfig/GBMP7F.ini b/Data/Sys/GameConfig/GBMP7F.ini similarity index 100% rename from Data/User/GameConfig/GBMP7F.ini rename to Data/Sys/GameConfig/GBMP7F.ini diff --git a/Data/User/GameConfig/GBOP51.ini b/Data/Sys/GameConfig/GBOP51.ini similarity index 100% rename from Data/User/GameConfig/GBOP51.ini rename to Data/Sys/GameConfig/GBOP51.ini diff --git a/Data/User/GameConfig/GBQE78.ini b/Data/Sys/GameConfig/GBQE78.ini similarity index 100% rename from Data/User/GameConfig/GBQE78.ini rename to Data/Sys/GameConfig/GBQE78.ini diff --git a/Data/User/GameConfig/GBSE8P.ini b/Data/Sys/GameConfig/GBSE8P.ini similarity index 100% rename from Data/User/GameConfig/GBSE8P.ini rename to Data/Sys/GameConfig/GBSE8P.ini diff --git a/Data/User/GameConfig/GBSP8P.ini b/Data/Sys/GameConfig/GBSP8P.ini similarity index 100% rename from Data/User/GameConfig/GBSP8P.ini rename to Data/Sys/GameConfig/GBSP8P.ini diff --git a/Data/User/GameConfig/GBTE70.ini b/Data/Sys/GameConfig/GBTE70.ini similarity index 100% rename from Data/User/GameConfig/GBTE70.ini rename to Data/Sys/GameConfig/GBTE70.ini diff --git a/Data/User/GameConfig/GBVE41.ini b/Data/Sys/GameConfig/GBVE41.ini similarity index 100% rename from Data/User/GameConfig/GBVE41.ini rename to Data/Sys/GameConfig/GBVE41.ini diff --git a/Data/User/GameConfig/GBVP41.ini b/Data/Sys/GameConfig/GBVP41.ini similarity index 100% rename from Data/User/GameConfig/GBVP41.ini rename to Data/Sys/GameConfig/GBVP41.ini diff --git a/Data/User/GameConfig/GBWD64.ini b/Data/Sys/GameConfig/GBWD64.ini similarity index 100% rename from Data/User/GameConfig/GBWD64.ini rename to Data/Sys/GameConfig/GBWD64.ini diff --git a/Data/User/GameConfig/GBWE64.ini b/Data/Sys/GameConfig/GBWE64.ini similarity index 100% rename from Data/User/GameConfig/GBWE64.ini rename to Data/Sys/GameConfig/GBWE64.ini diff --git a/Data/User/GameConfig/GBWF64.ini b/Data/Sys/GameConfig/GBWF64.ini similarity index 100% rename from Data/User/GameConfig/GBWF64.ini rename to Data/Sys/GameConfig/GBWF64.ini diff --git a/Data/User/GameConfig/GBWP64.ini b/Data/Sys/GameConfig/GBWP64.ini similarity index 100% rename from Data/User/GameConfig/GBWP64.ini rename to Data/Sys/GameConfig/GBWP64.ini diff --git a/Data/User/GameConfig/GBXE51.ini b/Data/Sys/GameConfig/GBXE51.ini similarity index 100% rename from Data/User/GameConfig/GBXE51.ini rename to Data/Sys/GameConfig/GBXE51.ini diff --git a/Data/User/GameConfig/GBYE0A.ini b/Data/Sys/GameConfig/GBYE0A.ini similarity index 100% rename from Data/User/GameConfig/GBYE0A.ini rename to Data/Sys/GameConfig/GBYE0A.ini diff --git a/Data/User/GameConfig/GBZE08.ini b/Data/Sys/GameConfig/GBZE08.ini similarity index 100% rename from Data/User/GameConfig/GBZE08.ini rename to Data/Sys/GameConfig/GBZE08.ini diff --git a/Data/User/GameConfig/GBZP08.ini b/Data/Sys/GameConfig/GBZP08.ini similarity index 100% rename from Data/User/GameConfig/GBZP08.ini rename to Data/Sys/GameConfig/GBZP08.ini diff --git a/Data/User/GameConfig/GC2E9G.ini b/Data/Sys/GameConfig/GC2E9G.ini similarity index 100% rename from Data/User/GameConfig/GC2E9G.ini rename to Data/Sys/GameConfig/GC2E9G.ini diff --git a/Data/User/GameConfig/GC3D78.ini b/Data/Sys/GameConfig/GC3D78.ini similarity index 100% rename from Data/User/GameConfig/GC3D78.ini rename to Data/Sys/GameConfig/GC3D78.ini diff --git a/Data/User/GameConfig/GC3E78.ini b/Data/Sys/GameConfig/GC3E78.ini similarity index 100% rename from Data/User/GameConfig/GC3E78.ini rename to Data/Sys/GameConfig/GC3E78.ini diff --git a/Data/User/GameConfig/GC3F78.ini b/Data/Sys/GameConfig/GC3F78.ini similarity index 100% rename from Data/User/GameConfig/GC3F78.ini rename to Data/Sys/GameConfig/GC3F78.ini diff --git a/Data/User/GameConfig/GC3P78.ini b/Data/Sys/GameConfig/GC3P78.ini similarity index 100% rename from Data/User/GameConfig/GC3P78.ini rename to Data/Sys/GameConfig/GC3P78.ini diff --git a/Data/User/GameConfig/GC4JBN.ini b/Data/Sys/GameConfig/GC4JBN.ini similarity index 100% rename from Data/User/GameConfig/GC4JBN.ini rename to Data/Sys/GameConfig/GC4JBN.ini diff --git a/Data/User/GameConfig/GC5PNK.ini b/Data/Sys/GameConfig/GC5PNK.ini similarity index 100% rename from Data/User/GameConfig/GC5PNK.ini rename to Data/Sys/GameConfig/GC5PNK.ini diff --git a/Data/User/GameConfig/GC6E01.ini b/Data/Sys/GameConfig/GC6E01.ini similarity index 100% rename from Data/User/GameConfig/GC6E01.ini rename to Data/Sys/GameConfig/GC6E01.ini diff --git a/Data/User/GameConfig/GC6P01.ini b/Data/Sys/GameConfig/GC6P01.ini similarity index 100% rename from Data/User/GameConfig/GC6P01.ini rename to Data/Sys/GameConfig/GC6P01.ini diff --git a/Data/User/GameConfig/GC7PNK.ini b/Data/Sys/GameConfig/GC7PNK.ini similarity index 100% rename from Data/User/GameConfig/GC7PNK.ini rename to Data/Sys/GameConfig/GC7PNK.ini diff --git a/Data/User/GameConfig/GC9P6S.ini b/Data/Sys/GameConfig/GC9P6S.ini similarity index 100% rename from Data/User/GameConfig/GC9P6S.ini rename to Data/Sys/GameConfig/GC9P6S.ini diff --git a/Data/User/GameConfig/GCAE5H.ini b/Data/Sys/GameConfig/GCAE5H.ini similarity index 100% rename from Data/User/GameConfig/GCAE5H.ini rename to Data/Sys/GameConfig/GCAE5H.ini diff --git a/Data/User/GameConfig/GCBE7D.ini b/Data/Sys/GameConfig/GCBE7D.ini similarity index 100% rename from Data/User/GameConfig/GCBE7D.ini rename to Data/Sys/GameConfig/GCBE7D.ini diff --git a/Data/User/GameConfig/GCBP7D.ini b/Data/Sys/GameConfig/GCBP7D.ini similarity index 100% rename from Data/User/GameConfig/GCBP7D.ini rename to Data/Sys/GameConfig/GCBP7D.ini diff --git a/Data/User/GameConfig/GCCE01.ini b/Data/Sys/GameConfig/GCCE01.ini similarity index 100% rename from Data/User/GameConfig/GCCE01.ini rename to Data/Sys/GameConfig/GCCE01.ini diff --git a/Data/User/GameConfig/GCCP01.ini b/Data/Sys/GameConfig/GCCP01.ini similarity index 100% rename from Data/User/GameConfig/GCCP01.ini rename to Data/Sys/GameConfig/GCCP01.ini diff --git a/Data/User/GameConfig/GCDE08.ini b/Data/Sys/GameConfig/GCDE08.ini similarity index 100% rename from Data/User/GameConfig/GCDE08.ini rename to Data/Sys/GameConfig/GCDE08.ini diff --git a/Data/User/GameConfig/GCDP08.ini b/Data/Sys/GameConfig/GCDP08.ini similarity index 100% rename from Data/User/GameConfig/GCDP08.ini rename to Data/Sys/GameConfig/GCDP08.ini diff --git a/Data/User/GameConfig/GCEE41.ini b/Data/Sys/GameConfig/GCEE41.ini similarity index 100% rename from Data/User/GameConfig/GCEE41.ini rename to Data/Sys/GameConfig/GCEE41.ini diff --git a/Data/User/GameConfig/GCEP41.ini b/Data/Sys/GameConfig/GCEP41.ini similarity index 100% rename from Data/User/GameConfig/GCEP41.ini rename to Data/Sys/GameConfig/GCEP41.ini diff --git a/Data/User/GameConfig/GCFE9G.ini b/Data/Sys/GameConfig/GCFE9G.ini similarity index 100% rename from Data/User/GameConfig/GCFE9G.ini rename to Data/Sys/GameConfig/GCFE9G.ini diff --git a/Data/User/GameConfig/GCGE41.ini b/Data/Sys/GameConfig/GCGE41.ini similarity index 100% rename from Data/User/GameConfig/GCGE41.ini rename to Data/Sys/GameConfig/GCGE41.ini diff --git a/Data/User/GameConfig/GCHE78.ini b/Data/Sys/GameConfig/GCHE78.ini similarity index 100% rename from Data/User/GameConfig/GCHE78.ini rename to Data/Sys/GameConfig/GCHE78.ini diff --git a/Data/User/GameConfig/GCJE41.ini b/Data/Sys/GameConfig/GCJE41.ini similarity index 100% rename from Data/User/GameConfig/GCJE41.ini rename to Data/Sys/GameConfig/GCJE41.ini diff --git a/Data/User/GameConfig/GCJP41.ini b/Data/Sys/GameConfig/GCJP41.ini similarity index 100% rename from Data/User/GameConfig/GCJP41.ini rename to Data/Sys/GameConfig/GCJP41.ini diff --git a/Data/User/GameConfig/GCLP69.ini b/Data/Sys/GameConfig/GCLP69.ini similarity index 100% rename from Data/User/GameConfig/GCLP69.ini rename to Data/Sys/GameConfig/GCLP69.ini diff --git a/Data/User/GameConfig/GCNE7D.ini b/Data/Sys/GameConfig/GCNE7D.ini similarity index 100% rename from Data/User/GameConfig/GCNE7D.ini rename to Data/Sys/GameConfig/GCNE7D.ini diff --git a/Data/User/GameConfig/GCNP7D.ini b/Data/Sys/GameConfig/GCNP7D.ini similarity index 100% rename from Data/User/GameConfig/GCNP7D.ini rename to Data/Sys/GameConfig/GCNP7D.ini diff --git a/Data/User/GameConfig/GCOE52.ini b/Data/Sys/GameConfig/GCOE52.ini similarity index 100% rename from Data/User/GameConfig/GCOE52.ini rename to Data/Sys/GameConfig/GCOE52.ini diff --git a/Data/User/GameConfig/GCOPDV.ini b/Data/Sys/GameConfig/GCOPDV.ini similarity index 100% rename from Data/User/GameConfig/GCOPDV.ini rename to Data/Sys/GameConfig/GCOPDV.ini diff --git a/Data/User/GameConfig/GCPE6S.ini b/Data/Sys/GameConfig/GCPE6S.ini similarity index 100% rename from Data/User/GameConfig/GCPE6S.ini rename to Data/Sys/GameConfig/GCPE6S.ini diff --git a/Data/User/GameConfig/GCPP6S.ini b/Data/Sys/GameConfig/GCPP6S.ini similarity index 100% rename from Data/User/GameConfig/GCPP6S.ini rename to Data/Sys/GameConfig/GCPP6S.ini diff --git a/Data/User/GameConfig/GCQE7D.ini b/Data/Sys/GameConfig/GCQE7D.ini similarity index 100% rename from Data/User/GameConfig/GCQE7D.ini rename to Data/Sys/GameConfig/GCQE7D.ini diff --git a/Data/User/GameConfig/GCQP7D.ini b/Data/Sys/GameConfig/GCQP7D.ini similarity index 100% rename from Data/User/GameConfig/GCQP7D.ini rename to Data/Sys/GameConfig/GCQP7D.ini diff --git a/Data/User/GameConfig/GCSEAF.ini b/Data/Sys/GameConfig/GCSEAF.ini similarity index 100% rename from Data/User/GameConfig/GCSEAF.ini rename to Data/Sys/GameConfig/GCSEAF.ini diff --git a/Data/User/GameConfig/GCTE51.ini b/Data/Sys/GameConfig/GCTE51.ini similarity index 100% rename from Data/User/GameConfig/GCTE51.ini rename to Data/Sys/GameConfig/GCTE51.ini diff --git a/Data/User/GameConfig/GCTP51.ini b/Data/Sys/GameConfig/GCTP51.ini similarity index 100% rename from Data/User/GameConfig/GCTP51.ini rename to Data/Sys/GameConfig/GCTP51.ini diff --git a/Data/User/GameConfig/GCVEEB.ini b/Data/Sys/GameConfig/GCVEEB.ini similarity index 100% rename from Data/User/GameConfig/GCVEEB.ini rename to Data/Sys/GameConfig/GCVEEB.ini diff --git a/Data/User/GameConfig/GCZE69.ini b/Data/Sys/GameConfig/GCZE69.ini similarity index 100% rename from Data/User/GameConfig/GCZE69.ini rename to Data/Sys/GameConfig/GCZE69.ini diff --git a/Data/User/GameConfig/GCZP69.ini b/Data/Sys/GameConfig/GCZP69.ini similarity index 100% rename from Data/User/GameConfig/GCZP69.ini rename to Data/Sys/GameConfig/GCZP69.ini diff --git a/Data/User/GameConfig/GD4E6S.ini b/Data/Sys/GameConfig/GD4E6S.ini similarity index 100% rename from Data/User/GameConfig/GD4E6S.ini rename to Data/Sys/GameConfig/GD4E6S.ini diff --git a/Data/User/GameConfig/GD6EB2.ini b/Data/Sys/GameConfig/GD6EB2.ini similarity index 100% rename from Data/User/GameConfig/GD6EB2.ini rename to Data/Sys/GameConfig/GD6EB2.ini diff --git a/Data/User/GameConfig/GD6P70.ini b/Data/Sys/GameConfig/GD6P70.ini similarity index 100% rename from Data/User/GameConfig/GD6P70.ini rename to Data/Sys/GameConfig/GD6P70.ini diff --git a/Data/User/GameConfig/GD7PB2.ini b/Data/Sys/GameConfig/GD7PB2.ini similarity index 100% rename from Data/User/GameConfig/GD7PB2.ini rename to Data/Sys/GameConfig/GD7PB2.ini diff --git a/Data/User/GameConfig/GD9E69.ini b/Data/Sys/GameConfig/GD9E69.ini similarity index 100% rename from Data/User/GameConfig/GD9E69.ini rename to Data/Sys/GameConfig/GD9E69.ini diff --git a/Data/User/GameConfig/GD9P69.ini b/Data/Sys/GameConfig/GD9P69.ini similarity index 100% rename from Data/User/GameConfig/GD9P69.ini rename to Data/Sys/GameConfig/GD9P69.ini diff --git a/Data/User/GameConfig/GDDE41.ini b/Data/Sys/GameConfig/GDDE41.ini similarity index 100% rename from Data/User/GameConfig/GDDE41.ini rename to Data/Sys/GameConfig/GDDE41.ini diff --git a/Data/User/GameConfig/GDEE71.ini b/Data/Sys/GameConfig/GDEE71.ini similarity index 100% rename from Data/User/GameConfig/GDEE71.ini rename to Data/Sys/GameConfig/GDEE71.ini diff --git a/Data/User/GameConfig/GDFE5D.ini b/Data/Sys/GameConfig/GDFE5D.ini similarity index 100% rename from Data/User/GameConfig/GDFE5D.ini rename to Data/Sys/GameConfig/GDFE5D.ini diff --git a/Data/User/GameConfig/GDFP5D.ini b/Data/Sys/GameConfig/GDFP5D.ini similarity index 100% rename from Data/User/GameConfig/GDFP5D.ini rename to Data/Sys/GameConfig/GDFP5D.ini diff --git a/Data/User/GameConfig/GDGE7H.ini b/Data/Sys/GameConfig/GDGE7H.ini similarity index 100% rename from Data/User/GameConfig/GDGE7H.ini rename to Data/Sys/GameConfig/GDGE7H.ini diff --git a/Data/User/GameConfig/GDGP78.ini b/Data/Sys/GameConfig/GDGP78.ini similarity index 100% rename from Data/User/GameConfig/GDGP78.ini rename to Data/Sys/GameConfig/GDGP78.ini diff --git a/Data/User/GameConfig/GDIE7D.ini b/Data/Sys/GameConfig/GDIE7D.ini similarity index 100% rename from Data/User/GameConfig/GDIE7D.ini rename to Data/Sys/GameConfig/GDIE7D.ini diff --git a/Data/User/GameConfig/GDIP7D.ini b/Data/Sys/GameConfig/GDIP7D.ini similarity index 100% rename from Data/User/GameConfig/GDIP7D.ini rename to Data/Sys/GameConfig/GDIP7D.ini diff --git a/Data/User/GameConfig/GDJEB2.ini b/Data/Sys/GameConfig/GDJEB2.ini similarity index 100% rename from Data/User/GameConfig/GDJEB2.ini rename to Data/Sys/GameConfig/GDJEB2.ini diff --git a/Data/User/GameConfig/GDKEA4.ini b/Data/Sys/GameConfig/GDKEA4.ini similarity index 100% rename from Data/User/GameConfig/GDKEA4.ini rename to Data/Sys/GameConfig/GDKEA4.ini diff --git a/Data/User/GameConfig/GDLEA4.ini b/Data/Sys/GameConfig/GDLEA4.ini similarity index 100% rename from Data/User/GameConfig/GDLEA4.ini rename to Data/Sys/GameConfig/GDLEA4.ini diff --git a/Data/User/GameConfig/GDME01.ini b/Data/Sys/GameConfig/GDME01.ini similarity index 100% rename from Data/User/GameConfig/GDME01.ini rename to Data/Sys/GameConfig/GDME01.ini diff --git a/Data/User/GameConfig/GDQP6S.ini b/Data/Sys/GameConfig/GDQP6S.ini similarity index 100% rename from Data/User/GameConfig/GDQP6S.ini rename to Data/Sys/GameConfig/GDQP6S.ini diff --git a/Data/User/GameConfig/GDREAF.ini b/Data/Sys/GameConfig/GDREAF.ini similarity index 100% rename from Data/User/GameConfig/GDREAF.ini rename to Data/Sys/GameConfig/GDREAF.ini diff --git a/Data/User/GameConfig/GDSE78.ini b/Data/Sys/GameConfig/GDSE78.ini similarity index 100% rename from Data/User/GameConfig/GDSE78.ini rename to Data/Sys/GameConfig/GDSE78.ini diff --git a/Data/User/GameConfig/GDSP78.ini b/Data/Sys/GameConfig/GDSP78.ini similarity index 100% rename from Data/User/GameConfig/GDSP78.ini rename to Data/Sys/GameConfig/GDSP78.ini diff --git a/Data/User/GameConfig/GDTE69.ini b/Data/Sys/GameConfig/GDTE69.ini similarity index 100% rename from Data/User/GameConfig/GDTE69.ini rename to Data/Sys/GameConfig/GDTE69.ini diff --git a/Data/User/GameConfig/GDVE6L.ini b/Data/Sys/GameConfig/GDVE6L.ini similarity index 100% rename from Data/User/GameConfig/GDVE6L.ini rename to Data/Sys/GameConfig/GDVE6L.ini diff --git a/Data/User/GameConfig/GDVP6L.ini b/Data/Sys/GameConfig/GDVP6L.ini similarity index 100% rename from Data/User/GameConfig/GDVP6L.ini rename to Data/Sys/GameConfig/GDVP6L.ini diff --git a/Data/User/GameConfig/GDWEA4.ini b/Data/Sys/GameConfig/GDWEA4.ini similarity index 100% rename from Data/User/GameConfig/GDWEA4.ini rename to Data/Sys/GameConfig/GDWEA4.ini diff --git a/Data/User/GameConfig/GE4E7D.ini b/Data/Sys/GameConfig/GE4E7D.ini similarity index 100% rename from Data/User/GameConfig/GE4E7D.ini rename to Data/Sys/GameConfig/GE4E7D.ini diff --git a/Data/User/GameConfig/GE5EA4.ini b/Data/Sys/GameConfig/GE5EA4.ini similarity index 100% rename from Data/User/GameConfig/GE5EA4.ini rename to Data/Sys/GameConfig/GE5EA4.ini diff --git a/Data/User/GameConfig/GE9E5D.ini b/Data/Sys/GameConfig/GE9E5D.ini similarity index 100% rename from Data/User/GameConfig/GE9E5D.ini rename to Data/Sys/GameConfig/GE9E5D.ini diff --git a/Data/User/GameConfig/GEAE8P.ini b/Data/Sys/GameConfig/GEAE8P.ini similarity index 100% rename from Data/User/GameConfig/GEAE8P.ini rename to Data/Sys/GameConfig/GEAE8P.ini diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/Sys/GameConfig/GEAP8P.ini similarity index 100% rename from Data/User/GameConfig/GEAP8P.ini rename to Data/Sys/GameConfig/GEAP8P.ini diff --git a/Data/User/GameConfig/GEBEA4.ini b/Data/Sys/GameConfig/GEBEA4.ini similarity index 100% rename from Data/User/GameConfig/GEBEA4.ini rename to Data/Sys/GameConfig/GEBEA4.ini diff --git a/Data/User/GameConfig/GEDE01.ini b/Data/Sys/GameConfig/GEDE01.ini similarity index 100% rename from Data/User/GameConfig/GEDE01.ini rename to Data/Sys/GameConfig/GEDE01.ini diff --git a/Data/User/GameConfig/GEDP01.ini b/Data/Sys/GameConfig/GEDP01.ini similarity index 100% rename from Data/User/GameConfig/GEDP01.ini rename to Data/Sys/GameConfig/GEDP01.ini diff --git a/Data/User/GameConfig/GEME7F.ini b/Data/Sys/GameConfig/GEME7F.ini similarity index 100% rename from Data/User/GameConfig/GEME7F.ini rename to Data/Sys/GameConfig/GEME7F.ini diff --git a/Data/User/GameConfig/GEND69.ini b/Data/Sys/GameConfig/GEND69.ini similarity index 100% rename from Data/User/GameConfig/GEND69.ini rename to Data/Sys/GameConfig/GEND69.ini diff --git a/Data/User/GameConfig/GENE69.ini b/Data/Sys/GameConfig/GENE69.ini similarity index 100% rename from Data/User/GameConfig/GENE69.ini rename to Data/Sys/GameConfig/GENE69.ini diff --git a/Data/User/GameConfig/GENP69.ini b/Data/Sys/GameConfig/GENP69.ini similarity index 100% rename from Data/User/GameConfig/GENP69.ini rename to Data/Sys/GameConfig/GENP69.ini diff --git a/Data/User/GameConfig/GENS69.ini b/Data/Sys/GameConfig/GENS69.ini similarity index 100% rename from Data/User/GameConfig/GENS69.ini rename to Data/Sys/GameConfig/GENS69.ini diff --git a/Data/User/GameConfig/GEOE08.ini b/Data/Sys/GameConfig/GEOE08.ini similarity index 100% rename from Data/User/GameConfig/GEOE08.ini rename to Data/Sys/GameConfig/GEOE08.ini diff --git a/Data/User/GameConfig/GEOP08.ini b/Data/Sys/GameConfig/GEOP08.ini similarity index 100% rename from Data/User/GameConfig/GEOP08.ini rename to Data/Sys/GameConfig/GEOP08.ini diff --git a/Data/User/GameConfig/GESEA4.ini b/Data/Sys/GameConfig/GESEA4.ini similarity index 100% rename from Data/User/GameConfig/GESEA4.ini rename to Data/Sys/GameConfig/GESEA4.ini diff --git a/Data/User/GameConfig/GEWE41.ini b/Data/Sys/GameConfig/GEWE41.ini similarity index 100% rename from Data/User/GameConfig/GEWE41.ini rename to Data/Sys/GameConfig/GEWE41.ini diff --git a/Data/User/GameConfig/GEXE52.ini b/Data/Sys/GameConfig/GEXE52.ini similarity index 100% rename from Data/User/GameConfig/GEXE52.ini rename to Data/Sys/GameConfig/GEXE52.ini diff --git a/Data/User/GameConfig/GEYE69.ini b/Data/Sys/GameConfig/GEYE69.ini similarity index 100% rename from Data/User/GameConfig/GEYE69.ini rename to Data/Sys/GameConfig/GEYE69.ini diff --git a/Data/User/GameConfig/GEZE8P.ini b/Data/Sys/GameConfig/GEZE8P.ini similarity index 100% rename from Data/User/GameConfig/GEZE8P.ini rename to Data/Sys/GameConfig/GEZE8P.ini diff --git a/Data/User/GameConfig/GEZP8P.ini b/Data/Sys/GameConfig/GEZP8P.ini similarity index 100% rename from Data/User/GameConfig/GEZP8P.ini rename to Data/Sys/GameConfig/GEZP8P.ini diff --git a/Data/User/GameConfig/GF2E69.ini b/Data/Sys/GameConfig/GF2E69.ini similarity index 100% rename from Data/User/GameConfig/GF2E69.ini rename to Data/Sys/GameConfig/GF2E69.ini diff --git a/Data/User/GameConfig/GF4E52.ini b/Data/Sys/GameConfig/GF4E52.ini similarity index 100% rename from Data/User/GameConfig/GF4E52.ini rename to Data/Sys/GameConfig/GF4E52.ini diff --git a/Data/User/GameConfig/GF4F52.ini b/Data/Sys/GameConfig/GF4F52.ini similarity index 100% rename from Data/User/GameConfig/GF4F52.ini rename to Data/Sys/GameConfig/GF4F52.ini diff --git a/Data/User/GameConfig/GF4P52.ini b/Data/Sys/GameConfig/GF4P52.ini similarity index 100% rename from Data/User/GameConfig/GF4P52.ini rename to Data/Sys/GameConfig/GF4P52.ini diff --git a/Data/User/GameConfig/GF5E69.ini b/Data/Sys/GameConfig/GF5E69.ini similarity index 100% rename from Data/User/GameConfig/GF5E69.ini rename to Data/Sys/GameConfig/GF5E69.ini diff --git a/Data/User/GameConfig/GF6E69.ini b/Data/Sys/GameConfig/GF6E69.ini similarity index 100% rename from Data/User/GameConfig/GF6E69.ini rename to Data/Sys/GameConfig/GF6E69.ini diff --git a/Data/User/GameConfig/GF6F69.ini b/Data/Sys/GameConfig/GF6F69.ini similarity index 100% rename from Data/User/GameConfig/GF6F69.ini rename to Data/Sys/GameConfig/GF6F69.ini diff --git a/Data/User/GameConfig/GF7E01.ini b/Data/Sys/GameConfig/GF7E01.ini similarity index 100% rename from Data/User/GameConfig/GF7E01.ini rename to Data/Sys/GameConfig/GF7E01.ini diff --git a/Data/User/GameConfig/GF7P01.ini b/Data/Sys/GameConfig/GF7P01.ini similarity index 100% rename from Data/User/GameConfig/GF7P01.ini rename to Data/Sys/GameConfig/GF7P01.ini diff --git a/Data/User/GameConfig/GF8E69.ini b/Data/Sys/GameConfig/GF8E69.ini similarity index 100% rename from Data/User/GameConfig/GF8E69.ini rename to Data/Sys/GameConfig/GF8E69.ini diff --git a/Data/User/GameConfig/GF8P69.ini b/Data/Sys/GameConfig/GF8P69.ini similarity index 100% rename from Data/User/GameConfig/GF8P69.ini rename to Data/Sys/GameConfig/GF8P69.ini diff --git a/Data/User/GameConfig/GFAD69.ini b/Data/Sys/GameConfig/GFAD69.ini similarity index 100% rename from Data/User/GameConfig/GFAD69.ini rename to Data/Sys/GameConfig/GFAD69.ini diff --git a/Data/User/GameConfig/GFAE69.ini b/Data/Sys/GameConfig/GFAE69.ini similarity index 100% rename from Data/User/GameConfig/GFAE69.ini rename to Data/Sys/GameConfig/GFAE69.ini diff --git a/Data/User/GameConfig/GFAP69.ini b/Data/Sys/GameConfig/GFAP69.ini similarity index 100% rename from Data/User/GameConfig/GFAP69.ini rename to Data/Sys/GameConfig/GFAP69.ini diff --git a/Data/User/GameConfig/GFAS69.ini b/Data/Sys/GameConfig/GFAS69.ini similarity index 100% rename from Data/User/GameConfig/GFAS69.ini rename to Data/Sys/GameConfig/GFAS69.ini diff --git a/Data/User/GameConfig/GFBE5D.ini b/Data/Sys/GameConfig/GFBE5D.ini similarity index 100% rename from Data/User/GameConfig/GFBE5D.ini rename to Data/Sys/GameConfig/GFBE5D.ini diff --git a/Data/User/GameConfig/GFCP69.ini b/Data/Sys/GameConfig/GFCP69.ini similarity index 100% rename from Data/User/GameConfig/GFCP69.ini rename to Data/Sys/GameConfig/GFCP69.ini diff --git a/Data/User/GameConfig/GFDD69.ini b/Data/Sys/GameConfig/GFDD69.ini similarity index 100% rename from Data/User/GameConfig/GFDD69.ini rename to Data/Sys/GameConfig/GFDD69.ini diff --git a/Data/User/GameConfig/GFDE69.ini b/Data/Sys/GameConfig/GFDE69.ini similarity index 100% rename from Data/User/GameConfig/GFDE69.ini rename to Data/Sys/GameConfig/GFDE69.ini diff --git a/Data/User/GameConfig/GFEE01.ini b/Data/Sys/GameConfig/GFEE01.ini similarity index 100% rename from Data/User/GameConfig/GFEE01.ini rename to Data/Sys/GameConfig/GFEE01.ini diff --git a/Data/User/GameConfig/GFEJ01.ini b/Data/Sys/GameConfig/GFEJ01.ini similarity index 100% rename from Data/User/GameConfig/GFEJ01.ini rename to Data/Sys/GameConfig/GFEJ01.ini diff --git a/Data/User/GameConfig/GFEP01.ini b/Data/Sys/GameConfig/GFEP01.ini similarity index 100% rename from Data/User/GameConfig/GFEP01.ini rename to Data/Sys/GameConfig/GFEP01.ini diff --git a/Data/User/GameConfig/GFFE5D.ini b/Data/Sys/GameConfig/GFFE5D.ini similarity index 100% rename from Data/User/GameConfig/GFFE5D.ini rename to Data/Sys/GameConfig/GFFE5D.ini diff --git a/Data/User/GameConfig/GFGEA4.ini b/Data/Sys/GameConfig/GFGEA4.ini similarity index 100% rename from Data/User/GameConfig/GFGEA4.ini rename to Data/Sys/GameConfig/GFGEA4.ini diff --git a/Data/User/GameConfig/GFHP6V.ini b/Data/Sys/GameConfig/GFHP6V.ini similarity index 100% rename from Data/User/GameConfig/GFHP6V.ini rename to Data/Sys/GameConfig/GFHP6V.ini diff --git a/Data/User/GameConfig/GFKE69.ini b/Data/Sys/GameConfig/GFKE69.ini similarity index 100% rename from Data/User/GameConfig/GFKE69.ini rename to Data/Sys/GameConfig/GFKE69.ini diff --git a/Data/User/GameConfig/GFPEA4.ini b/Data/Sys/GameConfig/GFPEA4.ini similarity index 100% rename from Data/User/GameConfig/GFPEA4.ini rename to Data/Sys/GameConfig/GFPEA4.ini diff --git a/Data/User/GameConfig/GFQEA4.ini b/Data/Sys/GameConfig/GFQEA4.ini similarity index 100% rename from Data/User/GameConfig/GFQEA4.ini rename to Data/Sys/GameConfig/GFQEA4.ini diff --git a/Data/User/GameConfig/GFTE01.ini b/Data/Sys/GameConfig/GFTE01.ini similarity index 100% rename from Data/User/GameConfig/GFTE01.ini rename to Data/Sys/GameConfig/GFTE01.ini diff --git a/Data/User/GameConfig/GFTP01.ini b/Data/Sys/GameConfig/GFTP01.ini similarity index 100% rename from Data/User/GameConfig/GFTP01.ini rename to Data/Sys/GameConfig/GFTP01.ini diff --git a/Data/User/GameConfig/GFUE4Z.ini b/Data/Sys/GameConfig/GFUE4Z.ini similarity index 100% rename from Data/User/GameConfig/GFUE4Z.ini rename to Data/Sys/GameConfig/GFUE4Z.ini diff --git a/Data/User/GameConfig/GFYE69.ini b/Data/Sys/GameConfig/GFYE69.ini similarity index 100% rename from Data/User/GameConfig/GFYE69.ini rename to Data/Sys/GameConfig/GFYE69.ini diff --git a/Data/User/GameConfig/GFYP69.ini b/Data/Sys/GameConfig/GFYP69.ini similarity index 100% rename from Data/User/GameConfig/GFYP69.ini rename to Data/Sys/GameConfig/GFYP69.ini diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/Sys/GameConfig/GFZE01.ini similarity index 100% rename from Data/User/GameConfig/GFZE01.ini rename to Data/Sys/GameConfig/GFZE01.ini diff --git a/Data/User/GameConfig/GFZJ01.ini b/Data/Sys/GameConfig/GFZJ01.ini similarity index 100% rename from Data/User/GameConfig/GFZJ01.ini rename to Data/Sys/GameConfig/GFZJ01.ini diff --git a/Data/User/GameConfig/GFZP01.ini b/Data/Sys/GameConfig/GFZP01.ini similarity index 100% rename from Data/User/GameConfig/GFZP01.ini rename to Data/Sys/GameConfig/GFZP01.ini diff --git a/Data/User/GameConfig/GG4E08.ini b/Data/Sys/GameConfig/GG4E08.ini similarity index 100% rename from Data/User/GameConfig/GG4E08.ini rename to Data/Sys/GameConfig/GG4E08.ini diff --git a/Data/User/GameConfig/GG4P08.ini b/Data/Sys/GameConfig/GG4P08.ini similarity index 100% rename from Data/User/GameConfig/GG4P08.ini rename to Data/Sys/GameConfig/GG4P08.ini diff --git a/Data/User/GameConfig/GG5E52.ini b/Data/Sys/GameConfig/GG5E52.ini similarity index 100% rename from Data/User/GameConfig/GG5E52.ini rename to Data/Sys/GameConfig/GG5E52.ini diff --git a/Data/User/GameConfig/GGAJB2.ini b/Data/Sys/GameConfig/GGAJB2.ini similarity index 100% rename from Data/User/GameConfig/GGAJB2.ini rename to Data/Sys/GameConfig/GGAJB2.ini diff --git a/Data/User/GameConfig/GGCE0A.ini b/Data/Sys/GameConfig/GGCE0A.ini similarity index 100% rename from Data/User/GameConfig/GGCE0A.ini rename to Data/Sys/GameConfig/GGCE0A.ini diff --git a/Data/User/GameConfig/GGCOSD.ini b/Data/Sys/GameConfig/GGCOSD.ini similarity index 100% rename from Data/User/GameConfig/GGCOSD.ini rename to Data/Sys/GameConfig/GGCOSD.ini diff --git a/Data/User/GameConfig/GGEE41.ini b/Data/Sys/GameConfig/GGEE41.ini similarity index 100% rename from Data/User/GameConfig/GGEE41.ini rename to Data/Sys/GameConfig/GGEE41.ini diff --git a/Data/User/GameConfig/GGEP41.ini b/Data/Sys/GameConfig/GGEP41.ini similarity index 100% rename from Data/User/GameConfig/GGEP41.ini rename to Data/Sys/GameConfig/GGEP41.ini diff --git a/Data/User/GameConfig/GGEY41.ini b/Data/Sys/GameConfig/GGEY41.ini similarity index 100% rename from Data/User/GameConfig/GGEY41.ini rename to Data/Sys/GameConfig/GGEY41.ini diff --git a/Data/User/GameConfig/GGME00.ini b/Data/Sys/GameConfig/GGME00.ini similarity index 100% rename from Data/User/GameConfig/GGME00.ini rename to Data/Sys/GameConfig/GGME00.ini diff --git a/Data/User/GameConfig/GGPJB2.ini b/Data/Sys/GameConfig/GGPJB2.ini similarity index 100% rename from Data/User/GameConfig/GGPJB2.ini rename to Data/Sys/GameConfig/GGPJB2.ini diff --git a/Data/User/GameConfig/GGRE41.ini b/Data/Sys/GameConfig/GGRE41.ini similarity index 100% rename from Data/User/GameConfig/GGRE41.ini rename to Data/Sys/GameConfig/GGRE41.ini diff --git a/Data/User/GameConfig/GGSEA4.ini b/Data/Sys/GameConfig/GGSEA4.ini similarity index 100% rename from Data/User/GameConfig/GGSEA4.ini rename to Data/Sys/GameConfig/GGSEA4.ini diff --git a/Data/User/GameConfig/GGSJA4.ini b/Data/Sys/GameConfig/GGSJA4.ini similarity index 100% rename from Data/User/GameConfig/GGSJA4.ini rename to Data/Sys/GameConfig/GGSJA4.ini diff --git a/Data/User/GameConfig/GGSPA4.ini b/Data/Sys/GameConfig/GGSPA4.ini similarity index 100% rename from Data/User/GameConfig/GGSPA4.ini rename to Data/Sys/GameConfig/GGSPA4.ini diff --git a/Data/User/GameConfig/GGTE01.ini b/Data/Sys/GameConfig/GGTE01.ini similarity index 100% rename from Data/User/GameConfig/GGTE01.ini rename to Data/Sys/GameConfig/GGTE01.ini diff --git a/Data/User/GameConfig/GGTP01.ini b/Data/Sys/GameConfig/GGTP01.ini similarity index 100% rename from Data/User/GameConfig/GGTP01.ini rename to Data/Sys/GameConfig/GGTP01.ini diff --git a/Data/User/GameConfig/GGYE41.ini b/Data/Sys/GameConfig/GGYE41.ini similarity index 100% rename from Data/User/GameConfig/GGYE41.ini rename to Data/Sys/GameConfig/GGYE41.ini diff --git a/Data/User/GameConfig/GGYP41.ini b/Data/Sys/GameConfig/GGYP41.ini similarity index 100% rename from Data/User/GameConfig/GGYP41.ini rename to Data/Sys/GameConfig/GGYP41.ini diff --git a/Data/User/GameConfig/GGZE52.ini b/Data/Sys/GameConfig/GGZE52.ini similarity index 100% rename from Data/User/GameConfig/GGZE52.ini rename to Data/Sys/GameConfig/GGZE52.ini diff --git a/Data/User/GameConfig/GGZX52.ini b/Data/Sys/GameConfig/GGZX52.ini similarity index 100% rename from Data/User/GameConfig/GGZX52.ini rename to Data/Sys/GameConfig/GGZX52.ini diff --git a/Data/User/GameConfig/GH2E69.ini b/Data/Sys/GameConfig/GH2E69.ini similarity index 100% rename from Data/User/GameConfig/GH2E69.ini rename to Data/Sys/GameConfig/GH2E69.ini diff --git a/Data/User/GameConfig/GH2P69.ini b/Data/Sys/GameConfig/GH2P69.ini similarity index 100% rename from Data/User/GameConfig/GH2P69.ini rename to Data/Sys/GameConfig/GH2P69.ini diff --git a/Data/User/GameConfig/GH4D69.ini b/Data/Sys/GameConfig/GH4D69.ini similarity index 100% rename from Data/User/GameConfig/GH4D69.ini rename to Data/Sys/GameConfig/GH4D69.ini diff --git a/Data/User/GameConfig/GH4E69.ini b/Data/Sys/GameConfig/GH4E69.ini similarity index 100% rename from Data/User/GameConfig/GH4E69.ini rename to Data/Sys/GameConfig/GH4E69.ini diff --git a/Data/User/GameConfig/GH4F69.ini b/Data/Sys/GameConfig/GH4F69.ini similarity index 100% rename from Data/User/GameConfig/GH4F69.ini rename to Data/Sys/GameConfig/GH4F69.ini diff --git a/Data/User/GameConfig/GH4H69.ini b/Data/Sys/GameConfig/GH4H69.ini similarity index 100% rename from Data/User/GameConfig/GH4H69.ini rename to Data/Sys/GameConfig/GH4H69.ini diff --git a/Data/User/GameConfig/GH4I69.ini b/Data/Sys/GameConfig/GH4I69.ini similarity index 100% rename from Data/User/GameConfig/GH4I69.ini rename to Data/Sys/GameConfig/GH4I69.ini diff --git a/Data/User/GameConfig/GH4J69.ini b/Data/Sys/GameConfig/GH4J69.ini similarity index 100% rename from Data/User/GameConfig/GH4J69.ini rename to Data/Sys/GameConfig/GH4J69.ini diff --git a/Data/User/GameConfig/GH4M69.ini b/Data/Sys/GameConfig/GH4M69.ini similarity index 100% rename from Data/User/GameConfig/GH4M69.ini rename to Data/Sys/GameConfig/GH4M69.ini diff --git a/Data/User/GameConfig/GH4P69.ini b/Data/Sys/GameConfig/GH4P69.ini similarity index 100% rename from Data/User/GameConfig/GH4P69.ini rename to Data/Sys/GameConfig/GH4P69.ini diff --git a/Data/User/GameConfig/GH4S69.ini b/Data/Sys/GameConfig/GH4S69.ini similarity index 100% rename from Data/User/GameConfig/GH4S69.ini rename to Data/Sys/GameConfig/GH4S69.ini diff --git a/Data/User/GameConfig/GH5D52.ini b/Data/Sys/GameConfig/GH5D52.ini similarity index 100% rename from Data/User/GameConfig/GH5D52.ini rename to Data/Sys/GameConfig/GH5D52.ini diff --git a/Data/User/GameConfig/GH5E52.ini b/Data/Sys/GameConfig/GH5E52.ini similarity index 100% rename from Data/User/GameConfig/GH5E52.ini rename to Data/Sys/GameConfig/GH5E52.ini diff --git a/Data/User/GameConfig/GH5F52.ini b/Data/Sys/GameConfig/GH5F52.ini similarity index 100% rename from Data/User/GameConfig/GH5F52.ini rename to Data/Sys/GameConfig/GH5F52.ini diff --git a/Data/User/GameConfig/GH5P52.ini b/Data/Sys/GameConfig/GH5P52.ini similarity index 100% rename from Data/User/GameConfig/GH5P52.ini rename to Data/Sys/GameConfig/GH5P52.ini diff --git a/Data/User/GameConfig/GH6EAF.ini b/Data/Sys/GameConfig/GH6EAF.ini similarity index 100% rename from Data/User/GameConfig/GH6EAF.ini rename to Data/Sys/GameConfig/GH6EAF.ini diff --git a/Data/User/GameConfig/GH7E5D.ini b/Data/Sys/GameConfig/GH7E5D.ini similarity index 100% rename from Data/User/GameConfig/GH7E5D.ini rename to Data/Sys/GameConfig/GH7E5D.ini diff --git a/Data/User/GameConfig/GHAE08.ini b/Data/Sys/GameConfig/GHAE08.ini similarity index 100% rename from Data/User/GameConfig/GHAE08.ini rename to Data/Sys/GameConfig/GHAE08.ini diff --git a/Data/User/GameConfig/GHAP08.ini b/Data/Sys/GameConfig/GHAP08.ini similarity index 100% rename from Data/User/GameConfig/GHAP08.ini rename to Data/Sys/GameConfig/GHAP08.ini diff --git a/Data/User/GameConfig/GHBE7D.ini b/Data/Sys/GameConfig/GHBE7D.ini similarity index 100% rename from Data/User/GameConfig/GHBE7D.ini rename to Data/Sys/GameConfig/GHBE7D.ini diff --git a/Data/User/GameConfig/GHBP7D.ini b/Data/Sys/GameConfig/GHBP7D.ini similarity index 100% rename from Data/User/GameConfig/GHBP7D.ini rename to Data/Sys/GameConfig/GHBP7D.ini diff --git a/Data/User/GameConfig/GHCE4Q.ini b/Data/Sys/GameConfig/GHCE4Q.ini similarity index 100% rename from Data/User/GameConfig/GHCE4Q.ini rename to Data/Sys/GameConfig/GHCE4Q.ini diff --git a/Data/User/GameConfig/GHCF4Q.ini b/Data/Sys/GameConfig/GHCF4Q.ini similarity index 100% rename from Data/User/GameConfig/GHCF4Q.ini rename to Data/Sys/GameConfig/GHCF4Q.ini diff --git a/Data/User/GameConfig/GHGEEB.ini b/Data/Sys/GameConfig/GHGEEB.ini similarity index 100% rename from Data/User/GameConfig/GHGEEB.ini rename to Data/Sys/GameConfig/GHGEEB.ini diff --git a/Data/User/GameConfig/GHKE7D.ini b/Data/Sys/GameConfig/GHKE7D.ini similarity index 100% rename from Data/User/GameConfig/GHKE7D.ini rename to Data/Sys/GameConfig/GHKE7D.ini diff --git a/Data/User/GameConfig/GHLE69.ini b/Data/Sys/GameConfig/GHLE69.ini similarity index 100% rename from Data/User/GameConfig/GHLE69.ini rename to Data/Sys/GameConfig/GHLE69.ini diff --git a/Data/User/GameConfig/GHLJ69.ini b/Data/Sys/GameConfig/GHLJ69.ini similarity index 100% rename from Data/User/GameConfig/GHLJ69.ini rename to Data/Sys/GameConfig/GHLJ69.ini diff --git a/Data/User/GameConfig/GHLP69.ini b/Data/Sys/GameConfig/GHLP69.ini similarity index 100% rename from Data/User/GameConfig/GHLP69.ini rename to Data/Sys/GameConfig/GHLP69.ini diff --git a/Data/User/GameConfig/GHLX69.ini b/Data/Sys/GameConfig/GHLX69.ini similarity index 100% rename from Data/User/GameConfig/GHLX69.ini rename to Data/Sys/GameConfig/GHLX69.ini diff --git a/Data/User/GameConfig/GHLY69.ini b/Data/Sys/GameConfig/GHLY69.ini similarity index 100% rename from Data/User/GameConfig/GHLY69.ini rename to Data/Sys/GameConfig/GHLY69.ini diff --git a/Data/User/GameConfig/GHLZ69.ini b/Data/Sys/GameConfig/GHLZ69.ini similarity index 100% rename from Data/User/GameConfig/GHLZ69.ini rename to Data/Sys/GameConfig/GHLZ69.ini diff --git a/Data/User/GameConfig/GHMD4F.ini b/Data/Sys/GameConfig/GHMD4F.ini similarity index 100% rename from Data/User/GameConfig/GHMD4F.ini rename to Data/Sys/GameConfig/GHMD4F.ini diff --git a/Data/User/GameConfig/GHME4F.ini b/Data/Sys/GameConfig/GHME4F.ini similarity index 100% rename from Data/User/GameConfig/GHME4F.ini rename to Data/Sys/GameConfig/GHME4F.ini diff --git a/Data/User/GameConfig/GHMF4F.ini b/Data/Sys/GameConfig/GHMF4F.ini similarity index 100% rename from Data/User/GameConfig/GHMF4F.ini rename to Data/Sys/GameConfig/GHMF4F.ini diff --git a/Data/User/GameConfig/GHMP4F.ini b/Data/Sys/GameConfig/GHMP4F.ini similarity index 100% rename from Data/User/GameConfig/GHMP4F.ini rename to Data/Sys/GameConfig/GHMP4F.ini diff --git a/Data/User/GameConfig/GHNE71.ini b/Data/Sys/GameConfig/GHNE71.ini similarity index 100% rename from Data/User/GameConfig/GHNE71.ini rename to Data/Sys/GameConfig/GHNE71.ini diff --git a/Data/User/GameConfig/GHQE7D.ini b/Data/Sys/GameConfig/GHQE7D.ini similarity index 100% rename from Data/User/GameConfig/GHQE7D.ini rename to Data/Sys/GameConfig/GHQE7D.ini diff --git a/Data/User/GameConfig/GHQP7D.ini b/Data/Sys/GameConfig/GHQP7D.ini similarity index 100% rename from Data/User/GameConfig/GHQP7D.ini rename to Data/Sys/GameConfig/GHQP7D.ini diff --git a/Data/User/GameConfig/GHRE78.ini b/Data/Sys/GameConfig/GHRE78.ini similarity index 100% rename from Data/User/GameConfig/GHRE78.ini rename to Data/Sys/GameConfig/GHRE78.ini diff --git a/Data/User/GameConfig/GHSE69.ini b/Data/Sys/GameConfig/GHSE69.ini similarity index 100% rename from Data/User/GameConfig/GHSE69.ini rename to Data/Sys/GameConfig/GHSE69.ini diff --git a/Data/User/GameConfig/GHSJ69.ini b/Data/Sys/GameConfig/GHSJ69.ini similarity index 100% rename from Data/User/GameConfig/GHSJ69.ini rename to Data/Sys/GameConfig/GHSJ69.ini diff --git a/Data/User/GameConfig/GHSP69.ini b/Data/Sys/GameConfig/GHSP69.ini similarity index 100% rename from Data/User/GameConfig/GHSP69.ini rename to Data/Sys/GameConfig/GHSP69.ini diff --git a/Data/User/GameConfig/GHSX69.ini b/Data/Sys/GameConfig/GHSX69.ini similarity index 100% rename from Data/User/GameConfig/GHSX69.ini rename to Data/Sys/GameConfig/GHSX69.ini diff --git a/Data/User/GameConfig/GHSY69.ini b/Data/Sys/GameConfig/GHSY69.ini similarity index 100% rename from Data/User/GameConfig/GHSY69.ini rename to Data/Sys/GameConfig/GHSY69.ini diff --git a/Data/User/GameConfig/GHUE7D.ini b/Data/Sys/GameConfig/GHUE7D.ini similarity index 100% rename from Data/User/GameConfig/GHUE7D.ini rename to Data/Sys/GameConfig/GHUE7D.ini diff --git a/Data/User/GameConfig/GHVE08.ini b/Data/Sys/GameConfig/GHVE08.ini similarity index 100% rename from Data/User/GameConfig/GHVE08.ini rename to Data/Sys/GameConfig/GHVE08.ini diff --git a/Data/User/GameConfig/GHWE78.ini b/Data/Sys/GameConfig/GHWE78.ini similarity index 100% rename from Data/User/GameConfig/GHWE78.ini rename to Data/Sys/GameConfig/GHWE78.ini diff --git a/Data/User/GameConfig/GHYE6S.ini b/Data/Sys/GameConfig/GHYE6S.ini similarity index 100% rename from Data/User/GameConfig/GHYE6S.ini rename to Data/Sys/GameConfig/GHYE6S.ini diff --git a/Data/User/GameConfig/GIAE7D.ini b/Data/Sys/GameConfig/GIAE7D.ini similarity index 100% rename from Data/User/GameConfig/GIAE7D.ini rename to Data/Sys/GameConfig/GIAE7D.ini diff --git a/Data/User/GameConfig/GIBE4F.ini b/Data/Sys/GameConfig/GIBE4F.ini similarity index 100% rename from Data/User/GameConfig/GIBE4F.ini rename to Data/Sys/GameConfig/GIBE4F.ini diff --git a/Data/User/GameConfig/GICE78.ini b/Data/Sys/GameConfig/GICE78.ini similarity index 100% rename from Data/User/GameConfig/GICE78.ini rename to Data/Sys/GameConfig/GICE78.ini diff --git a/Data/User/GameConfig/GIGJ8P.ini b/Data/Sys/GameConfig/GIGJ8P.ini similarity index 100% rename from Data/User/GameConfig/GIGJ8P.ini rename to Data/Sys/GameConfig/GIGJ8P.ini diff --git a/Data/User/GameConfig/GIKE70.ini b/Data/Sys/GameConfig/GIKE70.ini similarity index 100% rename from Data/User/GameConfig/GIKE70.ini rename to Data/Sys/GameConfig/GIKE70.ini diff --git a/Data/User/GameConfig/GIKP70.ini b/Data/Sys/GameConfig/GIKP70.ini similarity index 100% rename from Data/User/GameConfig/GIKP70.ini rename to Data/Sys/GameConfig/GIKP70.ini diff --git a/Data/User/GameConfig/GILE51.ini b/Data/Sys/GameConfig/GILE51.ini similarity index 100% rename from Data/User/GameConfig/GILE51.ini rename to Data/Sys/GameConfig/GILE51.ini diff --git a/Data/User/GameConfig/GILP51.ini b/Data/Sys/GameConfig/GILP51.ini similarity index 100% rename from Data/User/GameConfig/GILP51.ini rename to Data/Sys/GameConfig/GILP51.ini diff --git a/Data/User/GameConfig/GINE69.ini b/Data/Sys/GameConfig/GINE69.ini similarity index 100% rename from Data/User/GameConfig/GINE69.ini rename to Data/Sys/GameConfig/GINE69.ini diff --git a/Data/User/GameConfig/GINX69.ini b/Data/Sys/GameConfig/GINX69.ini similarity index 100% rename from Data/User/GameConfig/GINX69.ini rename to Data/Sys/GameConfig/GINX69.ini diff --git a/Data/User/GameConfig/GIPEAF.ini b/Data/Sys/GameConfig/GIPEAF.ini similarity index 100% rename from Data/User/GameConfig/GIPEAF.ini rename to Data/Sys/GameConfig/GIPEAF.ini diff --git a/Data/User/GameConfig/GIQE78.ini b/Data/Sys/GameConfig/GIQE78.ini similarity index 100% rename from Data/User/GameConfig/GIQE78.ini rename to Data/Sys/GameConfig/GIQE78.ini diff --git a/Data/User/GameConfig/GISE36.ini b/Data/Sys/GameConfig/GISE36.ini similarity index 100% rename from Data/User/GameConfig/GISE36.ini rename to Data/Sys/GameConfig/GISE36.ini diff --git a/Data/User/GameConfig/GISP36.ini b/Data/Sys/GameConfig/GISP36.ini similarity index 100% rename from Data/User/GameConfig/GISP36.ini rename to Data/Sys/GameConfig/GISP36.ini diff --git a/Data/User/GameConfig/GITE01.ini b/Data/Sys/GameConfig/GITE01.ini similarity index 100% rename from Data/User/GameConfig/GITE01.ini rename to Data/Sys/GameConfig/GITE01.ini diff --git a/Data/User/GameConfig/GITP01.ini b/Data/Sys/GameConfig/GITP01.ini similarity index 100% rename from Data/User/GameConfig/GITP01.ini rename to Data/Sys/GameConfig/GITP01.ini diff --git a/Data/User/GameConfig/GIVE4Z.ini b/Data/Sys/GameConfig/GIVE4Z.ini similarity index 100% rename from Data/User/GameConfig/GIVE4Z.ini rename to Data/Sys/GameConfig/GIVE4Z.ini diff --git a/Data/User/GameConfig/GIZE52.ini b/Data/Sys/GameConfig/GIZE52.ini similarity index 100% rename from Data/User/GameConfig/GIZE52.ini rename to Data/Sys/GameConfig/GIZE52.ini diff --git a/Data/User/GameConfig/GJ3PA4.ini b/Data/Sys/GameConfig/GJ3PA4.ini similarity index 100% rename from Data/User/GameConfig/GJ3PA4.ini rename to Data/Sys/GameConfig/GJ3PA4.ini diff --git a/Data/User/GameConfig/GJBE5G.ini b/Data/Sys/GameConfig/GJBE5G.ini similarity index 100% rename from Data/User/GameConfig/GJBE5G.ini rename to Data/Sys/GameConfig/GJBE5G.ini diff --git a/Data/User/GameConfig/GJCE8P.ini b/Data/Sys/GameConfig/GJCE8P.ini similarity index 100% rename from Data/User/GameConfig/GJCE8P.ini rename to Data/Sys/GameConfig/GJCE8P.ini diff --git a/Data/User/GameConfig/GJDE5S.ini b/Data/Sys/GameConfig/GJDE5S.ini similarity index 100% rename from Data/User/GameConfig/GJDE5S.ini rename to Data/Sys/GameConfig/GJDE5S.ini diff --git a/Data/User/GameConfig/GJKE52.ini b/Data/Sys/GameConfig/GJKE52.ini similarity index 100% rename from Data/User/GameConfig/GJKE52.ini rename to Data/Sys/GameConfig/GJKE52.ini diff --git a/Data/User/GameConfig/GJNE78.ini b/Data/Sys/GameConfig/GJNE78.ini similarity index 100% rename from Data/User/GameConfig/GJNE78.ini rename to Data/Sys/GameConfig/GJNE78.ini diff --git a/Data/User/GameConfig/GJSJ18.ini b/Data/Sys/GameConfig/GJSJ18.ini similarity index 100% rename from Data/User/GameConfig/GJSJ18.ini rename to Data/Sys/GameConfig/GJSJ18.ini diff --git a/Data/User/GameConfig/GJUD78.ini b/Data/Sys/GameConfig/GJUD78.ini similarity index 100% rename from Data/User/GameConfig/GJUD78.ini rename to Data/Sys/GameConfig/GJUD78.ini diff --git a/Data/User/GameConfig/GJUE78.ini b/Data/Sys/GameConfig/GJUE78.ini similarity index 100% rename from Data/User/GameConfig/GJUE78.ini rename to Data/Sys/GameConfig/GJUE78.ini diff --git a/Data/User/GameConfig/GJUF78.ini b/Data/Sys/GameConfig/GJUF78.ini similarity index 100% rename from Data/User/GameConfig/GJUF78.ini rename to Data/Sys/GameConfig/GJUF78.ini diff --git a/Data/User/GameConfig/GJWE78.ini b/Data/Sys/GameConfig/GJWE78.ini similarity index 100% rename from Data/User/GameConfig/GJWE78.ini rename to Data/Sys/GameConfig/GJWE78.ini diff --git a/Data/User/GameConfig/GJXE51.ini b/Data/Sys/GameConfig/GJXE51.ini similarity index 100% rename from Data/User/GameConfig/GJXE51.ini rename to Data/Sys/GameConfig/GJXE51.ini diff --git a/Data/User/GameConfig/GJXP51.ini b/Data/Sys/GameConfig/GJXP51.ini similarity index 100% rename from Data/User/GameConfig/GJXP51.ini rename to Data/Sys/GameConfig/GJXP51.ini diff --git a/Data/User/GameConfig/GJZE52.ini b/Data/Sys/GameConfig/GJZE52.ini similarity index 100% rename from Data/User/GameConfig/GJZE52.ini rename to Data/Sys/GameConfig/GJZE52.ini diff --git a/Data/User/GameConfig/GK2D52.ini b/Data/Sys/GameConfig/GK2D52.ini similarity index 100% rename from Data/User/GameConfig/GK2D52.ini rename to Data/Sys/GameConfig/GK2D52.ini diff --git a/Data/User/GameConfig/GK2E52.ini b/Data/Sys/GameConfig/GK2E52.ini similarity index 100% rename from Data/User/GameConfig/GK2E52.ini rename to Data/Sys/GameConfig/GK2E52.ini diff --git a/Data/User/GameConfig/GK2F52.ini b/Data/Sys/GameConfig/GK2F52.ini similarity index 100% rename from Data/User/GameConfig/GK2F52.ini rename to Data/Sys/GameConfig/GK2F52.ini diff --git a/Data/User/GameConfig/GK2I52.ini b/Data/Sys/GameConfig/GK2I52.ini similarity index 100% rename from Data/User/GameConfig/GK2I52.ini rename to Data/Sys/GameConfig/GK2I52.ini diff --git a/Data/User/GameConfig/GK2P52.ini b/Data/Sys/GameConfig/GK2P52.ini similarity index 100% rename from Data/User/GameConfig/GK2P52.ini rename to Data/Sys/GameConfig/GK2P52.ini diff --git a/Data/User/GameConfig/GK4E01.ini b/Data/Sys/GameConfig/GK4E01.ini similarity index 100% rename from Data/User/GameConfig/GK4E01.ini rename to Data/Sys/GameConfig/GK4E01.ini diff --git a/Data/User/GameConfig/GK5E78.ini b/Data/Sys/GameConfig/GK5E78.ini similarity index 100% rename from Data/User/GameConfig/GK5E78.ini rename to Data/Sys/GameConfig/GK5E78.ini diff --git a/Data/User/GameConfig/GK5X78.ini b/Data/Sys/GameConfig/GK5X78.ini similarity index 100% rename from Data/User/GameConfig/GK5X78.ini rename to Data/Sys/GameConfig/GK5X78.ini diff --git a/Data/User/GameConfig/GK6JA4.ini b/Data/Sys/GameConfig/GK6JA4.ini similarity index 100% rename from Data/User/GameConfig/GK6JA4.ini rename to Data/Sys/GameConfig/GK6JA4.ini diff --git a/Data/User/GameConfig/GK7E08.ini b/Data/Sys/GameConfig/GK7E08.ini similarity index 100% rename from Data/User/GameConfig/GK7E08.ini rename to Data/Sys/GameConfig/GK7E08.ini diff --git a/Data/User/GameConfig/GK7P08.ini b/Data/Sys/GameConfig/GK7P08.ini similarity index 100% rename from Data/User/GameConfig/GK7P08.ini rename to Data/Sys/GameConfig/GK7P08.ini diff --git a/Data/User/GameConfig/GK9EA4.ini b/Data/Sys/GameConfig/GK9EA4.ini similarity index 100% rename from Data/User/GameConfig/GK9EA4.ini rename to Data/Sys/GameConfig/GK9EA4.ini diff --git a/Data/User/GameConfig/GKAE8P.ini b/Data/Sys/GameConfig/GKAE8P.ini similarity index 100% rename from Data/User/GameConfig/GKAE8P.ini rename to Data/Sys/GameConfig/GKAE8P.ini diff --git a/Data/User/GameConfig/GKBEAF.ini b/Data/Sys/GameConfig/GKBEAF.ini similarity index 100% rename from Data/User/GameConfig/GKBEAF.ini rename to Data/Sys/GameConfig/GKBEAF.ini diff --git a/Data/User/GameConfig/GKBPAF.ini b/Data/Sys/GameConfig/GKBPAF.ini similarity index 100% rename from Data/User/GameConfig/GKBPAF.ini rename to Data/Sys/GameConfig/GKBPAF.ini diff --git a/Data/User/GameConfig/GKDP01.ini b/Data/Sys/GameConfig/GKDP01.ini similarity index 100% rename from Data/User/GameConfig/GKDP01.ini rename to Data/Sys/GameConfig/GKDP01.ini diff --git a/Data/User/GameConfig/GKFEGG.ini b/Data/Sys/GameConfig/GKFEGG.ini similarity index 100% rename from Data/User/GameConfig/GKFEGG.ini rename to Data/Sys/GameConfig/GKFEGG.ini diff --git a/Data/User/GameConfig/GKGE01.ini b/Data/Sys/GameConfig/GKGE01.ini similarity index 100% rename from Data/User/GameConfig/GKGE01.ini rename to Data/Sys/GameConfig/GKGE01.ini diff --git a/Data/User/GameConfig/GKHEA4.ini b/Data/Sys/GameConfig/GKHEA4.ini similarity index 100% rename from Data/User/GameConfig/GKHEA4.ini rename to Data/Sys/GameConfig/GKHEA4.ini diff --git a/Data/User/GameConfig/GKHPA4.ini b/Data/Sys/GameConfig/GKHPA4.ini similarity index 100% rename from Data/User/GameConfig/GKHPA4.ini rename to Data/Sys/GameConfig/GKHPA4.ini diff --git a/Data/User/GameConfig/GKJE78.ini b/Data/Sys/GameConfig/GKJE78.ini similarity index 100% rename from Data/User/GameConfig/GKJE78.ini rename to Data/Sys/GameConfig/GKJE78.ini diff --git a/Data/User/GameConfig/GKKE69.ini b/Data/Sys/GameConfig/GKKE69.ini similarity index 100% rename from Data/User/GameConfig/GKKE69.ini rename to Data/Sys/GameConfig/GKKE69.ini diff --git a/Data/User/GameConfig/GKLD69.ini b/Data/Sys/GameConfig/GKLD69.ini similarity index 100% rename from Data/User/GameConfig/GKLD69.ini rename to Data/Sys/GameConfig/GKLD69.ini diff --git a/Data/User/GameConfig/GKLE69.ini b/Data/Sys/GameConfig/GKLE69.ini similarity index 100% rename from Data/User/GameConfig/GKLE69.ini rename to Data/Sys/GameConfig/GKLE69.ini diff --git a/Data/User/GameConfig/GKLF69.ini b/Data/Sys/GameConfig/GKLF69.ini similarity index 100% rename from Data/User/GameConfig/GKLF69.ini rename to Data/Sys/GameConfig/GKLF69.ini diff --git a/Data/User/GameConfig/GKLI69.ini b/Data/Sys/GameConfig/GKLI69.ini similarity index 100% rename from Data/User/GameConfig/GKLI69.ini rename to Data/Sys/GameConfig/GKLI69.ini diff --git a/Data/User/GameConfig/GKLJ69.ini b/Data/Sys/GameConfig/GKLJ69.ini similarity index 100% rename from Data/User/GameConfig/GKLJ69.ini rename to Data/Sys/GameConfig/GKLJ69.ini diff --git a/Data/User/GameConfig/GKLP69.ini b/Data/Sys/GameConfig/GKLP69.ini similarity index 100% rename from Data/User/GameConfig/GKLP69.ini rename to Data/Sys/GameConfig/GKLP69.ini diff --git a/Data/User/GameConfig/GKLS69.ini b/Data/Sys/GameConfig/GKLS69.ini similarity index 100% rename from Data/User/GameConfig/GKLS69.ini rename to Data/Sys/GameConfig/GKLS69.ini diff --git a/Data/User/GameConfig/GKME41.ini b/Data/Sys/GameConfig/GKME41.ini similarity index 100% rename from Data/User/GameConfig/GKME41.ini rename to Data/Sys/GameConfig/GKME41.ini diff --git a/Data/User/GameConfig/GKMP41.ini b/Data/Sys/GameConfig/GKMP41.ini similarity index 100% rename from Data/User/GameConfig/GKMP41.ini rename to Data/Sys/GameConfig/GKMP41.ini diff --git a/Data/User/GameConfig/GKNEB2.ini b/Data/Sys/GameConfig/GKNEB2.ini similarity index 100% rename from Data/User/GameConfig/GKNEB2.ini rename to Data/Sys/GameConfig/GKNEB2.ini diff --git a/Data/User/GameConfig/GKOE70.ini b/Data/Sys/GameConfig/GKOE70.ini similarity index 100% rename from Data/User/GameConfig/GKOE70.ini rename to Data/Sys/GameConfig/GKOE70.ini diff --git a/Data/User/GameConfig/GKOP6V.ini b/Data/Sys/GameConfig/GKOP6V.ini similarity index 100% rename from Data/User/GameConfig/GKOP6V.ini rename to Data/Sys/GameConfig/GKOP6V.ini diff --git a/Data/User/GameConfig/GKOP70.ini b/Data/Sys/GameConfig/GKOP70.ini similarity index 100% rename from Data/User/GameConfig/GKOP70.ini rename to Data/Sys/GameConfig/GKOP70.ini diff --git a/Data/User/GameConfig/GKQJ01.ini b/Data/Sys/GameConfig/GKQJ01.ini similarity index 100% rename from Data/User/GameConfig/GKQJ01.ini rename to Data/Sys/GameConfig/GKQJ01.ini diff --git a/Data/User/GameConfig/GKSE52.ini b/Data/Sys/GameConfig/GKSE52.ini similarity index 100% rename from Data/User/GameConfig/GKSE52.ini rename to Data/Sys/GameConfig/GKSE52.ini diff --git a/Data/User/GameConfig/GKTJA4.ini b/Data/Sys/GameConfig/GKTJA4.ini similarity index 100% rename from Data/User/GameConfig/GKTJA4.ini rename to Data/Sys/GameConfig/GKTJA4.ini diff --git a/Data/User/GameConfig/GKUE9G.ini b/Data/Sys/GameConfig/GKUE9G.ini similarity index 100% rename from Data/User/GameConfig/GKUE9G.ini rename to Data/Sys/GameConfig/GKUE9G.ini diff --git a/Data/User/GameConfig/GKYE01.ini b/Data/Sys/GameConfig/GKYE01.ini similarity index 100% rename from Data/User/GameConfig/GKYE01.ini rename to Data/Sys/GameConfig/GKYE01.ini diff --git a/Data/User/GameConfig/GKYJ01.ini b/Data/Sys/GameConfig/GKYJ01.ini similarity index 100% rename from Data/User/GameConfig/GKYJ01.ini rename to Data/Sys/GameConfig/GKYJ01.ini diff --git a/Data/User/GameConfig/GKYP01.ini b/Data/Sys/GameConfig/GKYP01.ini similarity index 100% rename from Data/User/GameConfig/GKYP01.ini rename to Data/Sys/GameConfig/GKYP01.ini diff --git a/Data/User/GameConfig/GKZE9G.ini b/Data/Sys/GameConfig/GKZE9G.ini similarity index 100% rename from Data/User/GameConfig/GKZE9G.ini rename to Data/Sys/GameConfig/GKZE9G.ini diff --git a/Data/User/GameConfig/GL5E4F.ini b/Data/Sys/GameConfig/GL5E4F.ini similarity index 100% rename from Data/User/GameConfig/GL5E4F.ini rename to Data/Sys/GameConfig/GL5E4F.ini diff --git a/Data/User/GameConfig/GL7E64.ini b/Data/Sys/GameConfig/GL7E64.ini similarity index 100% rename from Data/User/GameConfig/GL7E64.ini rename to Data/Sys/GameConfig/GL7E64.ini diff --git a/Data/User/GameConfig/GL7P64.ini b/Data/Sys/GameConfig/GL7P64.ini similarity index 100% rename from Data/User/GameConfig/GL7P64.ini rename to Data/Sys/GameConfig/GL7P64.ini diff --git a/Data/User/GameConfig/GL8E4F.ini b/Data/Sys/GameConfig/GL8E4F.ini similarity index 100% rename from Data/User/GameConfig/GL8E4F.ini rename to Data/Sys/GameConfig/GL8E4F.ini diff --git a/Data/User/GameConfig/GL8F4F.ini b/Data/Sys/GameConfig/GL8F4F.ini similarity index 100% rename from Data/User/GameConfig/GL8F4F.ini rename to Data/Sys/GameConfig/GL8F4F.ini diff --git a/Data/User/GameConfig/GLBE8P.ini b/Data/Sys/GameConfig/GLBE8P.ini similarity index 100% rename from Data/User/GameConfig/GLBE8P.ini rename to Data/Sys/GameConfig/GLBE8P.ini diff --git a/Data/User/GameConfig/GLCE52.ini b/Data/Sys/GameConfig/GLCE52.ini similarity index 100% rename from Data/User/GameConfig/GLCE52.ini rename to Data/Sys/GameConfig/GLCE52.ini diff --git a/Data/User/GameConfig/GLCF52.ini b/Data/Sys/GameConfig/GLCF52.ini similarity index 100% rename from Data/User/GameConfig/GLCF52.ini rename to Data/Sys/GameConfig/GLCF52.ini diff --git a/Data/User/GameConfig/GLEE08.ini b/Data/Sys/GameConfig/GLEE08.ini similarity index 100% rename from Data/User/GameConfig/GLEE08.ini rename to Data/Sys/GameConfig/GLEE08.ini diff --git a/Data/User/GameConfig/GLEP08.ini b/Data/Sys/GameConfig/GLEP08.ini similarity index 100% rename from Data/User/GameConfig/GLEP08.ini rename to Data/Sys/GameConfig/GLEP08.ini diff --git a/Data/User/GameConfig/GLLE78.ini b/Data/Sys/GameConfig/GLLE78.ini similarity index 100% rename from Data/User/GameConfig/GLLE78.ini rename to Data/Sys/GameConfig/GLLE78.ini diff --git a/Data/User/GameConfig/GLME01.ini b/Data/Sys/GameConfig/GLME01.ini similarity index 100% rename from Data/User/GameConfig/GLME01.ini rename to Data/Sys/GameConfig/GLME01.ini diff --git a/Data/User/GameConfig/GLMP01.ini b/Data/Sys/GameConfig/GLMP01.ini similarity index 100% rename from Data/User/GameConfig/GLMP01.ini rename to Data/Sys/GameConfig/GLMP01.ini diff --git a/Data/User/GameConfig/GLNE69.ini b/Data/Sys/GameConfig/GLNE69.ini similarity index 100% rename from Data/User/GameConfig/GLNE69.ini rename to Data/Sys/GameConfig/GLNE69.ini diff --git a/Data/User/GameConfig/GLNP69.ini b/Data/Sys/GameConfig/GLNP69.ini similarity index 100% rename from Data/User/GameConfig/GLNP69.ini rename to Data/Sys/GameConfig/GLNP69.ini diff --git a/Data/User/GameConfig/GLOE69.ini b/Data/Sys/GameConfig/GLOE69.ini similarity index 100% rename from Data/User/GameConfig/GLOE69.ini rename to Data/Sys/GameConfig/GLOE69.ini diff --git a/Data/User/GameConfig/GLOP69.ini b/Data/Sys/GameConfig/GLOP69.ini similarity index 100% rename from Data/User/GameConfig/GLOP69.ini rename to Data/Sys/GameConfig/GLOP69.ini diff --git a/Data/User/GameConfig/GLQE41.ini b/Data/Sys/GameConfig/GLQE41.ini similarity index 100% rename from Data/User/GameConfig/GLQE41.ini rename to Data/Sys/GameConfig/GLQE41.ini diff --git a/Data/User/GameConfig/GLRE64.ini b/Data/Sys/GameConfig/GLRE64.ini similarity index 100% rename from Data/User/GameConfig/GLRE64.ini rename to Data/Sys/GameConfig/GLRE64.ini diff --git a/Data/User/GameConfig/GLSD64.ini b/Data/Sys/GameConfig/GLSD64.ini similarity index 100% rename from Data/User/GameConfig/GLSD64.ini rename to Data/Sys/GameConfig/GLSD64.ini diff --git a/Data/User/GameConfig/GLSE64.ini b/Data/Sys/GameConfig/GLSE64.ini similarity index 100% rename from Data/User/GameConfig/GLSE64.ini rename to Data/Sys/GameConfig/GLSE64.ini diff --git a/Data/User/GameConfig/GLSF64.ini b/Data/Sys/GameConfig/GLSF64.ini similarity index 100% rename from Data/User/GameConfig/GLSF64.ini rename to Data/Sys/GameConfig/GLSF64.ini diff --git a/Data/User/GameConfig/GLSP64.ini b/Data/Sys/GameConfig/GLSP64.ini similarity index 100% rename from Data/User/GameConfig/GLSP64.ini rename to Data/Sys/GameConfig/GLSP64.ini diff --git a/Data/User/GameConfig/GLUE7U.ini b/Data/Sys/GameConfig/GLUE7U.ini similarity index 100% rename from Data/User/GameConfig/GLUE7U.ini rename to Data/Sys/GameConfig/GLUE7U.ini diff --git a/Data/User/GameConfig/GLWE51.ini b/Data/Sys/GameConfig/GLWE51.ini similarity index 100% rename from Data/User/GameConfig/GLWE51.ini rename to Data/Sys/GameConfig/GLWE51.ini diff --git a/Data/User/GameConfig/GLYE69.ini b/Data/Sys/GameConfig/GLYE69.ini similarity index 100% rename from Data/User/GameConfig/GLYE69.ini rename to Data/Sys/GameConfig/GLYE69.ini diff --git a/Data/User/GameConfig/GLYP69.ini b/Data/Sys/GameConfig/GLYP69.ini similarity index 100% rename from Data/User/GameConfig/GLYP69.ini rename to Data/Sys/GameConfig/GLYP69.ini diff --git a/Data/User/GameConfig/GLZE69.ini b/Data/Sys/GameConfig/GLZE69.ini similarity index 100% rename from Data/User/GameConfig/GLZE69.ini rename to Data/Sys/GameConfig/GLZE69.ini diff --git a/Data/User/GameConfig/GLZF69.ini b/Data/Sys/GameConfig/GLZF69.ini similarity index 100% rename from Data/User/GameConfig/GLZF69.ini rename to Data/Sys/GameConfig/GLZF69.ini diff --git a/Data/User/GameConfig/GM2E8P.ini b/Data/Sys/GameConfig/GM2E8P.ini similarity index 100% rename from Data/User/GameConfig/GM2E8P.ini rename to Data/Sys/GameConfig/GM2E8P.ini diff --git a/Data/User/GameConfig/GM2P8P.ini b/Data/Sys/GameConfig/GM2P8P.ini similarity index 100% rename from Data/User/GameConfig/GM2P8P.ini rename to Data/Sys/GameConfig/GM2P8P.ini diff --git a/Data/User/GameConfig/GM3E69.ini b/Data/Sys/GameConfig/GM3E69.ini similarity index 100% rename from Data/User/GameConfig/GM3E69.ini rename to Data/Sys/GameConfig/GM3E69.ini diff --git a/Data/User/GameConfig/GM4E01.ini b/Data/Sys/GameConfig/GM4E01.ini similarity index 100% rename from Data/User/GameConfig/GM4E01.ini rename to Data/Sys/GameConfig/GM4E01.ini diff --git a/Data/User/GameConfig/GM4J01.ini b/Data/Sys/GameConfig/GM4J01.ini similarity index 100% rename from Data/User/GameConfig/GM4J01.ini rename to Data/Sys/GameConfig/GM4J01.ini diff --git a/Data/User/GameConfig/GM4P01.ini b/Data/Sys/GameConfig/GM4P01.ini similarity index 100% rename from Data/User/GameConfig/GM4P01.ini rename to Data/Sys/GameConfig/GM4P01.ini diff --git a/Data/User/GameConfig/GM5E7D.ini b/Data/Sys/GameConfig/GM5E7D.ini similarity index 100% rename from Data/User/GameConfig/GM5E7D.ini rename to Data/Sys/GameConfig/GM5E7D.ini diff --git a/Data/User/GameConfig/GM5F7D.ini b/Data/Sys/GameConfig/GM5F7D.ini similarity index 100% rename from Data/User/GameConfig/GM5F7D.ini rename to Data/Sys/GameConfig/GM5F7D.ini diff --git a/Data/User/GameConfig/GM5P7D.ini b/Data/Sys/GameConfig/GM5P7D.ini similarity index 100% rename from Data/User/GameConfig/GM5P7D.ini rename to Data/Sys/GameConfig/GM5P7D.ini diff --git a/Data/User/GameConfig/GM6EE9.ini b/Data/Sys/GameConfig/GM6EE9.ini similarity index 100% rename from Data/User/GameConfig/GM6EE9.ini rename to Data/Sys/GameConfig/GM6EE9.ini diff --git a/Data/User/GameConfig/GM6PE9.ini b/Data/Sys/GameConfig/GM6PE9.ini similarity index 100% rename from Data/User/GameConfig/GM6PE9.ini rename to Data/Sys/GameConfig/GM6PE9.ini diff --git a/Data/User/GameConfig/GM8E01.ini b/Data/Sys/GameConfig/GM8E01.ini similarity index 100% rename from Data/User/GameConfig/GM8E01.ini rename to Data/Sys/GameConfig/GM8E01.ini diff --git a/Data/User/GameConfig/GM8J01.ini b/Data/Sys/GameConfig/GM8J01.ini similarity index 100% rename from Data/User/GameConfig/GM8J01.ini rename to Data/Sys/GameConfig/GM8J01.ini diff --git a/Data/User/GameConfig/GM8P01.ini b/Data/Sys/GameConfig/GM8P01.ini similarity index 100% rename from Data/User/GameConfig/GM8P01.ini rename to Data/Sys/GameConfig/GM8P01.ini diff --git a/Data/User/GameConfig/GMBE8P.ini b/Data/Sys/GameConfig/GMBE8P.ini similarity index 100% rename from Data/User/GameConfig/GMBE8P.ini rename to Data/Sys/GameConfig/GMBE8P.ini diff --git a/Data/User/GameConfig/GMBP8P.ini b/Data/Sys/GameConfig/GMBP8P.ini similarity index 100% rename from Data/User/GameConfig/GMBP8P.ini rename to Data/Sys/GameConfig/GMBP8P.ini diff --git a/Data/User/GameConfig/GMFS69.ini b/Data/Sys/GameConfig/GMFS69.ini similarity index 100% rename from Data/User/GameConfig/GMFS69.ini rename to Data/Sys/GameConfig/GMFS69.ini diff --git a/Data/User/GameConfig/GMHE52.ini b/Data/Sys/GameConfig/GMHE52.ini similarity index 100% rename from Data/User/GameConfig/GMHE52.ini rename to Data/Sys/GameConfig/GMHE52.ini diff --git a/Data/User/GameConfig/GMHF52.ini b/Data/Sys/GameConfig/GMHF52.ini similarity index 100% rename from Data/User/GameConfig/GMHF52.ini rename to Data/Sys/GameConfig/GMHF52.ini diff --git a/Data/User/GameConfig/GMHP52.ini b/Data/Sys/GameConfig/GMHP52.ini similarity index 100% rename from Data/User/GameConfig/GMHP52.ini rename to Data/Sys/GameConfig/GMHP52.ini diff --git a/Data/User/GameConfig/GMIE70.ini b/Data/Sys/GameConfig/GMIE70.ini similarity index 100% rename from Data/User/GameConfig/GMIE70.ini rename to Data/Sys/GameConfig/GMIE70.ini diff --git a/Data/User/GameConfig/GMIP70.ini b/Data/Sys/GameConfig/GMIP70.ini similarity index 100% rename from Data/User/GameConfig/GMIP70.ini rename to Data/Sys/GameConfig/GMIP70.ini diff --git a/Data/User/GameConfig/GMKD5D.ini b/Data/Sys/GameConfig/GMKD5D.ini similarity index 100% rename from Data/User/GameConfig/GMKD5D.ini rename to Data/Sys/GameConfig/GMKD5D.ini diff --git a/Data/User/GameConfig/GMLEA4.ini b/Data/Sys/GameConfig/GMLEA4.ini similarity index 100% rename from Data/User/GameConfig/GMLEA4.ini rename to Data/Sys/GameConfig/GMLEA4.ini diff --git a/Data/User/GameConfig/GMNE78.ini b/Data/Sys/GameConfig/GMNE78.ini similarity index 100% rename from Data/User/GameConfig/GMNE78.ini rename to Data/Sys/GameConfig/GMNE78.ini diff --git a/Data/User/GameConfig/GMPE01.ini b/Data/Sys/GameConfig/GMPE01.ini similarity index 100% rename from Data/User/GameConfig/GMPE01.ini rename to Data/Sys/GameConfig/GMPE01.ini diff --git a/Data/User/GameConfig/GMPP01.ini b/Data/Sys/GameConfig/GMPP01.ini similarity index 100% rename from Data/User/GameConfig/GMPP01.ini rename to Data/Sys/GameConfig/GMPP01.ini diff --git a/Data/User/GameConfig/GMSE01.ini b/Data/Sys/GameConfig/GMSE01.ini similarity index 100% rename from Data/User/GameConfig/GMSE01.ini rename to Data/Sys/GameConfig/GMSE01.ini diff --git a/Data/User/GameConfig/GMSJ01.ini b/Data/Sys/GameConfig/GMSJ01.ini similarity index 100% rename from Data/User/GameConfig/GMSJ01.ini rename to Data/Sys/GameConfig/GMSJ01.ini diff --git a/Data/User/GameConfig/GMSP01.ini b/Data/Sys/GameConfig/GMSP01.ini similarity index 100% rename from Data/User/GameConfig/GMSP01.ini rename to Data/Sys/GameConfig/GMSP01.ini diff --git a/Data/User/GameConfig/GMTP69.ini b/Data/Sys/GameConfig/GMTP69.ini similarity index 100% rename from Data/User/GameConfig/GMTP69.ini rename to Data/Sys/GameConfig/GMTP69.ini diff --git a/Data/User/GameConfig/GMUE5D.ini b/Data/Sys/GameConfig/GMUE5D.ini similarity index 100% rename from Data/User/GameConfig/GMUE5D.ini rename to Data/Sys/GameConfig/GMUE5D.ini diff --git a/Data/User/GameConfig/GMXE70.ini b/Data/Sys/GameConfig/GMXE70.ini similarity index 100% rename from Data/User/GameConfig/GMXE70.ini rename to Data/Sys/GameConfig/GMXE70.ini diff --git a/Data/User/GameConfig/GN6E69.ini b/Data/Sys/GameConfig/GN6E69.ini similarity index 100% rename from Data/User/GameConfig/GN6E69.ini rename to Data/Sys/GameConfig/GN6E69.ini diff --git a/Data/User/GameConfig/GN8E69.ini b/Data/Sys/GameConfig/GN8E69.ini similarity index 100% rename from Data/User/GameConfig/GN8E69.ini rename to Data/Sys/GameConfig/GN8E69.ini diff --git a/Data/User/GameConfig/GN8P69.ini b/Data/Sys/GameConfig/GN8P69.ini similarity index 100% rename from Data/User/GameConfig/GN8P69.ini rename to Data/Sys/GameConfig/GN8P69.ini diff --git a/Data/User/GameConfig/GNDE69.ini b/Data/Sys/GameConfig/GNDE69.ini similarity index 100% rename from Data/User/GameConfig/GNDE69.ini rename to Data/Sys/GameConfig/GNDE69.ini diff --git a/Data/User/GameConfig/GNHE5d.ini b/Data/Sys/GameConfig/GNHE5d.ini similarity index 100% rename from Data/User/GameConfig/GNHE5d.ini rename to Data/Sys/GameConfig/GNHE5d.ini diff --git a/Data/User/GameConfig/GNJEAF.ini b/Data/Sys/GameConfig/GNJEAF.ini similarity index 100% rename from Data/User/GameConfig/GNJEAF.ini rename to Data/Sys/GameConfig/GNJEAF.ini diff --git a/Data/User/GameConfig/GNLE69.ini b/Data/Sys/GameConfig/GNLE69.ini similarity index 100% rename from Data/User/GameConfig/GNLE69.ini rename to Data/Sys/GameConfig/GNLE69.ini diff --git a/Data/User/GameConfig/GNNE69.ini b/Data/Sys/GameConfig/GNNE69.ini similarity index 100% rename from Data/User/GameConfig/GNNE69.ini rename to Data/Sys/GameConfig/GNNE69.ini diff --git a/Data/User/GameConfig/GNOE78.ini b/Data/Sys/GameConfig/GNOE78.ini similarity index 100% rename from Data/User/GameConfig/GNOE78.ini rename to Data/Sys/GameConfig/GNOE78.ini diff --git a/Data/User/GameConfig/GNQE69.ini b/Data/Sys/GameConfig/GNQE69.ini similarity index 100% rename from Data/User/GameConfig/GNQE69.ini rename to Data/Sys/GameConfig/GNQE69.ini diff --git a/Data/User/GameConfig/GNRJDA.ini b/Data/Sys/GameConfig/GNRJDA.ini similarity index 100% rename from Data/User/GameConfig/GNRJDA.ini rename to Data/Sys/GameConfig/GNRJDA.ini diff --git a/Data/User/GameConfig/GNUEDA.ini b/Data/Sys/GameConfig/GNUEDA.ini similarity index 100% rename from Data/User/GameConfig/GNUEDA.ini rename to Data/Sys/GameConfig/GNUEDA.ini diff --git a/Data/User/GameConfig/GNWE69.ini b/Data/Sys/GameConfig/GNWE69.ini similarity index 100% rename from Data/User/GameConfig/GNWE69.ini rename to Data/Sys/GameConfig/GNWE69.ini diff --git a/Data/User/GameConfig/GNWP69.ini b/Data/Sys/GameConfig/GNWP69.ini similarity index 100% rename from Data/User/GameConfig/GNWP69.ini rename to Data/Sys/GameConfig/GNWP69.ini diff --git a/Data/User/GameConfig/GO2E4F.ini b/Data/Sys/GameConfig/GO2E4F.ini similarity index 100% rename from Data/User/GameConfig/GO2E4F.ini rename to Data/Sys/GameConfig/GO2E4F.ini diff --git a/Data/User/GameConfig/GO7E69.ini b/Data/Sys/GameConfig/GO7E69.ini similarity index 100% rename from Data/User/GameConfig/GO7E69.ini rename to Data/Sys/GameConfig/GO7E69.ini diff --git a/Data/User/GameConfig/GO7F69.ini b/Data/Sys/GameConfig/GO7F69.ini similarity index 100% rename from Data/User/GameConfig/GO7F69.ini rename to Data/Sys/GameConfig/GO7F69.ini diff --git a/Data/User/GameConfig/GO7P69.ini b/Data/Sys/GameConfig/GO7P69.ini similarity index 100% rename from Data/User/GameConfig/GO7P69.ini rename to Data/Sys/GameConfig/GO7P69.ini diff --git a/Data/User/GameConfig/GOAE52.ini b/Data/Sys/GameConfig/GOAE52.ini similarity index 100% rename from Data/User/GameConfig/GOAE52.ini rename to Data/Sys/GameConfig/GOAE52.ini diff --git a/Data/User/GameConfig/GOBE4Z.ini b/Data/Sys/GameConfig/GOBE4Z.ini similarity index 100% rename from Data/User/GameConfig/GOBE4Z.ini rename to Data/Sys/GameConfig/GOBE4Z.ini diff --git a/Data/User/GameConfig/GOCE5D.ini b/Data/Sys/GameConfig/GOCE5D.ini similarity index 100% rename from Data/User/GameConfig/GOCE5D.ini rename to Data/Sys/GameConfig/GOCE5D.ini diff --git a/Data/User/GameConfig/GOGJB2.ini b/Data/Sys/GameConfig/GOGJB2.ini similarity index 100% rename from Data/User/GameConfig/GOGJB2.ini rename to Data/Sys/GameConfig/GOGJB2.ini diff --git a/Data/User/GameConfig/GOME01.ini b/Data/Sys/GameConfig/GOME01.ini similarity index 100% rename from Data/User/GameConfig/GOME01.ini rename to Data/Sys/GameConfig/GOME01.ini diff --git a/Data/User/GameConfig/GOMP01.ini b/Data/Sys/GameConfig/GOMP01.ini similarity index 100% rename from Data/User/GameConfig/GOMP01.ini rename to Data/Sys/GameConfig/GOMP01.ini diff --git a/Data/User/GameConfig/GONE69.ini b/Data/Sys/GameConfig/GONE69.ini similarity index 100% rename from Data/User/GameConfig/GONE69.ini rename to Data/Sys/GameConfig/GONE69.ini diff --git a/Data/User/GameConfig/GOOE01.ini b/Data/Sys/GameConfig/GOOE01.ini similarity index 100% rename from Data/User/GameConfig/GOOE01.ini rename to Data/Sys/GameConfig/GOOE01.ini diff --git a/Data/User/GameConfig/GOPEB2.ini b/Data/Sys/GameConfig/GOPEB2.ini similarity index 100% rename from Data/User/GameConfig/GOPEB2.ini rename to Data/Sys/GameConfig/GOPEB2.ini diff --git a/Data/User/GameConfig/GOPJB2.ini b/Data/Sys/GameConfig/GOPJB2.ini similarity index 100% rename from Data/User/GameConfig/GOPJB2.ini rename to Data/Sys/GameConfig/GOPJB2.ini diff --git a/Data/User/GameConfig/GOQEAF.ini b/Data/Sys/GameConfig/GOQEAF.ini similarity index 100% rename from Data/User/GameConfig/GOQEAF.ini rename to Data/Sys/GameConfig/GOQEAF.ini diff --git a/Data/User/GameConfig/GOSE41.ini b/Data/Sys/GameConfig/GOSE41.ini similarity index 100% rename from Data/User/GameConfig/GOSE41.ini rename to Data/Sys/GameConfig/GOSE41.ini diff --git a/Data/User/GameConfig/GOSP41.ini b/Data/Sys/GameConfig/GOSP41.ini similarity index 100% rename from Data/User/GameConfig/GOSP41.ini rename to Data/Sys/GameConfig/GOSP41.ini diff --git a/Data/User/GameConfig/GOSX41.ini b/Data/Sys/GameConfig/GOSX41.ini similarity index 100% rename from Data/User/GameConfig/GOSX41.ini rename to Data/Sys/GameConfig/GOSX41.ini diff --git a/Data/User/GameConfig/GOWD69.ini b/Data/Sys/GameConfig/GOWD69.ini similarity index 100% rename from Data/User/GameConfig/GOWD69.ini rename to Data/Sys/GameConfig/GOWD69.ini diff --git a/Data/User/GameConfig/GOWE69.ini b/Data/Sys/GameConfig/GOWE69.ini similarity index 100% rename from Data/User/GameConfig/GOWE69.ini rename to Data/Sys/GameConfig/GOWE69.ini diff --git a/Data/User/GameConfig/GOWF69.ini b/Data/Sys/GameConfig/GOWF69.ini similarity index 100% rename from Data/User/GameConfig/GOWF69.ini rename to Data/Sys/GameConfig/GOWF69.ini diff --git a/Data/User/GameConfig/GOWJ69.ini b/Data/Sys/GameConfig/GOWJ69.ini similarity index 100% rename from Data/User/GameConfig/GOWJ69.ini rename to Data/Sys/GameConfig/GOWJ69.ini diff --git a/Data/User/GameConfig/GOWP69.ini b/Data/Sys/GameConfig/GOWP69.ini similarity index 100% rename from Data/User/GameConfig/GOWP69.ini rename to Data/Sys/GameConfig/GOWP69.ini diff --git a/Data/User/GameConfig/GOYD69.ini b/Data/Sys/GameConfig/GOYD69.ini similarity index 100% rename from Data/User/GameConfig/GOYD69.ini rename to Data/Sys/GameConfig/GOYD69.ini diff --git a/Data/User/GameConfig/GOYE69.ini b/Data/Sys/GameConfig/GOYE69.ini similarity index 100% rename from Data/User/GameConfig/GOYE69.ini rename to Data/Sys/GameConfig/GOYE69.ini diff --git a/Data/User/GameConfig/GOYF69.ini b/Data/Sys/GameConfig/GOYF69.ini similarity index 100% rename from Data/User/GameConfig/GOYF69.ini rename to Data/Sys/GameConfig/GOYF69.ini diff --git a/Data/User/GameConfig/GOYP69.ini b/Data/Sys/GameConfig/GOYP69.ini similarity index 100% rename from Data/User/GameConfig/GOYP69.ini rename to Data/Sys/GameConfig/GOYP69.ini diff --git a/Data/User/GameConfig/GOYS69.ini b/Data/Sys/GameConfig/GOYS69.ini similarity index 100% rename from Data/User/GameConfig/GOYS69.ini rename to Data/Sys/GameConfig/GOYS69.ini diff --git a/Data/User/GameConfig/GP2E82.ini b/Data/Sys/GameConfig/GP2E82.ini similarity index 100% rename from Data/User/GameConfig/GP2E82.ini rename to Data/Sys/GameConfig/GP2E82.ini diff --git a/Data/User/GameConfig/GP2EAF.ini b/Data/Sys/GameConfig/GP2EAF.ini similarity index 100% rename from Data/User/GameConfig/GP2EAF.ini rename to Data/Sys/GameConfig/GP2EAF.ini diff --git a/Data/User/GameConfig/GP4J18.ini b/Data/Sys/GameConfig/GP4J18.ini similarity index 100% rename from Data/User/GameConfig/GP4J18.ini rename to Data/Sys/GameConfig/GP4J18.ini diff --git a/Data/User/GameConfig/GP5E01.ini b/Data/Sys/GameConfig/GP5E01.ini similarity index 100% rename from Data/User/GameConfig/GP5E01.ini rename to Data/Sys/GameConfig/GP5E01.ini diff --git a/Data/User/GameConfig/GP5J01.ini b/Data/Sys/GameConfig/GP5J01.ini similarity index 100% rename from Data/User/GameConfig/GP5J01.ini rename to Data/Sys/GameConfig/GP5J01.ini diff --git a/Data/User/GameConfig/GP5P01.ini b/Data/Sys/GameConfig/GP5P01.ini similarity index 100% rename from Data/User/GameConfig/GP5P01.ini rename to Data/Sys/GameConfig/GP5P01.ini diff --git a/Data/User/GameConfig/GP6E01.ini b/Data/Sys/GameConfig/GP6E01.ini similarity index 100% rename from Data/User/GameConfig/GP6E01.ini rename to Data/Sys/GameConfig/GP6E01.ini diff --git a/Data/User/GameConfig/GP6J01.ini b/Data/Sys/GameConfig/GP6J01.ini similarity index 100% rename from Data/User/GameConfig/GP6J01.ini rename to Data/Sys/GameConfig/GP6J01.ini diff --git a/Data/User/GameConfig/GP6P01.ini b/Data/Sys/GameConfig/GP6P01.ini similarity index 100% rename from Data/User/GameConfig/GP6P01.ini rename to Data/Sys/GameConfig/GP6P01.ini diff --git a/Data/User/GameConfig/GP7E01.ini b/Data/Sys/GameConfig/GP7E01.ini similarity index 100% rename from Data/User/GameConfig/GP7E01.ini rename to Data/Sys/GameConfig/GP7E01.ini diff --git a/Data/User/GameConfig/GP7J01.ini b/Data/Sys/GameConfig/GP7J01.ini similarity index 100% rename from Data/User/GameConfig/GP7J01.ini rename to Data/Sys/GameConfig/GP7J01.ini diff --git a/Data/User/GameConfig/GP7P01.ini b/Data/Sys/GameConfig/GP7P01.ini similarity index 100% rename from Data/User/GameConfig/GP7P01.ini rename to Data/Sys/GameConfig/GP7P01.ini diff --git a/Data/User/GameConfig/GP8EAF.ini b/Data/Sys/GameConfig/GP8EAF.ini similarity index 100% rename from Data/User/GameConfig/GP8EAF.ini rename to Data/Sys/GameConfig/GP8EAF.ini diff --git a/Data/User/GameConfig/GPAE01.ini b/Data/Sys/GameConfig/GPAE01.ini similarity index 100% rename from Data/User/GameConfig/GPAE01.ini rename to Data/Sys/GameConfig/GPAE01.ini diff --git a/Data/User/GameConfig/GPAJ01.ini b/Data/Sys/GameConfig/GPAJ01.ini similarity index 100% rename from Data/User/GameConfig/GPAJ01.ini rename to Data/Sys/GameConfig/GPAJ01.ini diff --git a/Data/User/GameConfig/GPAP01.ini b/Data/Sys/GameConfig/GPAP01.ini similarity index 100% rename from Data/User/GameConfig/GPAP01.ini rename to Data/Sys/GameConfig/GPAP01.ini diff --git a/Data/User/GameConfig/GPAU01.ini b/Data/Sys/GameConfig/GPAU01.ini similarity index 100% rename from Data/User/GameConfig/GPAU01.ini rename to Data/Sys/GameConfig/GPAU01.ini diff --git a/Data/User/GameConfig/GPDE51.ini b/Data/Sys/GameConfig/GPDE51.ini similarity index 100% rename from Data/User/GameConfig/GPDE51.ini rename to Data/Sys/GameConfig/GPDE51.ini diff --git a/Data/User/GameConfig/GPEJ2Q.ini b/Data/Sys/GameConfig/GPEJ2Q.ini similarity index 100% rename from Data/User/GameConfig/GPEJ2Q.ini rename to Data/Sys/GameConfig/GPEJ2Q.ini diff --git a/Data/User/GameConfig/GPHD52.ini b/Data/Sys/GameConfig/GPHD52.ini similarity index 100% rename from Data/User/GameConfig/GPHD52.ini rename to Data/Sys/GameConfig/GPHD52.ini diff --git a/Data/User/GameConfig/GPHE52.ini b/Data/Sys/GameConfig/GPHE52.ini similarity index 100% rename from Data/User/GameConfig/GPHE52.ini rename to Data/Sys/GameConfig/GPHE52.ini diff --git a/Data/User/GameConfig/GPHP52.ini b/Data/Sys/GameConfig/GPHP52.ini similarity index 100% rename from Data/User/GameConfig/GPHP52.ini rename to Data/Sys/GameConfig/GPHP52.ini diff --git a/Data/User/GameConfig/GPIE01.ini b/Data/Sys/GameConfig/GPIE01.ini similarity index 100% rename from Data/User/GameConfig/GPIE01.ini rename to Data/Sys/GameConfig/GPIE01.ini diff --git a/Data/User/GameConfig/GPIP01.ini b/Data/Sys/GameConfig/GPIP01.ini similarity index 100% rename from Data/User/GameConfig/GPIP01.ini rename to Data/Sys/GameConfig/GPIP01.ini diff --git a/Data/User/GameConfig/GPKE41.ini b/Data/Sys/GameConfig/GPKE41.ini similarity index 100% rename from Data/User/GameConfig/GPKE41.ini rename to Data/Sys/GameConfig/GPKE41.ini diff --git a/Data/User/GameConfig/GPNE08.ini b/Data/Sys/GameConfig/GPNE08.ini similarity index 100% rename from Data/User/GameConfig/GPNE08.ini rename to Data/Sys/GameConfig/GPNE08.ini diff --git a/Data/User/GameConfig/GPNP08.ini b/Data/Sys/GameConfig/GPNP08.ini similarity index 100% rename from Data/User/GameConfig/GPNP08.ini rename to Data/Sys/GameConfig/GPNP08.ini diff --git a/Data/User/GameConfig/GPOE8P.ini b/Data/Sys/GameConfig/GPOE8P.ini similarity index 100% rename from Data/User/GameConfig/GPOE8P.ini rename to Data/Sys/GameConfig/GPOE8P.ini diff --git a/Data/User/GameConfig/GPOP8P.ini b/Data/Sys/GameConfig/GPOP8P.ini similarity index 100% rename from Data/User/GameConfig/GPOP8P.ini rename to Data/Sys/GameConfig/GPOP8P.ini diff --git a/Data/User/GameConfig/GPSE8P.ini b/Data/Sys/GameConfig/GPSE8P.ini similarity index 100% rename from Data/User/GameConfig/GPSE8P.ini rename to Data/Sys/GameConfig/GPSE8P.ini diff --git a/Data/User/GameConfig/GPSP8P.ini b/Data/Sys/GameConfig/GPSP8P.ini similarity index 100% rename from Data/User/GameConfig/GPSP8P.ini rename to Data/Sys/GameConfig/GPSP8P.ini diff --git a/Data/User/GameConfig/GPTE41.ini b/Data/Sys/GameConfig/GPTE41.ini similarity index 100% rename from Data/User/GameConfig/GPTE41.ini rename to Data/Sys/GameConfig/GPTE41.ini diff --git a/Data/User/GameConfig/GPTP41.ini b/Data/Sys/GameConfig/GPTP41.ini similarity index 100% rename from Data/User/GameConfig/GPTP41.ini rename to Data/Sys/GameConfig/GPTP41.ini diff --git a/Data/User/GameConfig/GPVE01.ini b/Data/Sys/GameConfig/GPVE01.ini similarity index 100% rename from Data/User/GameConfig/GPVE01.ini rename to Data/Sys/GameConfig/GPVE01.ini diff --git a/Data/User/GameConfig/GPVP01.ini b/Data/Sys/GameConfig/GPVP01.ini similarity index 100% rename from Data/User/GameConfig/GPVP01.ini rename to Data/Sys/GameConfig/GPVP01.ini diff --git a/Data/User/GameConfig/GPXP01.ini b/Data/Sys/GameConfig/GPXP01.ini similarity index 100% rename from Data/User/GameConfig/GPXP01.ini rename to Data/Sys/GameConfig/GPXP01.ini diff --git a/Data/User/GameConfig/GPZJ01.ini b/Data/Sys/GameConfig/GPZJ01.ini similarity index 100% rename from Data/User/GameConfig/GPZJ01.ini rename to Data/Sys/GameConfig/GPZJ01.ini diff --git a/Data/User/GameConfig/GQ8E69.ini b/Data/Sys/GameConfig/GQ8E69.ini similarity index 100% rename from Data/User/GameConfig/GQ8E69.ini rename to Data/Sys/GameConfig/GQ8E69.ini diff --git a/Data/User/GameConfig/GQCD52.ini b/Data/Sys/GameConfig/GQCD52.ini similarity index 100% rename from Data/User/GameConfig/GQCD52.ini rename to Data/Sys/GameConfig/GQCD52.ini diff --git a/Data/User/GameConfig/GQCE52.ini b/Data/Sys/GameConfig/GQCE52.ini similarity index 100% rename from Data/User/GameConfig/GQCE52.ini rename to Data/Sys/GameConfig/GQCE52.ini diff --git a/Data/User/GameConfig/GQCF52.ini b/Data/Sys/GameConfig/GQCF52.ini similarity index 100% rename from Data/User/GameConfig/GQCF52.ini rename to Data/Sys/GameConfig/GQCF52.ini diff --git a/Data/User/GameConfig/GQCI52.ini b/Data/Sys/GameConfig/GQCI52.ini similarity index 100% rename from Data/User/GameConfig/GQCI52.ini rename to Data/Sys/GameConfig/GQCI52.ini diff --git a/Data/User/GameConfig/GQCP52.ini b/Data/Sys/GameConfig/GQCP52.ini similarity index 100% rename from Data/User/GameConfig/GQCP52.ini rename to Data/Sys/GameConfig/GQCP52.ini diff --git a/Data/User/GameConfig/GQCS52.ini b/Data/Sys/GameConfig/GQCS52.ini similarity index 100% rename from Data/User/GameConfig/GQCS52.ini rename to Data/Sys/GameConfig/GQCS52.ini diff --git a/Data/User/GameConfig/GQLE9G.ini b/Data/Sys/GameConfig/GQLE9G.ini similarity index 100% rename from Data/User/GameConfig/GQLE9G.ini rename to Data/Sys/GameConfig/GQLE9G.ini diff --git a/Data/User/GameConfig/GQNE5D.ini b/Data/Sys/GameConfig/GQNE5D.ini similarity index 100% rename from Data/User/GameConfig/GQNE5D.ini rename to Data/Sys/GameConfig/GQNE5D.ini diff --git a/Data/User/GameConfig/GQSDAF.ini b/Data/Sys/GameConfig/GQSDAF.ini similarity index 100% rename from Data/User/GameConfig/GQSDAF.ini rename to Data/Sys/GameConfig/GQSDAF.ini diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/Sys/GameConfig/GQSEAF.ini similarity index 100% rename from Data/User/GameConfig/GQSEAF.ini rename to Data/Sys/GameConfig/GQSEAF.ini diff --git a/Data/User/GameConfig/GQSFAF.ini b/Data/Sys/GameConfig/GQSFAF.ini similarity index 100% rename from Data/User/GameConfig/GQSFAF.ini rename to Data/Sys/GameConfig/GQSFAF.ini diff --git a/Data/User/GameConfig/GQSPAF.ini b/Data/Sys/GameConfig/GQSPAF.ini similarity index 100% rename from Data/User/GameConfig/GQSPAF.ini rename to Data/Sys/GameConfig/GQSPAF.ini diff --git a/Data/User/GameConfig/GQTE4Q.ini b/Data/Sys/GameConfig/GQTE4Q.ini similarity index 100% rename from Data/User/GameConfig/GQTE4Q.ini rename to Data/Sys/GameConfig/GQTE4Q.ini diff --git a/Data/User/GameConfig/GQWE69.ini b/Data/Sys/GameConfig/GQWE69.ini similarity index 100% rename from Data/User/GameConfig/GQWE69.ini rename to Data/Sys/GameConfig/GQWE69.ini diff --git a/Data/User/GameConfig/GQWJ69.ini b/Data/Sys/GameConfig/GQWJ69.ini similarity index 100% rename from Data/User/GameConfig/GQWJ69.ini rename to Data/Sys/GameConfig/GQWJ69.ini diff --git a/Data/User/GameConfig/GQWP69.ini b/Data/Sys/GameConfig/GQWP69.ini similarity index 100% rename from Data/User/GameConfig/GQWP69.ini rename to Data/Sys/GameConfig/GQWP69.ini diff --git a/Data/User/GameConfig/GQWX69.ini b/Data/Sys/GameConfig/GQWX69.ini similarity index 100% rename from Data/User/GameConfig/GQWX69.ini rename to Data/Sys/GameConfig/GQWX69.ini diff --git a/Data/User/GameConfig/GQXE69.ini b/Data/Sys/GameConfig/GQXE69.ini similarity index 100% rename from Data/User/GameConfig/GQXE69.ini rename to Data/Sys/GameConfig/GQXE69.ini diff --git a/Data/User/GameConfig/GR2E52.ini b/Data/Sys/GameConfig/GR2E52.ini similarity index 100% rename from Data/User/GameConfig/GR2E52.ini rename to Data/Sys/GameConfig/GR2E52.ini diff --git a/Data/User/GameConfig/GR6E78.ini b/Data/Sys/GameConfig/GR6E78.ini similarity index 100% rename from Data/User/GameConfig/GR6E78.ini rename to Data/Sys/GameConfig/GR6E78.ini diff --git a/Data/User/GameConfig/GR8D69.ini b/Data/Sys/GameConfig/GR8D69.ini similarity index 100% rename from Data/User/GameConfig/GR8D69.ini rename to Data/Sys/GameConfig/GR8D69.ini diff --git a/Data/User/GameConfig/GR8E69.ini b/Data/Sys/GameConfig/GR8E69.ini similarity index 100% rename from Data/User/GameConfig/GR8E69.ini rename to Data/Sys/GameConfig/GR8E69.ini diff --git a/Data/User/GameConfig/GR8F69.ini b/Data/Sys/GameConfig/GR8F69.ini similarity index 100% rename from Data/User/GameConfig/GR8F69.ini rename to Data/Sys/GameConfig/GR8F69.ini diff --git a/Data/User/GameConfig/GR8J69.ini b/Data/Sys/GameConfig/GR8J69.ini similarity index 100% rename from Data/User/GameConfig/GR8J69.ini rename to Data/Sys/GameConfig/GR8J69.ini diff --git a/Data/User/GameConfig/GR8P69.ini b/Data/Sys/GameConfig/GR8P69.ini similarity index 100% rename from Data/User/GameConfig/GR8P69.ini rename to Data/Sys/GameConfig/GR8P69.ini diff --git a/Data/User/GameConfig/GRAE5Z.ini b/Data/Sys/GameConfig/GRAE5Z.ini similarity index 100% rename from Data/User/GameConfig/GRAE5Z.ini rename to Data/Sys/GameConfig/GRAE5Z.ini diff --git a/Data/User/GameConfig/GRBE6S.ini b/Data/Sys/GameConfig/GRBE6S.ini similarity index 100% rename from Data/User/GameConfig/GRBE6S.ini rename to Data/Sys/GameConfig/GRBE6S.ini diff --git a/Data/User/GameConfig/GRBP6S.ini b/Data/Sys/GameConfig/GRBP6S.ini similarity index 100% rename from Data/User/GameConfig/GRBP6S.ini rename to Data/Sys/GameConfig/GRBP6S.ini diff --git a/Data/User/GameConfig/GREE08.ini b/Data/Sys/GameConfig/GREE08.ini similarity index 100% rename from Data/User/GameConfig/GREE08.ini rename to Data/Sys/GameConfig/GREE08.ini diff --git a/Data/User/GameConfig/GREP08.ini b/Data/Sys/GameConfig/GREP08.ini similarity index 100% rename from Data/User/GameConfig/GREP08.ini rename to Data/Sys/GameConfig/GREP08.ini diff --git a/Data/User/GameConfig/GRFE78.ini b/Data/Sys/GameConfig/GRFE78.ini similarity index 100% rename from Data/User/GameConfig/GRFE78.ini rename to Data/Sys/GameConfig/GRFE78.ini diff --git a/Data/User/GameConfig/GRHE41.ini b/Data/Sys/GameConfig/GRHE41.ini similarity index 100% rename from Data/User/GameConfig/GRHE41.ini rename to Data/Sys/GameConfig/GRHE41.ini diff --git a/Data/User/GameConfig/GRHP41.ini b/Data/Sys/GameConfig/GRHP41.ini similarity index 100% rename from Data/User/GameConfig/GRHP41.ini rename to Data/Sys/GameConfig/GRHP41.ini diff --git a/Data/User/GameConfig/GRJEAF.ini b/Data/Sys/GameConfig/GRJEAF.ini similarity index 100% rename from Data/User/GameConfig/GRJEAF.ini rename to Data/Sys/GameConfig/GRJEAF.ini diff --git a/Data/User/GameConfig/GRKE41.ini b/Data/Sys/GameConfig/GRKE41.ini similarity index 100% rename from Data/User/GameConfig/GRKE41.ini rename to Data/Sys/GameConfig/GRKE41.ini diff --git a/Data/User/GameConfig/GRKP7G.ini b/Data/Sys/GameConfig/GRKP7G.ini similarity index 100% rename from Data/User/GameConfig/GRKP7G.ini rename to Data/Sys/GameConfig/GRKP7G.ini diff --git a/Data/User/GameConfig/GRLE41.ini b/Data/Sys/GameConfig/GRLE41.ini similarity index 100% rename from Data/User/GameConfig/GRLE41.ini rename to Data/Sys/GameConfig/GRLE41.ini diff --git a/Data/User/GameConfig/GRNE52.ini b/Data/Sys/GameConfig/GRNE52.ini similarity index 100% rename from Data/User/GameConfig/GRNE52.ini rename to Data/Sys/GameConfig/GRNE52.ini diff --git a/Data/User/GameConfig/GROP7J.ini b/Data/Sys/GameConfig/GROP7J.ini similarity index 100% rename from Data/User/GameConfig/GROP7J.ini rename to Data/Sys/GameConfig/GROP7J.ini diff --git a/Data/User/GameConfig/GRQE41.ini b/Data/Sys/GameConfig/GRQE41.ini similarity index 100% rename from Data/User/GameConfig/GRQE41.ini rename to Data/Sys/GameConfig/GRQE41.ini diff --git a/Data/User/GameConfig/GRSEAF.ini b/Data/Sys/GameConfig/GRSEAF.ini similarity index 100% rename from Data/User/GameConfig/GRSEAF.ini rename to Data/Sys/GameConfig/GRSEAF.ini diff --git a/Data/User/GameConfig/GRSPAF.ini b/Data/Sys/GameConfig/GRSPAF.ini similarity index 100% rename from Data/User/GameConfig/GRSPAF.ini rename to Data/Sys/GameConfig/GRSPAF.ini diff --git a/Data/User/GameConfig/GRUE78.ini b/Data/Sys/GameConfig/GRUE78.ini similarity index 100% rename from Data/User/GameConfig/GRUE78.ini rename to Data/Sys/GameConfig/GRUE78.ini diff --git a/Data/User/GameConfig/GRVEA4.ini b/Data/Sys/GameConfig/GRVEA4.ini similarity index 100% rename from Data/User/GameConfig/GRVEA4.ini rename to Data/Sys/GameConfig/GRVEA4.ini diff --git a/Data/User/GameConfig/GRYE41.ini b/Data/Sys/GameConfig/GRYE41.ini similarity index 100% rename from Data/User/GameConfig/GRYE41.ini rename to Data/Sys/GameConfig/GRYE41.ini diff --git a/Data/User/GameConfig/GS2D78.ini b/Data/Sys/GameConfig/GS2D78.ini similarity index 100% rename from Data/User/GameConfig/GS2D78.ini rename to Data/Sys/GameConfig/GS2D78.ini diff --git a/Data/User/GameConfig/GS2E78.ini b/Data/Sys/GameConfig/GS2E78.ini similarity index 100% rename from Data/User/GameConfig/GS2E78.ini rename to Data/Sys/GameConfig/GS2E78.ini diff --git a/Data/User/GameConfig/GS2F78.ini b/Data/Sys/GameConfig/GS2F78.ini similarity index 100% rename from Data/User/GameConfig/GS2F78.ini rename to Data/Sys/GameConfig/GS2F78.ini diff --git a/Data/User/GameConfig/GS2P78.ini b/Data/Sys/GameConfig/GS2P78.ini similarity index 100% rename from Data/User/GameConfig/GS2P78.ini rename to Data/Sys/GameConfig/GS2P78.ini diff --git a/Data/User/GameConfig/GS8P7D.ini b/Data/Sys/GameConfig/GS8P7D.ini similarity index 100% rename from Data/User/GameConfig/GS8P7D.ini rename to Data/Sys/GameConfig/GS8P7D.ini diff --git a/Data/User/GameConfig/GSAE01.ini b/Data/Sys/GameConfig/GSAE01.ini similarity index 100% rename from Data/User/GameConfig/GSAE01.ini rename to Data/Sys/GameConfig/GSAE01.ini diff --git a/Data/User/GameConfig/GSAP01.ini b/Data/Sys/GameConfig/GSAP01.ini similarity index 100% rename from Data/User/GameConfig/GSAP01.ini rename to Data/Sys/GameConfig/GSAP01.ini diff --git a/Data/User/GameConfig/GSCE51.ini b/Data/Sys/GameConfig/GSCE51.ini similarity index 100% rename from Data/User/GameConfig/GSCE51.ini rename to Data/Sys/GameConfig/GSCE51.ini diff --git a/Data/User/GameConfig/GSEJB2.ini b/Data/Sys/GameConfig/GSEJB2.ini similarity index 100% rename from Data/User/GameConfig/GSEJB2.ini rename to Data/Sys/GameConfig/GSEJB2.ini diff --git a/Data/User/GameConfig/GSMP52.ini b/Data/Sys/GameConfig/GSMP52.ini similarity index 100% rename from Data/User/GameConfig/GSMP52.ini rename to Data/Sys/GameConfig/GSMP52.ini diff --git a/Data/User/GameConfig/GSNE8P.ini b/Data/Sys/GameConfig/GSNE8P.ini similarity index 100% rename from Data/User/GameConfig/GSNE8P.ini rename to Data/Sys/GameConfig/GSNE8P.ini diff --git a/Data/User/GameConfig/GSNP8P.ini b/Data/Sys/GameConfig/GSNP8P.ini similarity index 100% rename from Data/User/GameConfig/GSNP8P.ini rename to Data/Sys/GameConfig/GSNP8P.ini diff --git a/Data/User/GameConfig/GSOE8P.ini b/Data/Sys/GameConfig/GSOE8P.ini similarity index 100% rename from Data/User/GameConfig/GSOE8P.ini rename to Data/Sys/GameConfig/GSOE8P.ini diff --git a/Data/User/GameConfig/GSOP8P.ini b/Data/Sys/GameConfig/GSOP8P.ini similarity index 100% rename from Data/User/GameConfig/GSOP8P.ini rename to Data/Sys/GameConfig/GSOP8P.ini diff --git a/Data/User/GameConfig/GSPE69.ini b/Data/Sys/GameConfig/GSPE69.ini similarity index 100% rename from Data/User/GameConfig/GSPE69.ini rename to Data/Sys/GameConfig/GSPE69.ini diff --git a/Data/User/GameConfig/GSSE8P.ini b/Data/Sys/GameConfig/GSSE8P.ini similarity index 100% rename from Data/User/GameConfig/GSSE8P.ini rename to Data/Sys/GameConfig/GSSE8P.ini diff --git a/Data/User/GameConfig/GSSJ8P.ini b/Data/Sys/GameConfig/GSSJ8P.ini similarity index 100% rename from Data/User/GameConfig/GSSJ8P.ini rename to Data/Sys/GameConfig/GSSJ8P.ini diff --git a/Data/User/GameConfig/GSSP70.ini b/Data/Sys/GameConfig/GSSP70.ini similarity index 100% rename from Data/User/GameConfig/GSSP70.ini rename to Data/Sys/GameConfig/GSSP70.ini diff --git a/Data/User/GameConfig/GSSP8P.ini b/Data/Sys/GameConfig/GSSP8P.ini similarity index 100% rename from Data/User/GameConfig/GSSP8P.ini rename to Data/Sys/GameConfig/GSSP8P.ini diff --git a/Data/User/GameConfig/GSTE69.ini b/Data/Sys/GameConfig/GSTE69.ini similarity index 100% rename from Data/User/GameConfig/GSTE69.ini rename to Data/Sys/GameConfig/GSTE69.ini diff --git a/Data/User/GameConfig/GSTP69.ini b/Data/Sys/GameConfig/GSTP69.ini similarity index 100% rename from Data/User/GameConfig/GSTP69.ini rename to Data/Sys/GameConfig/GSTP69.ini diff --git a/Data/User/GameConfig/GSWE64.ini b/Data/Sys/GameConfig/GSWE64.ini similarity index 100% rename from Data/User/GameConfig/GSWE64.ini rename to Data/Sys/GameConfig/GSWE64.ini diff --git a/Data/User/GameConfig/GSWP64.ini b/Data/Sys/GameConfig/GSWP64.ini similarity index 100% rename from Data/User/GameConfig/GSWP64.ini rename to Data/Sys/GameConfig/GSWP64.ini diff --git a/Data/User/GameConfig/GSWS64.ini b/Data/Sys/GameConfig/GSWS64.ini similarity index 100% rename from Data/User/GameConfig/GSWS64.ini rename to Data/Sys/GameConfig/GSWS64.ini diff --git a/Data/User/GameConfig/GSZP41.ini b/Data/Sys/GameConfig/GSZP41.ini similarity index 100% rename from Data/User/GameConfig/GSZP41.ini rename to Data/Sys/GameConfig/GSZP41.ini diff --git a/Data/User/GameConfig/GT3D52.ini b/Data/Sys/GameConfig/GT3D52.ini similarity index 100% rename from Data/User/GameConfig/GT3D52.ini rename to Data/Sys/GameConfig/GT3D52.ini diff --git a/Data/User/GameConfig/GT3E52.ini b/Data/Sys/GameConfig/GT3E52.ini similarity index 100% rename from Data/User/GameConfig/GT3E52.ini rename to Data/Sys/GameConfig/GT3E52.ini diff --git a/Data/User/GameConfig/GT3F52.ini b/Data/Sys/GameConfig/GT3F52.ini similarity index 100% rename from Data/User/GameConfig/GT3F52.ini rename to Data/Sys/GameConfig/GT3F52.ini diff --git a/Data/User/GameConfig/GT3P52.ini b/Data/Sys/GameConfig/GT3P52.ini similarity index 100% rename from Data/User/GameConfig/GT3P52.ini rename to Data/Sys/GameConfig/GT3P52.ini diff --git a/Data/User/GameConfig/GT6E70.ini b/Data/Sys/GameConfig/GT6E70.ini similarity index 100% rename from Data/User/GameConfig/GT6E70.ini rename to Data/Sys/GameConfig/GT6E70.ini diff --git a/Data/User/GameConfig/GT7E41.ini b/Data/Sys/GameConfig/GT7E41.ini similarity index 100% rename from Data/User/GameConfig/GT7E41.ini rename to Data/Sys/GameConfig/GT7E41.ini diff --git a/Data/User/GameConfig/GT7P41.ini b/Data/Sys/GameConfig/GT7P41.ini similarity index 100% rename from Data/User/GameConfig/GT7P41.ini rename to Data/Sys/GameConfig/GT7P41.ini diff --git a/Data/User/GameConfig/GT7X41.ini b/Data/Sys/GameConfig/GT7X41.ini similarity index 100% rename from Data/User/GameConfig/GT7X41.ini rename to Data/Sys/GameConfig/GT7X41.ini diff --git a/Data/User/GameConfig/GT8E78.ini b/Data/Sys/GameConfig/GT8E78.ini similarity index 100% rename from Data/User/GameConfig/GT8E78.ini rename to Data/Sys/GameConfig/GT8E78.ini diff --git a/Data/User/GameConfig/GTCJBL.ini b/Data/Sys/GameConfig/GTCJBL.ini similarity index 100% rename from Data/User/GameConfig/GTCJBL.ini rename to Data/Sys/GameConfig/GTCJBL.ini diff --git a/Data/User/GameConfig/GTEE01.ini b/Data/Sys/GameConfig/GTEE01.ini similarity index 100% rename from Data/User/GameConfig/GTEE01.ini rename to Data/Sys/GameConfig/GTEE01.ini diff --git a/Data/User/GameConfig/GTEP01.ini b/Data/Sys/GameConfig/GTEP01.ini similarity index 100% rename from Data/User/GameConfig/GTEP01.ini rename to Data/Sys/GameConfig/GTEP01.ini diff --git a/Data/User/GameConfig/GTFEA4.ini b/Data/Sys/GameConfig/GTFEA4.ini similarity index 100% rename from Data/User/GameConfig/GTFEA4.ini rename to Data/Sys/GameConfig/GTFEA4.ini diff --git a/Data/User/GameConfig/GTKE51.ini b/Data/Sys/GameConfig/GTKE51.ini similarity index 100% rename from Data/User/GameConfig/GTKE51.ini rename to Data/Sys/GameConfig/GTKE51.ini diff --git a/Data/User/GameConfig/GTKP51.ini b/Data/Sys/GameConfig/GTKP51.ini similarity index 100% rename from Data/User/GameConfig/GTKP51.ini rename to Data/Sys/GameConfig/GTKP51.ini diff --git a/Data/User/GameConfig/GTLE52.ini b/Data/Sys/GameConfig/GTLE52.ini similarity index 100% rename from Data/User/GameConfig/GTLE52.ini rename to Data/Sys/GameConfig/GTLE52.ini diff --git a/Data/User/GameConfig/GTLP52.ini b/Data/Sys/GameConfig/GTLP52.ini similarity index 100% rename from Data/User/GameConfig/GTLP52.ini rename to Data/Sys/GameConfig/GTLP52.ini diff --git a/Data/User/GameConfig/GTLX52.ini b/Data/Sys/GameConfig/GTLX52.ini similarity index 100% rename from Data/User/GameConfig/GTLX52.ini rename to Data/Sys/GameConfig/GTLX52.ini diff --git a/Data/User/GameConfig/GTSE4F.ini b/Data/Sys/GameConfig/GTSE4F.ini similarity index 100% rename from Data/User/GameConfig/GTSE4F.ini rename to Data/Sys/GameConfig/GTSE4F.ini diff --git a/Data/User/GameConfig/GTSP4F.ini b/Data/Sys/GameConfig/GTSP4F.ini similarity index 100% rename from Data/User/GameConfig/GTSP4F.ini rename to Data/Sys/GameConfig/GTSP4F.ini diff --git a/Data/User/GameConfig/GTUE8G.ini b/Data/Sys/GameConfig/GTUE8G.ini similarity index 100% rename from Data/User/GameConfig/GTUE8G.ini rename to Data/Sys/GameConfig/GTUE8G.ini diff --git a/Data/User/GameConfig/GTWE70.ini b/Data/Sys/GameConfig/GTWE70.ini similarity index 100% rename from Data/User/GameConfig/GTWE70.ini rename to Data/Sys/GameConfig/GTWE70.ini diff --git a/Data/User/GameConfig/GTWP70.ini b/Data/Sys/GameConfig/GTWP70.ini similarity index 100% rename from Data/User/GameConfig/GTWP70.ini rename to Data/Sys/GameConfig/GTWP70.ini diff --git a/Data/User/GameConfig/GTYE69.ini b/Data/Sys/GameConfig/GTYE69.ini similarity index 100% rename from Data/User/GameConfig/GTYE69.ini rename to Data/Sys/GameConfig/GTYE69.ini diff --git a/Data/User/GameConfig/GTYP69.ini b/Data/Sys/GameConfig/GTYP69.ini similarity index 100% rename from Data/User/GameConfig/GTYP69.ini rename to Data/Sys/GameConfig/GTYP69.ini diff --git a/Data/User/GameConfig/GTZE41.ini b/Data/Sys/GameConfig/GTZE41.ini similarity index 100% rename from Data/User/GameConfig/GTZE41.ini rename to Data/Sys/GameConfig/GTZE41.ini diff --git a/Data/User/GameConfig/GTZP41.ini b/Data/Sys/GameConfig/GTZP41.ini similarity index 100% rename from Data/User/GameConfig/GTZP41.ini rename to Data/Sys/GameConfig/GTZP41.ini diff --git a/Data/User/GameConfig/GUBE69.ini b/Data/Sys/GameConfig/GUBE69.ini similarity index 100% rename from Data/User/GameConfig/GUBE69.ini rename to Data/Sys/GameConfig/GUBE69.ini diff --git a/Data/User/GameConfig/GUBP69.ini b/Data/Sys/GameConfig/GUBP69.ini similarity index 100% rename from Data/User/GameConfig/GUBP69.ini rename to Data/Sys/GameConfig/GUBP69.ini diff --git a/Data/User/GameConfig/GUCP69.ini b/Data/Sys/GameConfig/GUCP69.ini similarity index 100% rename from Data/User/GameConfig/GUCP69.ini rename to Data/Sys/GameConfig/GUCP69.ini diff --git a/Data/User/GameConfig/GUFE4Z.ini b/Data/Sys/GameConfig/GUFE4Z.ini similarity index 100% rename from Data/User/GameConfig/GUFE4Z.ini rename to Data/Sys/GameConfig/GUFE4Z.ini diff --git a/Data/User/GameConfig/GUGE69.ini b/Data/Sys/GameConfig/GUGE69.ini similarity index 100% rename from Data/User/GameConfig/GUGE69.ini rename to Data/Sys/GameConfig/GUGE69.ini diff --git a/Data/User/GameConfig/GUME52.ini b/Data/Sys/GameConfig/GUME52.ini similarity index 100% rename from Data/User/GameConfig/GUME52.ini rename to Data/Sys/GameConfig/GUME52.ini diff --git a/Data/User/GameConfig/GUMP52.ini b/Data/Sys/GameConfig/GUMP52.ini similarity index 100% rename from Data/User/GameConfig/GUMP52.ini rename to Data/Sys/GameConfig/GUMP52.ini diff --git a/Data/User/GameConfig/GUNE5D.ini b/Data/Sys/GameConfig/GUNE5D.ini similarity index 100% rename from Data/User/GameConfig/GUNE5D.ini rename to Data/Sys/GameConfig/GUNE5D.ini diff --git a/Data/User/GameConfig/GUPE8P.ini b/Data/Sys/GameConfig/GUPE8P.ini similarity index 100% rename from Data/User/GameConfig/GUPE8P.ini rename to Data/Sys/GameConfig/GUPE8P.ini diff --git a/Data/User/GameConfig/GUPP8P.ini b/Data/Sys/GameConfig/GUPP8P.ini similarity index 100% rename from Data/User/GameConfig/GUPP8P.ini rename to Data/Sys/GameConfig/GUPP8P.ini diff --git a/Data/User/GameConfig/GUTE52.ini b/Data/Sys/GameConfig/GUTE52.ini similarity index 100% rename from Data/User/GameConfig/GUTE52.ini rename to Data/Sys/GameConfig/GUTE52.ini diff --git a/Data/User/GameConfig/GUVE51.ini b/Data/Sys/GameConfig/GUVE51.ini similarity index 100% rename from Data/User/GameConfig/GUVE51.ini rename to Data/Sys/GameConfig/GUVE51.ini diff --git a/Data/User/GameConfig/GUZE41.ini b/Data/Sys/GameConfig/GUZE41.ini similarity index 100% rename from Data/User/GameConfig/GUZE41.ini rename to Data/Sys/GameConfig/GUZE41.ini diff --git a/Data/User/GameConfig/GUZP41.ini b/Data/Sys/GameConfig/GUZP41.ini similarity index 100% rename from Data/User/GameConfig/GUZP41.ini rename to Data/Sys/GameConfig/GUZP41.ini diff --git a/Data/User/GameConfig/GV3E70.ini b/Data/Sys/GameConfig/GV3E70.ini similarity index 100% rename from Data/User/GameConfig/GV3E70.ini rename to Data/Sys/GameConfig/GV3E70.ini diff --git a/Data/User/GameConfig/GV3P70.ini b/Data/Sys/GameConfig/GV3P70.ini similarity index 100% rename from Data/User/GameConfig/GV3P70.ini rename to Data/Sys/GameConfig/GV3P70.ini diff --git a/Data/User/GameConfig/GVCE08.ini b/Data/Sys/GameConfig/GVCE08.ini similarity index 100% rename from Data/User/GameConfig/GVCE08.ini rename to Data/Sys/GameConfig/GVCE08.ini diff --git a/Data/User/GameConfig/GVCP08.ini b/Data/Sys/GameConfig/GVCP08.ini similarity index 100% rename from Data/User/GameConfig/GVCP08.ini rename to Data/Sys/GameConfig/GVCP08.ini diff --git a/Data/User/GameConfig/GVDE78.ini b/Data/Sys/GameConfig/GVDE78.ini similarity index 100% rename from Data/User/GameConfig/GVDE78.ini rename to Data/Sys/GameConfig/GVDE78.ini diff --git a/Data/User/GameConfig/GVHE4F.ini b/Data/Sys/GameConfig/GVHE4F.ini similarity index 100% rename from Data/User/GameConfig/GVHE4F.ini rename to Data/Sys/GameConfig/GVHE4F.ini diff --git a/Data/User/GameConfig/GVJE08.ini b/Data/Sys/GameConfig/GVJE08.ini similarity index 100% rename from Data/User/GameConfig/GVJE08.ini rename to Data/Sys/GameConfig/GVJE08.ini diff --git a/Data/User/GameConfig/GVJJ08.ini b/Data/Sys/GameConfig/GVJJ08.ini similarity index 100% rename from Data/User/GameConfig/GVJJ08.ini rename to Data/Sys/GameConfig/GVJJ08.ini diff --git a/Data/User/GameConfig/GVJP08.ini b/Data/Sys/GameConfig/GVJP08.ini similarity index 100% rename from Data/User/GameConfig/GVJP08.ini rename to Data/Sys/GameConfig/GVJP08.ini diff --git a/Data/User/GameConfig/GVKE52.ini b/Data/Sys/GameConfig/GVKE52.ini similarity index 100% rename from Data/User/GameConfig/GVKE52.ini rename to Data/Sys/GameConfig/GVKE52.ini diff --git a/Data/User/GameConfig/GVLD69.ini b/Data/Sys/GameConfig/GVLD69.ini similarity index 100% rename from Data/User/GameConfig/GVLD69.ini rename to Data/Sys/GameConfig/GVLD69.ini diff --git a/Data/User/GameConfig/GVLE69.ini b/Data/Sys/GameConfig/GVLE69.ini similarity index 100% rename from Data/User/GameConfig/GVLE69.ini rename to Data/Sys/GameConfig/GVLE69.ini diff --git a/Data/User/GameConfig/GVLF69.ini b/Data/Sys/GameConfig/GVLF69.ini similarity index 100% rename from Data/User/GameConfig/GVLF69.ini rename to Data/Sys/GameConfig/GVLF69.ini diff --git a/Data/User/GameConfig/GVLP69.ini b/Data/Sys/GameConfig/GVLP69.ini similarity index 100% rename from Data/User/GameConfig/GVLP69.ini rename to Data/Sys/GameConfig/GVLP69.ini diff --git a/Data/User/GameConfig/GVRE7H.ini b/Data/Sys/GameConfig/GVRE7H.ini similarity index 100% rename from Data/User/GameConfig/GVRE7H.ini rename to Data/Sys/GameConfig/GVRE7H.ini diff --git a/Data/User/GameConfig/GVSE8P.ini b/Data/Sys/GameConfig/GVSE8P.ini similarity index 100% rename from Data/User/GameConfig/GVSE8P.ini rename to Data/Sys/GameConfig/GVSE8P.ini diff --git a/Data/User/GameConfig/GVSP8P.ini b/Data/Sys/GameConfig/GVSP8P.ini similarity index 100% rename from Data/User/GameConfig/GVSP8P.ini rename to Data/Sys/GameConfig/GVSP8P.ini diff --git a/Data/User/GameConfig/GW2E78.ini b/Data/Sys/GameConfig/GW2E78.ini similarity index 100% rename from Data/User/GameConfig/GW2E78.ini rename to Data/Sys/GameConfig/GW2E78.ini diff --git a/Data/User/GameConfig/GW2P78.ini b/Data/Sys/GameConfig/GW2P78.ini similarity index 100% rename from Data/User/GameConfig/GW2P78.ini rename to Data/Sys/GameConfig/GW2P78.ini diff --git a/Data/User/GameConfig/GW3E78.ini b/Data/Sys/GameConfig/GW3E78.ini similarity index 100% rename from Data/User/GameConfig/GW3E78.ini rename to Data/Sys/GameConfig/GW3E78.ini diff --git a/Data/User/GameConfig/GW3P78.ini b/Data/Sys/GameConfig/GW3P78.ini similarity index 100% rename from Data/User/GameConfig/GW3P78.ini rename to Data/Sys/GameConfig/GW3P78.ini diff --git a/Data/User/GameConfig/GW5E69.ini b/Data/Sys/GameConfig/GW5E69.ini similarity index 100% rename from Data/User/GameConfig/GW5E69.ini rename to Data/Sys/GameConfig/GW5E69.ini diff --git a/Data/User/GameConfig/GW7E69.ini b/Data/Sys/GameConfig/GW7E69.ini similarity index 100% rename from Data/User/GameConfig/GW7E69.ini rename to Data/Sys/GameConfig/GW7E69.ini diff --git a/Data/User/GameConfig/GW7P69.ini b/Data/Sys/GameConfig/GW7P69.ini similarity index 100% rename from Data/User/GameConfig/GW7P69.ini rename to Data/Sys/GameConfig/GW7P69.ini diff --git a/Data/User/GameConfig/GW8E52.ini b/Data/Sys/GameConfig/GW8E52.ini similarity index 100% rename from Data/User/GameConfig/GW8E52.ini rename to Data/Sys/GameConfig/GW8E52.ini diff --git a/Data/User/GameConfig/GW9E78.ini b/Data/Sys/GameConfig/GW9E78.ini similarity index 100% rename from Data/User/GameConfig/GW9E78.ini rename to Data/Sys/GameConfig/GW9E78.ini diff --git a/Data/User/GameConfig/GWAE8P.ini b/Data/Sys/GameConfig/GWAE8P.ini similarity index 100% rename from Data/User/GameConfig/GWAE8P.ini rename to Data/Sys/GameConfig/GWAE8P.ini diff --git a/Data/User/GameConfig/GWAF8P.ini b/Data/Sys/GameConfig/GWAF8P.ini similarity index 100% rename from Data/User/GameConfig/GWAF8P.ini rename to Data/Sys/GameConfig/GWAF8P.ini diff --git a/Data/User/GameConfig/GWAP8P.ini b/Data/Sys/GameConfig/GWAP8P.ini similarity index 100% rename from Data/User/GameConfig/GWAP8P.ini rename to Data/Sys/GameConfig/GWAP8P.ini diff --git a/Data/User/GameConfig/GWBP41.ini b/Data/Sys/GameConfig/GWBP41.ini similarity index 100% rename from Data/User/GameConfig/GWBP41.ini rename to Data/Sys/GameConfig/GWBP41.ini diff --git a/Data/User/GameConfig/GWEE51.ini b/Data/Sys/GameConfig/GWEE51.ini similarity index 100% rename from Data/User/GameConfig/GWEE51.ini rename to Data/Sys/GameConfig/GWEE51.ini diff --git a/Data/User/GameConfig/GWEJB0.ini b/Data/Sys/GameConfig/GWEJB0.ini similarity index 100% rename from Data/User/GameConfig/GWEJB0.ini rename to Data/Sys/GameConfig/GWEJB0.ini diff --git a/Data/User/GameConfig/GWEP8P.ini b/Data/Sys/GameConfig/GWEP8P.ini similarity index 100% rename from Data/User/GameConfig/GWEP8P.ini rename to Data/Sys/GameConfig/GWEP8P.ini diff --git a/Data/User/GameConfig/GWGP4F.ini b/Data/Sys/GameConfig/GWGP4F.ini similarity index 100% rename from Data/User/GameConfig/GWGP4F.ini rename to Data/Sys/GameConfig/GWGP4F.ini diff --git a/Data/User/GameConfig/GWJE52.ini b/Data/Sys/GameConfig/GWJE52.ini similarity index 100% rename from Data/User/GameConfig/GWJE52.ini rename to Data/Sys/GameConfig/GWJE52.ini diff --git a/Data/User/GameConfig/GWKE41.ini b/Data/Sys/GameConfig/GWKE41.ini similarity index 100% rename from Data/User/GameConfig/GWKE41.ini rename to Data/Sys/GameConfig/GWKE41.ini diff --git a/Data/User/GameConfig/GWKP41.ini b/Data/Sys/GameConfig/GWKP41.ini similarity index 100% rename from Data/User/GameConfig/GWKP41.ini rename to Data/Sys/GameConfig/GWKP41.ini diff --git a/Data/User/GameConfig/GWLE6L.ini b/Data/Sys/GameConfig/GWLE6L.ini similarity index 100% rename from Data/User/GameConfig/GWLE6L.ini rename to Data/Sys/GameConfig/GWLE6L.ini diff --git a/Data/User/GameConfig/GWLX6L.ini b/Data/Sys/GameConfig/GWLX6L.ini similarity index 100% rename from Data/User/GameConfig/GWLX6L.ini rename to Data/Sys/GameConfig/GWLX6L.ini diff --git a/Data/User/GameConfig/GWME51.ini b/Data/Sys/GameConfig/GWME51.ini similarity index 100% rename from Data/User/GameConfig/GWME51.ini rename to Data/Sys/GameConfig/GWME51.ini diff --git a/Data/User/GameConfig/GWOE5G.ini b/Data/Sys/GameConfig/GWOE5G.ini similarity index 100% rename from Data/User/GameConfig/GWOE5G.ini rename to Data/Sys/GameConfig/GWOE5G.ini diff --git a/Data/User/GameConfig/GWPE78.ini b/Data/Sys/GameConfig/GWPE78.ini similarity index 100% rename from Data/User/GameConfig/GWPE78.ini rename to Data/Sys/GameConfig/GWPE78.ini diff --git a/Data/User/GameConfig/GWPJG2.ini b/Data/Sys/GameConfig/GWPJG2.ini similarity index 100% rename from Data/User/GameConfig/GWPJG2.ini rename to Data/Sys/GameConfig/GWPJG2.ini diff --git a/Data/User/GameConfig/GWPP78.ini b/Data/Sys/GameConfig/GWPP78.ini similarity index 100% rename from Data/User/GameConfig/GWPP78.ini rename to Data/Sys/GameConfig/GWPP78.ini diff --git a/Data/User/GameConfig/GWQE52.ini b/Data/Sys/GameConfig/GWQE52.ini similarity index 100% rename from Data/User/GameConfig/GWQE52.ini rename to Data/Sys/GameConfig/GWQE52.ini diff --git a/Data/User/GameConfig/GWRE01.ini b/Data/Sys/GameConfig/GWRE01.ini similarity index 100% rename from Data/User/GameConfig/GWRE01.ini rename to Data/Sys/GameConfig/GWRE01.ini diff --git a/Data/User/GameConfig/GWRP01.ini b/Data/Sys/GameConfig/GWRP01.ini similarity index 100% rename from Data/User/GameConfig/GWRP01.ini rename to Data/Sys/GameConfig/GWRP01.ini diff --git a/Data/User/GameConfig/GWSEA4.ini b/Data/Sys/GameConfig/GWSEA4.ini similarity index 100% rename from Data/User/GameConfig/GWSEA4.ini rename to Data/Sys/GameConfig/GWSEA4.ini diff --git a/Data/User/GameConfig/GWTEA4.ini b/Data/Sys/GameConfig/GWTEA4.ini similarity index 100% rename from Data/User/GameConfig/GWTEA4.ini rename to Data/Sys/GameConfig/GWTEA4.ini diff --git a/Data/User/GameConfig/GWVE52.ini b/Data/Sys/GameConfig/GWVE52.ini similarity index 100% rename from Data/User/GameConfig/GWVE52.ini rename to Data/Sys/GameConfig/GWVE52.ini diff --git a/Data/User/GameConfig/GWWE01.ini b/Data/Sys/GameConfig/GWWE01.ini similarity index 100% rename from Data/User/GameConfig/GWWE01.ini rename to Data/Sys/GameConfig/GWWE01.ini diff --git a/Data/User/GameConfig/GWWP01.ini b/Data/Sys/GameConfig/GWWP01.ini similarity index 100% rename from Data/User/GameConfig/GWWP01.ini rename to Data/Sys/GameConfig/GWWP01.ini diff --git a/Data/User/GameConfig/GWYE41.ini b/Data/Sys/GameConfig/GWYE41.ini similarity index 100% rename from Data/User/GameConfig/GWYE41.ini rename to Data/Sys/GameConfig/GWYE41.ini diff --git a/Data/User/GameConfig/GWYX41.ini b/Data/Sys/GameConfig/GWYX41.ini similarity index 100% rename from Data/User/GameConfig/GWYX41.ini rename to Data/Sys/GameConfig/GWYX41.ini diff --git a/Data/User/GameConfig/GWZE01.ini b/Data/Sys/GameConfig/GWZE01.ini similarity index 100% rename from Data/User/GameConfig/GWZE01.ini rename to Data/Sys/GameConfig/GWZE01.ini diff --git a/Data/User/GameConfig/GWZP01.ini b/Data/Sys/GameConfig/GWZP01.ini similarity index 100% rename from Data/User/GameConfig/GWZP01.ini rename to Data/Sys/GameConfig/GWZP01.ini diff --git a/Data/User/GameConfig/GX2E52.ini b/Data/Sys/GameConfig/GX2E52.ini similarity index 100% rename from Data/User/GameConfig/GX2E52.ini rename to Data/Sys/GameConfig/GX2E52.ini diff --git a/Data/User/GameConfig/GX2P52.ini b/Data/Sys/GameConfig/GX2P52.ini similarity index 100% rename from Data/User/GameConfig/GX2P52.ini rename to Data/Sys/GameConfig/GX2P52.ini diff --git a/Data/User/GameConfig/GX3E41.ini b/Data/Sys/GameConfig/GX3E41.ini similarity index 100% rename from Data/User/GameConfig/GX3E41.ini rename to Data/Sys/GameConfig/GX3E41.ini diff --git a/Data/User/GameConfig/GX3P41.ini b/Data/Sys/GameConfig/GX3P41.ini similarity index 100% rename from Data/User/GameConfig/GX3P41.ini rename to Data/Sys/GameConfig/GX3P41.ini diff --git a/Data/User/GameConfig/GX3X41.ini b/Data/Sys/GameConfig/GX3X41.ini similarity index 100% rename from Data/User/GameConfig/GX3X41.ini rename to Data/Sys/GameConfig/GX3X41.ini diff --git a/Data/User/GameConfig/GXBE69.ini b/Data/Sys/GameConfig/GXBE69.ini similarity index 100% rename from Data/User/GameConfig/GXBE69.ini rename to Data/Sys/GameConfig/GXBE69.ini diff --git a/Data/User/GameConfig/GXBP69.ini b/Data/Sys/GameConfig/GXBP69.ini similarity index 100% rename from Data/User/GameConfig/GXBP69.ini rename to Data/Sys/GameConfig/GXBP69.ini diff --git a/Data/User/GameConfig/GXCE01.ini b/Data/Sys/GameConfig/GXCE01.ini similarity index 100% rename from Data/User/GameConfig/GXCE01.ini rename to Data/Sys/GameConfig/GXCE01.ini diff --git a/Data/User/GameConfig/GXEE8P.ini b/Data/Sys/GameConfig/GXEE8P.ini similarity index 100% rename from Data/User/GameConfig/GXEE8P.ini rename to Data/Sys/GameConfig/GXEE8P.ini diff --git a/Data/User/GameConfig/GXEP8P.ini b/Data/Sys/GameConfig/GXEP8P.ini similarity index 100% rename from Data/User/GameConfig/GXEP8P.ini rename to Data/Sys/GameConfig/GXEP8P.ini diff --git a/Data/User/GameConfig/GXFE69.ini b/Data/Sys/GameConfig/GXFE69.ini similarity index 100% rename from Data/User/GameConfig/GXFE69.ini rename to Data/Sys/GameConfig/GXFE69.ini diff --git a/Data/User/GameConfig/GXFF69.ini b/Data/Sys/GameConfig/GXFF69.ini similarity index 100% rename from Data/User/GameConfig/GXFF69.ini rename to Data/Sys/GameConfig/GXFF69.ini diff --git a/Data/User/GameConfig/GXFP69.ini b/Data/Sys/GameConfig/GXFP69.ini similarity index 100% rename from Data/User/GameConfig/GXFP69.ini rename to Data/Sys/GameConfig/GXFP69.ini diff --git a/Data/User/GameConfig/GXGE08.ini b/Data/Sys/GameConfig/GXGE08.ini similarity index 100% rename from Data/User/GameConfig/GXGE08.ini rename to Data/Sys/GameConfig/GXGE08.ini diff --git a/Data/User/GameConfig/GXLE52.ini b/Data/Sys/GameConfig/GXLE52.ini similarity index 100% rename from Data/User/GameConfig/GXLE52.ini rename to Data/Sys/GameConfig/GXLE52.ini diff --git a/Data/User/GameConfig/GXLP52.ini b/Data/Sys/GameConfig/GXLP52.ini similarity index 100% rename from Data/User/GameConfig/GXLP52.ini rename to Data/Sys/GameConfig/GXLP52.ini diff --git a/Data/User/GameConfig/GXME52.ini b/Data/Sys/GameConfig/GXME52.ini similarity index 100% rename from Data/User/GameConfig/GXME52.ini rename to Data/Sys/GameConfig/GXME52.ini diff --git a/Data/User/GameConfig/GXNE5D.ini b/Data/Sys/GameConfig/GXNE5D.ini similarity index 100% rename from Data/User/GameConfig/GXNE5D.ini rename to Data/Sys/GameConfig/GXNE5D.ini diff --git a/Data/User/GameConfig/GXOE69.ini b/Data/Sys/GameConfig/GXOE69.ini similarity index 100% rename from Data/User/GameConfig/GXOE69.ini rename to Data/Sys/GameConfig/GXOE69.ini diff --git a/Data/User/GameConfig/GXOX69.ini b/Data/Sys/GameConfig/GXOX69.ini similarity index 100% rename from Data/User/GameConfig/GXOX69.ini rename to Data/Sys/GameConfig/GXOX69.ini diff --git a/Data/User/GameConfig/GXRE08.ini b/Data/Sys/GameConfig/GXRE08.ini similarity index 100% rename from Data/User/GameConfig/GXRE08.ini rename to Data/Sys/GameConfig/GXRE08.ini diff --git a/Data/User/GameConfig/GXSE8P.ini b/Data/Sys/GameConfig/GXSE8P.ini similarity index 100% rename from Data/User/GameConfig/GXSE8P.ini rename to Data/Sys/GameConfig/GXSE8P.ini diff --git a/Data/User/GameConfig/GXSP8P.ini b/Data/Sys/GameConfig/GXSP8P.ini similarity index 100% rename from Data/User/GameConfig/GXSP8P.ini rename to Data/Sys/GameConfig/GXSP8P.ini diff --git a/Data/User/GameConfig/GXXE01.ini b/Data/Sys/GameConfig/GXXE01.ini similarity index 100% rename from Data/User/GameConfig/GXXE01.ini rename to Data/Sys/GameConfig/GXXE01.ini diff --git a/Data/User/GameConfig/GXXP01.ini b/Data/Sys/GameConfig/GXXP01.ini similarity index 100% rename from Data/User/GameConfig/GXXP01.ini rename to Data/Sys/GameConfig/GXXP01.ini diff --git a/Data/User/GameConfig/GY2E01.ini b/Data/Sys/GameConfig/GY2E01.ini similarity index 100% rename from Data/User/GameConfig/GY2E01.ini rename to Data/Sys/GameConfig/GY2E01.ini diff --git a/Data/User/GameConfig/GYAE78.ini b/Data/Sys/GameConfig/GYAE78.ini similarity index 100% rename from Data/User/GameConfig/GYAE78.ini rename to Data/Sys/GameConfig/GYAE78.ini diff --git a/Data/User/GameConfig/GYBP01.ini b/Data/Sys/GameConfig/GYBP01.ini similarity index 100% rename from Data/User/GameConfig/GYBP01.ini rename to Data/Sys/GameConfig/GYBP01.ini diff --git a/Data/User/GameConfig/GYFEA4.ini b/Data/Sys/GameConfig/GYFEA4.ini similarity index 100% rename from Data/User/GameConfig/GYFEA4.ini rename to Data/Sys/GameConfig/GYFEA4.ini diff --git a/Data/User/GameConfig/GYKEB2.ini b/Data/Sys/GameConfig/GYKEB2.ini similarity index 100% rename from Data/User/GameConfig/GYKEB2.ini rename to Data/Sys/GameConfig/GYKEB2.ini diff --git a/Data/User/GameConfig/GYQP01.ini b/Data/Sys/GameConfig/GYQP01.ini similarity index 100% rename from Data/User/GameConfig/GYQP01.ini rename to Data/Sys/GameConfig/GYQP01.ini diff --git a/Data/User/GameConfig/GYRE41.ini b/Data/Sys/GameConfig/GYRE41.ini similarity index 100% rename from Data/User/GameConfig/GYRE41.ini rename to Data/Sys/GameConfig/GYRE41.ini diff --git a/Data/User/GameConfig/GYWD41.ini b/Data/Sys/GameConfig/GYWD41.ini similarity index 100% rename from Data/User/GameConfig/GYWD41.ini rename to Data/Sys/GameConfig/GYWD41.ini diff --git a/Data/User/GameConfig/GYWEE9.ini b/Data/Sys/GameConfig/GYWEE9.ini similarity index 100% rename from Data/User/GameConfig/GYWEE9.ini rename to Data/Sys/GameConfig/GYWEE9.ini diff --git a/Data/User/GameConfig/GYWP41.ini b/Data/Sys/GameConfig/GYWP41.ini similarity index 100% rename from Data/User/GameConfig/GYWP41.ini rename to Data/Sys/GameConfig/GYWP41.ini diff --git a/Data/User/GameConfig/GZ2E01.ini b/Data/Sys/GameConfig/GZ2E01.ini similarity index 100% rename from Data/User/GameConfig/GZ2E01.ini rename to Data/Sys/GameConfig/GZ2E01.ini diff --git a/Data/User/GameConfig/GZ2J01.ini b/Data/Sys/GameConfig/GZ2J01.ini similarity index 100% rename from Data/User/GameConfig/GZ2J01.ini rename to Data/Sys/GameConfig/GZ2J01.ini diff --git a/Data/User/GameConfig/GZ2P01.ini b/Data/Sys/GameConfig/GZ2P01.ini similarity index 100% rename from Data/User/GameConfig/GZ2P01.ini rename to Data/Sys/GameConfig/GZ2P01.ini diff --git a/Data/User/GameConfig/GZ3E70.ini b/Data/Sys/GameConfig/GZ3E70.ini similarity index 100% rename from Data/User/GameConfig/GZ3E70.ini rename to Data/Sys/GameConfig/GZ3E70.ini diff --git a/Data/User/GameConfig/GZ3PB2.ini b/Data/Sys/GameConfig/GZ3PB2.ini similarity index 100% rename from Data/User/GameConfig/GZ3PB2.ini rename to Data/Sys/GameConfig/GZ3PB2.ini diff --git a/Data/User/GameConfig/GZEE70.ini b/Data/Sys/GameConfig/GZEE70.ini similarity index 100% rename from Data/User/GameConfig/GZEE70.ini rename to Data/Sys/GameConfig/GZEE70.ini diff --git a/Data/User/GameConfig/GZLE01.ini b/Data/Sys/GameConfig/GZLE01.ini similarity index 100% rename from Data/User/GameConfig/GZLE01.ini rename to Data/Sys/GameConfig/GZLE01.ini diff --git a/Data/User/GameConfig/GZLJ01.ini b/Data/Sys/GameConfig/GZLJ01.ini similarity index 100% rename from Data/User/GameConfig/GZLJ01.ini rename to Data/Sys/GameConfig/GZLJ01.ini diff --git a/Data/User/GameConfig/GZLP01.ini b/Data/Sys/GameConfig/GZLP01.ini similarity index 100% rename from Data/User/GameConfig/GZLP01.ini rename to Data/Sys/GameConfig/GZLP01.ini diff --git a/Data/User/GameConfig/GZMP7D.ini b/Data/Sys/GameConfig/GZMP7D.ini similarity index 100% rename from Data/User/GameConfig/GZMP7D.ini rename to Data/Sys/GameConfig/GZMP7D.ini diff --git a/Data/User/GameConfig/GZPE70.ini b/Data/Sys/GameConfig/GZPE70.ini similarity index 100% rename from Data/User/GameConfig/GZPE70.ini rename to Data/Sys/GameConfig/GZPE70.ini diff --git a/Data/User/GameConfig/GZPP70.ini b/Data/Sys/GameConfig/GZPP70.ini similarity index 100% rename from Data/User/GameConfig/GZPP70.ini rename to Data/Sys/GameConfig/GZPP70.ini diff --git a/Data/User/GameConfig/GZSE70.ini b/Data/Sys/GameConfig/GZSE70.ini similarity index 100% rename from Data/User/GameConfig/GZSE70.ini rename to Data/Sys/GameConfig/GZSE70.ini diff --git a/Data/User/GameConfig/GZWE01.ini b/Data/Sys/GameConfig/GZWE01.ini similarity index 100% rename from Data/User/GameConfig/GZWE01.ini rename to Data/Sys/GameConfig/GZWE01.ini diff --git a/Data/User/GameConfig/GZWP01.ini b/Data/Sys/GameConfig/GZWP01.ini similarity index 100% rename from Data/User/GameConfig/GZWP01.ini rename to Data/Sys/GameConfig/GZWP01.ini diff --git a/Data/User/GameConfig/HAAA01.ini b/Data/Sys/GameConfig/HAAA01.ini similarity index 100% rename from Data/User/GameConfig/HAAA01.ini rename to Data/Sys/GameConfig/HAAA01.ini diff --git a/Data/User/GameConfig/HACA01.ini b/Data/Sys/GameConfig/HACA01.ini similarity index 100% rename from Data/User/GameConfig/HACA01.ini rename to Data/Sys/GameConfig/HACA01.ini diff --git a/Data/User/GameConfig/HADE01.ini b/Data/Sys/GameConfig/HADE01.ini similarity index 100% rename from Data/User/GameConfig/HADE01.ini rename to Data/Sys/GameConfig/HADE01.ini diff --git a/Data/User/GameConfig/HAXXHB.ini b/Data/Sys/GameConfig/HAXXHB.ini similarity index 100% rename from Data/User/GameConfig/HAXXHB.ini rename to Data/Sys/GameConfig/HAXXHB.ini diff --git a/Data/User/GameConfig/HAYA01.ini b/Data/Sys/GameConfig/HAYA01.ini similarity index 100% rename from Data/User/GameConfig/HAYA01.ini rename to Data/Sys/GameConfig/HAYA01.ini diff --git a/Data/User/GameConfig/HCFE01.ini b/Data/Sys/GameConfig/HCFE01.ini similarity index 100% rename from Data/User/GameConfig/HCFE01.ini rename to Data/Sys/GameConfig/HCFE01.ini diff --git a/Data/User/GameConfig/JAAE01.ini b/Data/Sys/GameConfig/JAAE01.ini similarity index 100% rename from Data/User/GameConfig/JAAE01.ini rename to Data/Sys/GameConfig/JAAE01.ini diff --git a/Data/User/GameConfig/JACP01.ini b/Data/Sys/GameConfig/JACP01.ini similarity index 100% rename from Data/User/GameConfig/JACP01.ini rename to Data/Sys/GameConfig/JACP01.ini diff --git a/Data/User/GameConfig/JADE01.ini b/Data/Sys/GameConfig/JADE01.ini similarity index 100% rename from Data/User/GameConfig/JADE01.ini rename to Data/Sys/GameConfig/JADE01.ini diff --git a/Data/User/GameConfig/JAEE01.ini b/Data/Sys/GameConfig/JAEE01.ini similarity index 100% rename from Data/User/GameConfig/JAEE01.ini rename to Data/Sys/GameConfig/JAEE01.ini diff --git a/Data/User/GameConfig/JBKE01.ini b/Data/Sys/GameConfig/JBKE01.ini similarity index 100% rename from Data/User/GameConfig/JBKE01.ini rename to Data/Sys/GameConfig/JBKE01.ini diff --git a/Data/User/GameConfig/JBKP01.ini b/Data/Sys/GameConfig/JBKP01.ini similarity index 100% rename from Data/User/GameConfig/JBKP01.ini rename to Data/Sys/GameConfig/JBKP01.ini diff --git a/Data/User/GameConfig/JCBE01.ini b/Data/Sys/GameConfig/JCBE01.ini similarity index 100% rename from Data/User/GameConfig/JCBE01.ini rename to Data/Sys/GameConfig/JCBE01.ini diff --git a/Data/User/GameConfig/JCWE01.ini b/Data/Sys/GameConfig/JCWE01.ini similarity index 100% rename from Data/User/GameConfig/JCWE01.ini rename to Data/Sys/GameConfig/JCWE01.ini diff --git a/Data/User/GameConfig/JODIHB.ini b/Data/Sys/GameConfig/JODIHB.ini similarity index 100% rename from Data/User/GameConfig/JODIHB.ini rename to Data/Sys/GameConfig/JODIHB.ini diff --git a/Data/User/GameConfig/NAAE01.ini b/Data/Sys/GameConfig/NAAE01.ini similarity index 100% rename from Data/User/GameConfig/NAAE01.ini rename to Data/Sys/GameConfig/NAAE01.ini diff --git a/Data/User/GameConfig/NAAP01.ini b/Data/Sys/GameConfig/NAAP01.ini similarity index 100% rename from Data/User/GameConfig/NAAP01.ini rename to Data/Sys/GameConfig/NAAP01.ini diff --git a/Data/User/GameConfig/NABE01.ini b/Data/Sys/GameConfig/NABE01.ini similarity index 100% rename from Data/User/GameConfig/NABE01.ini rename to Data/Sys/GameConfig/NABE01.ini diff --git a/Data/User/GameConfig/NACE01.ini b/Data/Sys/GameConfig/NACE01.ini similarity index 100% rename from Data/User/GameConfig/NACE01.ini rename to Data/Sys/GameConfig/NACE01.ini diff --git a/Data/User/GameConfig/NAEE01.ini b/Data/Sys/GameConfig/NAEE01.ini similarity index 100% rename from Data/User/GameConfig/NAEE01.ini rename to Data/Sys/GameConfig/NAEE01.ini diff --git a/Data/User/GameConfig/NAFP01.ini b/Data/Sys/GameConfig/NAFP01.ini similarity index 100% rename from Data/User/GameConfig/NAFP01.ini rename to Data/Sys/GameConfig/NAFP01.ini diff --git a/Data/User/GameConfig/NAHE01.ini b/Data/Sys/GameConfig/NAHE01.ini similarity index 100% rename from Data/User/GameConfig/NAHE01.ini rename to Data/Sys/GameConfig/NAHE01.ini diff --git a/Data/User/GameConfig/NAKE01.ini b/Data/Sys/GameConfig/NAKE01.ini similarity index 100% rename from Data/User/GameConfig/NAKE01.ini rename to Data/Sys/GameConfig/NAKE01.ini diff --git a/Data/User/GameConfig/NAKP01.ini b/Data/Sys/GameConfig/NAKP01.ini similarity index 100% rename from Data/User/GameConfig/NAKP01.ini rename to Data/Sys/GameConfig/NAKP01.ini diff --git a/Data/User/GameConfig/NANE01.ini b/Data/Sys/GameConfig/NANE01.ini similarity index 100% rename from Data/User/GameConfig/NANE01.ini rename to Data/Sys/GameConfig/NANE01.ini diff --git a/Data/User/GameConfig/NARP01.ini b/Data/Sys/GameConfig/NARP01.ini similarity index 100% rename from Data/User/GameConfig/NARP01.ini rename to Data/Sys/GameConfig/NARP01.ini diff --git a/Data/User/GameConfig/PC6E01.ini b/Data/Sys/GameConfig/PC6E01.ini similarity index 100% rename from Data/User/GameConfig/PC6E01.ini rename to Data/Sys/GameConfig/PC6E01.ini diff --git a/Data/User/GameConfig/PH_PRESETS.ini b/Data/Sys/GameConfig/PH_PRESETS.ini similarity index 100% rename from Data/User/GameConfig/PH_PRESETS.ini rename to Data/Sys/GameConfig/PH_PRESETS.ini diff --git a/Data/User/GameConfig/PM4E01.ini b/Data/Sys/GameConfig/PM4E01.ini similarity index 100% rename from Data/User/GameConfig/PM4E01.ini rename to Data/Sys/GameConfig/PM4E01.ini diff --git a/Data/User/GameConfig/PRJE01.ini b/Data/Sys/GameConfig/PRJE01.ini similarity index 100% rename from Data/User/GameConfig/PRJE01.ini rename to Data/Sys/GameConfig/PRJE01.ini diff --git a/Data/User/GameConfig/PZLE01.ini b/Data/Sys/GameConfig/PZLE01.ini similarity index 100% rename from Data/User/GameConfig/PZLE01.ini rename to Data/Sys/GameConfig/PZLE01.ini diff --git a/Data/User/GameConfig/PZLJ01.ini b/Data/Sys/GameConfig/PZLJ01.ini similarity index 100% rename from Data/User/GameConfig/PZLJ01.ini rename to Data/Sys/GameConfig/PZLJ01.ini diff --git a/Data/User/GameConfig/PZLP01.ini b/Data/Sys/GameConfig/PZLP01.ini similarity index 100% rename from Data/User/GameConfig/PZLP01.ini rename to Data/Sys/GameConfig/PZLP01.ini diff --git a/Data/User/GameConfig/R22E01.ini b/Data/Sys/GameConfig/R22E01.ini similarity index 100% rename from Data/User/GameConfig/R22E01.ini rename to Data/Sys/GameConfig/R22E01.ini diff --git a/Data/User/GameConfig/R22J01.ini b/Data/Sys/GameConfig/R22J01.ini similarity index 100% rename from Data/User/GameConfig/R22J01.ini rename to Data/Sys/GameConfig/R22J01.ini diff --git a/Data/User/GameConfig/R22P01.ini b/Data/Sys/GameConfig/R22P01.ini similarity index 100% rename from Data/User/GameConfig/R22P01.ini rename to Data/Sys/GameConfig/R22P01.ini diff --git a/Data/User/GameConfig/R29P52.ini b/Data/Sys/GameConfig/R29P52.ini similarity index 100% rename from Data/User/GameConfig/R29P52.ini rename to Data/Sys/GameConfig/R29P52.ini diff --git a/Data/User/GameConfig/R2GEXJ.ini b/Data/Sys/GameConfig/R2GEXJ.ini similarity index 100% rename from Data/User/GameConfig/R2GEXJ.ini rename to Data/Sys/GameConfig/R2GEXJ.ini diff --git a/Data/User/GameConfig/R2GJAF.ini b/Data/Sys/GameConfig/R2GJAF.ini similarity index 100% rename from Data/User/GameConfig/R2GJAF.ini rename to Data/Sys/GameConfig/R2GJAF.ini diff --git a/Data/User/GameConfig/R2GP99.ini b/Data/Sys/GameConfig/R2GP99.ini similarity index 100% rename from Data/User/GameConfig/R2GP99.ini rename to Data/Sys/GameConfig/R2GP99.ini diff --git a/Data/User/GameConfig/R2JJAF.ini b/Data/Sys/GameConfig/R2JJAF.ini similarity index 100% rename from Data/User/GameConfig/R2JJAF.ini rename to Data/Sys/GameConfig/R2JJAF.ini diff --git a/Data/User/GameConfig/R2KP54.ini b/Data/Sys/GameConfig/R2KP54.ini similarity index 100% rename from Data/User/GameConfig/R2KP54.ini rename to Data/Sys/GameConfig/R2KP54.ini diff --git a/Data/User/GameConfig/R2TE41.ini b/Data/Sys/GameConfig/R2TE41.ini similarity index 100% rename from Data/User/GameConfig/R2TE41.ini rename to Data/Sys/GameConfig/R2TE41.ini diff --git a/Data/User/GameConfig/R2UE8P.ini b/Data/Sys/GameConfig/R2UE8P.ini similarity index 100% rename from Data/User/GameConfig/R2UE8P.ini rename to Data/Sys/GameConfig/R2UE8P.ini diff --git a/Data/User/GameConfig/R2VJ01.ini b/Data/Sys/GameConfig/R2VJ01.ini similarity index 100% rename from Data/User/GameConfig/R2VJ01.ini rename to Data/Sys/GameConfig/R2VJ01.ini diff --git a/Data/User/GameConfig/R2VP01.ini b/Data/Sys/GameConfig/R2VP01.ini similarity index 100% rename from Data/User/GameConfig/R2VP01.ini rename to Data/Sys/GameConfig/R2VP01.ini diff --git a/Data/User/GameConfig/R3BE8P.ini b/Data/Sys/GameConfig/R3BE8P.ini similarity index 100% rename from Data/User/GameConfig/R3BE8P.ini rename to Data/Sys/GameConfig/R3BE8P.ini diff --git a/Data/User/GameConfig/R3BJ8P.ini b/Data/Sys/GameConfig/R3BJ8P.ini similarity index 100% rename from Data/User/GameConfig/R3BJ8P.ini rename to Data/Sys/GameConfig/R3BJ8P.ini diff --git a/Data/User/GameConfig/R3BP8P.ini b/Data/Sys/GameConfig/R3BP8P.ini similarity index 100% rename from Data/User/GameConfig/R3BP8P.ini rename to Data/Sys/GameConfig/R3BP8P.ini diff --git a/Data/User/GameConfig/R3CE20.ini b/Data/Sys/GameConfig/R3CE20.ini similarity index 100% rename from Data/User/GameConfig/R3CE20.ini rename to Data/Sys/GameConfig/R3CE20.ini diff --git a/Data/User/GameConfig/R3DES5.ini b/Data/Sys/GameConfig/R3DES5.ini similarity index 100% rename from Data/User/GameConfig/R3DES5.ini rename to Data/Sys/GameConfig/R3DES5.ini diff --git a/Data/User/GameConfig/R3DPS5.ini b/Data/Sys/GameConfig/R3DPS5.ini similarity index 100% rename from Data/User/GameConfig/R3DPS5.ini rename to Data/Sys/GameConfig/R3DPS5.ini diff --git a/Data/User/GameConfig/R3GXUG.ini b/Data/Sys/GameConfig/R3GXUG.ini similarity index 100% rename from Data/User/GameConfig/R3GXUG.ini rename to Data/Sys/GameConfig/R3GXUG.ini diff --git a/Data/User/GameConfig/R3ME01.ini b/Data/Sys/GameConfig/R3ME01.ini similarity index 100% rename from Data/User/GameConfig/R3ME01.ini rename to Data/Sys/GameConfig/R3ME01.ini diff --git a/Data/User/GameConfig/R3MP01.ini b/Data/Sys/GameConfig/R3MP01.ini similarity index 100% rename from Data/User/GameConfig/R3MP01.ini rename to Data/Sys/GameConfig/R3MP01.ini diff --git a/Data/User/GameConfig/R3NEXS.ini b/Data/Sys/GameConfig/R3NEXS.ini similarity index 100% rename from Data/User/GameConfig/R3NEXS.ini rename to Data/Sys/GameConfig/R3NEXS.ini diff --git a/Data/User/GameConfig/R3NPH3.ini b/Data/Sys/GameConfig/R3NPH3.ini similarity index 100% rename from Data/User/GameConfig/R3NPH3.ini rename to Data/Sys/GameConfig/R3NPH3.ini diff --git a/Data/User/GameConfig/R3OE01.ini b/Data/Sys/GameConfig/R3OE01.ini similarity index 100% rename from Data/User/GameConfig/R3OE01.ini rename to Data/Sys/GameConfig/R3OE01.ini diff --git a/Data/User/GameConfig/R3OJ01.ini b/Data/Sys/GameConfig/R3OJ01.ini similarity index 100% rename from Data/User/GameConfig/R3OJ01.ini rename to Data/Sys/GameConfig/R3OJ01.ini diff --git a/Data/User/GameConfig/R3OP01.ini b/Data/Sys/GameConfig/R3OP01.ini similarity index 100% rename from Data/User/GameConfig/R3OP01.ini rename to Data/Sys/GameConfig/R3OP01.ini diff --git a/Data/User/GameConfig/R3RE8P.ini b/Data/Sys/GameConfig/R3RE8P.ini similarity index 100% rename from Data/User/GameConfig/R3RE8P.ini rename to Data/Sys/GameConfig/R3RE8P.ini diff --git a/Data/User/GameConfig/R3RP8P.ini b/Data/Sys/GameConfig/R3RP8P.ini similarity index 100% rename from Data/User/GameConfig/R3RP8P.ini rename to Data/Sys/GameConfig/R3RP8P.ini diff --git a/Data/User/GameConfig/R3SP52.ini b/Data/Sys/GameConfig/R3SP52.ini similarity index 100% rename from Data/User/GameConfig/R3SP52.ini rename to Data/Sys/GameConfig/R3SP52.ini diff --git a/Data/User/GameConfig/R3TP54.ini b/Data/Sys/GameConfig/R3TP54.ini similarity index 100% rename from Data/User/GameConfig/R3TP54.ini rename to Data/Sys/GameConfig/R3TP54.ini diff --git a/Data/User/GameConfig/R46ENS.ini b/Data/Sys/GameConfig/R46ENS.ini similarity index 100% rename from Data/User/GameConfig/R46ENS.ini rename to Data/Sys/GameConfig/R46ENS.ini diff --git a/Data/User/GameConfig/R49P01.ini b/Data/Sys/GameConfig/R49P01.ini similarity index 100% rename from Data/User/GameConfig/R49P01.ini rename to Data/Sys/GameConfig/R49P01.ini diff --git a/Data/User/GameConfig/R4BPGT.ini b/Data/Sys/GameConfig/R4BPGT.ini similarity index 100% rename from Data/User/GameConfig/R4BPGT.ini rename to Data/Sys/GameConfig/R4BPGT.ini diff --git a/Data/User/GameConfig/R4EE01.ini b/Data/Sys/GameConfig/R4EE01.ini similarity index 100% rename from Data/User/GameConfig/R4EE01.ini rename to Data/Sys/GameConfig/R4EE01.ini diff --git a/Data/User/GameConfig/R4EJ01.ini b/Data/Sys/GameConfig/R4EJ01.ini similarity index 100% rename from Data/User/GameConfig/R4EJ01.ini rename to Data/Sys/GameConfig/R4EJ01.ini diff --git a/Data/User/GameConfig/R4EP01.ini b/Data/Sys/GameConfig/R4EP01.ini similarity index 100% rename from Data/User/GameConfig/R4EP01.ini rename to Data/Sys/GameConfig/R4EP01.ini diff --git a/Data/User/GameConfig/R4QE01.ini b/Data/Sys/GameConfig/R4QE01.ini similarity index 100% rename from Data/User/GameConfig/R4QE01.ini rename to Data/Sys/GameConfig/R4QE01.ini diff --git a/Data/User/GameConfig/R4QJ01.ini b/Data/Sys/GameConfig/R4QJ01.ini similarity index 100% rename from Data/User/GameConfig/R4QJ01.ini rename to Data/Sys/GameConfig/R4QJ01.ini diff --git a/Data/User/GameConfig/R4QK01.ini b/Data/Sys/GameConfig/R4QK01.ini similarity index 100% rename from Data/User/GameConfig/R4QK01.ini rename to Data/Sys/GameConfig/R4QK01.ini diff --git a/Data/User/GameConfig/R4QP01.ini b/Data/Sys/GameConfig/R4QP01.ini similarity index 100% rename from Data/User/GameConfig/R4QP01.ini rename to Data/Sys/GameConfig/R4QP01.ini diff --git a/Data/User/GameConfig/R4RP69.ini b/Data/Sys/GameConfig/R4RP69.ini similarity index 100% rename from Data/User/GameConfig/R4RP69.ini rename to Data/Sys/GameConfig/R4RP69.ini diff --git a/Data/User/GameConfig/R4ZJ01.ini b/Data/Sys/GameConfig/R4ZJ01.ini similarity index 100% rename from Data/User/GameConfig/R4ZJ01.ini rename to Data/Sys/GameConfig/R4ZJ01.ini diff --git a/Data/User/GameConfig/R5DE5G.ini b/Data/Sys/GameConfig/R5DE5G.ini similarity index 100% rename from Data/User/GameConfig/R5DE5G.ini rename to Data/Sys/GameConfig/R5DE5G.ini diff --git a/Data/User/GameConfig/R5IE4Q.ini b/Data/Sys/GameConfig/R5IE4Q.ini similarity index 100% rename from Data/User/GameConfig/R5IE4Q.ini rename to Data/Sys/GameConfig/R5IE4Q.ini diff --git a/Data/User/GameConfig/R5IP4Q.ini b/Data/Sys/GameConfig/R5IP4Q.ini similarity index 100% rename from Data/User/GameConfig/R5IP4Q.ini rename to Data/Sys/GameConfig/R5IP4Q.ini diff --git a/Data/User/GameConfig/R5IX4Q.ini b/Data/Sys/GameConfig/R5IX4Q.ini similarity index 100% rename from Data/User/GameConfig/R5IX4Q.ini rename to Data/Sys/GameConfig/R5IX4Q.ini diff --git a/Data/User/GameConfig/R5VE41.ini b/Data/Sys/GameConfig/R5VE41.ini similarity index 100% rename from Data/User/GameConfig/R5VE41.ini rename to Data/Sys/GameConfig/R5VE41.ini diff --git a/Data/User/GameConfig/R5VP41.ini b/Data/Sys/GameConfig/R5VP41.ini similarity index 100% rename from Data/User/GameConfig/R5VP41.ini rename to Data/Sys/GameConfig/R5VP41.ini diff --git a/Data/User/GameConfig/R5VX41.ini b/Data/Sys/GameConfig/R5VX41.ini similarity index 100% rename from Data/User/GameConfig/R5VX41.ini rename to Data/Sys/GameConfig/R5VX41.ini diff --git a/Data/User/GameConfig/R5WEA4.ini b/Data/Sys/GameConfig/R5WEA4.ini similarity index 100% rename from Data/User/GameConfig/R5WEA4.ini rename to Data/Sys/GameConfig/R5WEA4.ini diff --git a/Data/User/GameConfig/R5WJA4.ini b/Data/Sys/GameConfig/R5WJA4.ini similarity index 100% rename from Data/User/GameConfig/R5WJA4.ini rename to Data/Sys/GameConfig/R5WJA4.ini diff --git a/Data/User/GameConfig/R64E01.ini b/Data/Sys/GameConfig/R64E01.ini similarity index 100% rename from Data/User/GameConfig/R64E01.ini rename to Data/Sys/GameConfig/R64E01.ini diff --git a/Data/User/GameConfig/R64J01.ini b/Data/Sys/GameConfig/R64J01.ini similarity index 100% rename from Data/User/GameConfig/R64J01.ini rename to Data/Sys/GameConfig/R64J01.ini diff --git a/Data/User/GameConfig/R64K01.ini b/Data/Sys/GameConfig/R64K01.ini similarity index 100% rename from Data/User/GameConfig/R64K01.ini rename to Data/Sys/GameConfig/R64K01.ini diff --git a/Data/User/GameConfig/R64P01.ini b/Data/Sys/GameConfig/R64P01.ini similarity index 100% rename from Data/User/GameConfig/R64P01.ini rename to Data/Sys/GameConfig/R64P01.ini diff --git a/Data/User/GameConfig/R69E36.ini b/Data/Sys/GameConfig/R69E36.ini similarity index 100% rename from Data/User/GameConfig/R69E36.ini rename to Data/Sys/GameConfig/R69E36.ini diff --git a/Data/User/GameConfig/R6BE78.ini b/Data/Sys/GameConfig/R6BE78.ini similarity index 100% rename from Data/User/GameConfig/R6BE78.ini rename to Data/Sys/GameConfig/R6BE78.ini diff --git a/Data/User/GameConfig/R6BJ78.ini b/Data/Sys/GameConfig/R6BJ78.ini similarity index 100% rename from Data/User/GameConfig/R6BJ78.ini rename to Data/Sys/GameConfig/R6BJ78.ini diff --git a/Data/User/GameConfig/R6BK78.ini b/Data/Sys/GameConfig/R6BK78.ini similarity index 100% rename from Data/User/GameConfig/R6BK78.ini rename to Data/Sys/GameConfig/R6BK78.ini diff --git a/Data/User/GameConfig/R6BP78.ini b/Data/Sys/GameConfig/R6BP78.ini similarity index 100% rename from Data/User/GameConfig/R6BP78.ini rename to Data/Sys/GameConfig/R6BP78.ini diff --git a/Data/User/GameConfig/R6BX78.ini b/Data/Sys/GameConfig/R6BX78.ini similarity index 100% rename from Data/User/GameConfig/R6BX78.ini rename to Data/Sys/GameConfig/R6BX78.ini diff --git a/Data/User/GameConfig/R6NY41.ini b/Data/Sys/GameConfig/R6NY41.ini similarity index 100% rename from Data/User/GameConfig/R6NY41.ini rename to Data/Sys/GameConfig/R6NY41.ini diff --git a/Data/User/GameConfig/R6TEA4.ini b/Data/Sys/GameConfig/R6TEA4.ini similarity index 100% rename from Data/User/GameConfig/R6TEA4.ini rename to Data/Sys/GameConfig/R6TEA4.ini diff --git a/Data/User/GameConfig/R6YEXS.ini b/Data/Sys/GameConfig/R6YEXS.ini similarity index 100% rename from Data/User/GameConfig/R6YEXS.ini rename to Data/Sys/GameConfig/R6YEXS.ini diff --git a/Data/User/GameConfig/R6YPH3.ini b/Data/Sys/GameConfig/R6YPH3.ini similarity index 100% rename from Data/User/GameConfig/R6YPH3.ini rename to Data/Sys/GameConfig/R6YPH3.ini diff --git a/Data/User/GameConfig/R7EE8P.ini b/Data/Sys/GameConfig/R7EE8P.ini similarity index 100% rename from Data/User/GameConfig/R7EE8P.ini rename to Data/Sys/GameConfig/R7EE8P.ini diff --git a/Data/User/GameConfig/R7EJ8P.ini b/Data/Sys/GameConfig/R7EJ8P.ini similarity index 100% rename from Data/User/GameConfig/R7EJ8P.ini rename to Data/Sys/GameConfig/R7EJ8P.ini diff --git a/Data/User/GameConfig/R7EP8P.ini b/Data/Sys/GameConfig/R7EP8P.ini similarity index 100% rename from Data/User/GameConfig/R7EP8P.ini rename to Data/Sys/GameConfig/R7EP8P.ini diff --git a/Data/User/GameConfig/R7FEGD.ini b/Data/Sys/GameConfig/R7FEGD.ini similarity index 100% rename from Data/User/GameConfig/R7FEGD.ini rename to Data/Sys/GameConfig/R7FEGD.ini diff --git a/Data/User/GameConfig/R7FJGD.ini b/Data/Sys/GameConfig/R7FJGD.ini similarity index 100% rename from Data/User/GameConfig/R7FJGD.ini rename to Data/Sys/GameConfig/R7FJGD.ini diff --git a/Data/User/GameConfig/R7FPGD.ini b/Data/Sys/GameConfig/R7FPGD.ini similarity index 100% rename from Data/User/GameConfig/R7FPGD.ini rename to Data/Sys/GameConfig/R7FPGD.ini diff --git a/Data/User/GameConfig/R7GEAF.ini b/Data/Sys/GameConfig/R7GEAF.ini similarity index 100% rename from Data/User/GameConfig/R7GEAF.ini rename to Data/Sys/GameConfig/R7GEAF.ini diff --git a/Data/User/GameConfig/R7GJAF.ini b/Data/Sys/GameConfig/R7GJAF.ini similarity index 100% rename from Data/User/GameConfig/R7GJAF.ini rename to Data/Sys/GameConfig/R7GJAF.ini diff --git a/Data/User/GameConfig/R7GPAF.ini b/Data/Sys/GameConfig/R7GPAF.ini similarity index 100% rename from Data/User/GameConfig/R7GPAF.ini rename to Data/Sys/GameConfig/R7GPAF.ini diff --git a/Data/User/GameConfig/R7PE01.ini b/Data/Sys/GameConfig/R7PE01.ini similarity index 100% rename from Data/User/GameConfig/R7PE01.ini rename to Data/Sys/GameConfig/R7PE01.ini diff --git a/Data/User/GameConfig/R7PP01.ini b/Data/Sys/GameConfig/R7PP01.ini similarity index 100% rename from Data/User/GameConfig/R7PP01.ini rename to Data/Sys/GameConfig/R7PP01.ini diff --git a/Data/User/GameConfig/R7XE69.ini b/Data/Sys/GameConfig/R7XE69.ini similarity index 100% rename from Data/User/GameConfig/R7XE69.ini rename to Data/Sys/GameConfig/R7XE69.ini diff --git a/Data/User/GameConfig/R7XJ13.ini b/Data/Sys/GameConfig/R7XJ13.ini similarity index 100% rename from Data/User/GameConfig/R7XJ13.ini rename to Data/Sys/GameConfig/R7XJ13.ini diff --git a/Data/User/GameConfig/R7XP69.ini b/Data/Sys/GameConfig/R7XP69.ini similarity index 100% rename from Data/User/GameConfig/R7XP69.ini rename to Data/Sys/GameConfig/R7XP69.ini diff --git a/Data/User/GameConfig/R84EE9.ini b/Data/Sys/GameConfig/R84EE9.ini similarity index 100% rename from Data/User/GameConfig/R84EE9.ini rename to Data/Sys/GameConfig/R84EE9.ini diff --git a/Data/User/GameConfig/R84J99.ini b/Data/Sys/GameConfig/R84J99.ini similarity index 100% rename from Data/User/GameConfig/R84J99.ini rename to Data/Sys/GameConfig/R84J99.ini diff --git a/Data/User/GameConfig/R84P99.ini b/Data/Sys/GameConfig/R84P99.ini similarity index 100% rename from Data/User/GameConfig/R84P99.ini rename to Data/Sys/GameConfig/R84P99.ini diff --git a/Data/User/GameConfig/R8AE01.ini b/Data/Sys/GameConfig/R8AE01.ini similarity index 100% rename from Data/User/GameConfig/R8AE01.ini rename to Data/Sys/GameConfig/R8AE01.ini diff --git a/Data/User/GameConfig/R8AJ01.ini b/Data/Sys/GameConfig/R8AJ01.ini similarity index 100% rename from Data/User/GameConfig/R8AJ01.ini rename to Data/Sys/GameConfig/R8AJ01.ini diff --git a/Data/User/GameConfig/R8AP01.ini b/Data/Sys/GameConfig/R8AP01.ini similarity index 100% rename from Data/User/GameConfig/R8AP01.ini rename to Data/Sys/GameConfig/R8AP01.ini diff --git a/Data/User/GameConfig/R8DEA4.ini b/Data/Sys/GameConfig/R8DEA4.ini similarity index 100% rename from Data/User/GameConfig/R8DEA4.ini rename to Data/Sys/GameConfig/R8DEA4.ini diff --git a/Data/User/GameConfig/R8DJA4.ini b/Data/Sys/GameConfig/R8DJA4.ini similarity index 100% rename from Data/User/GameConfig/R8DJA4.ini rename to Data/Sys/GameConfig/R8DJA4.ini diff --git a/Data/User/GameConfig/R8DPA4.ini b/Data/Sys/GameConfig/R8DPA4.ini similarity index 100% rename from Data/User/GameConfig/R8DPA4.ini rename to Data/Sys/GameConfig/R8DPA4.ini diff --git a/Data/User/GameConfig/R8JEWR.ini b/Data/Sys/GameConfig/R8JEWR.ini similarity index 100% rename from Data/User/GameConfig/R8JEWR.ini rename to Data/Sys/GameConfig/R8JEWR.ini diff --git a/Data/User/GameConfig/R8JPWR.ini b/Data/Sys/GameConfig/R8JPWR.ini similarity index 100% rename from Data/User/GameConfig/R8JPWR.ini rename to Data/Sys/GameConfig/R8JPWR.ini diff --git a/Data/User/GameConfig/R8LE20.ini b/Data/Sys/GameConfig/R8LE20.ini similarity index 100% rename from Data/User/GameConfig/R8LE20.ini rename to Data/Sys/GameConfig/R8LE20.ini diff --git a/Data/User/GameConfig/R8LP7J.ini b/Data/Sys/GameConfig/R8LP7J.ini similarity index 100% rename from Data/User/GameConfig/R8LP7J.ini rename to Data/Sys/GameConfig/R8LP7J.ini diff --git a/Data/User/GameConfig/R8PE01.ini b/Data/Sys/GameConfig/R8PE01.ini similarity index 100% rename from Data/User/GameConfig/R8PE01.ini rename to Data/Sys/GameConfig/R8PE01.ini diff --git a/Data/User/GameConfig/R8PJ01.ini b/Data/Sys/GameConfig/R8PJ01.ini similarity index 100% rename from Data/User/GameConfig/R8PJ01.ini rename to Data/Sys/GameConfig/R8PJ01.ini diff --git a/Data/User/GameConfig/R8PK01.ini b/Data/Sys/GameConfig/R8PK01.ini similarity index 100% rename from Data/User/GameConfig/R8PK01.ini rename to Data/Sys/GameConfig/R8PK01.ini diff --git a/Data/User/GameConfig/R8PP01.ini b/Data/Sys/GameConfig/R8PP01.ini similarity index 100% rename from Data/User/GameConfig/R8PP01.ini rename to Data/Sys/GameConfig/R8PP01.ini diff --git a/Data/User/GameConfig/R8XE52.ini b/Data/Sys/GameConfig/R8XE52.ini similarity index 100% rename from Data/User/GameConfig/R8XE52.ini rename to Data/Sys/GameConfig/R8XE52.ini diff --git a/Data/User/GameConfig/R96EAF.ini b/Data/Sys/GameConfig/R96EAF.ini similarity index 100% rename from Data/User/GameConfig/R96EAF.ini rename to Data/Sys/GameConfig/R96EAF.ini diff --git a/Data/User/GameConfig/R9FP36.ini b/Data/Sys/GameConfig/R9FP36.ini similarity index 100% rename from Data/User/GameConfig/R9FP36.ini rename to Data/Sys/GameConfig/R9FP36.ini diff --git a/Data/User/GameConfig/R9IE01.ini b/Data/Sys/GameConfig/R9IE01.ini similarity index 100% rename from Data/User/GameConfig/R9IE01.ini rename to Data/Sys/GameConfig/R9IE01.ini diff --git a/Data/User/GameConfig/RB4E08.ini b/Data/Sys/GameConfig/RB4E08.ini similarity index 100% rename from Data/User/GameConfig/RB4E08.ini rename to Data/Sys/GameConfig/RB4E08.ini diff --git a/Data/User/GameConfig/RB4P08.ini b/Data/Sys/GameConfig/RB4P08.ini similarity index 100% rename from Data/User/GameConfig/RB4P08.ini rename to Data/Sys/GameConfig/RB4P08.ini diff --git a/Data/User/GameConfig/RBBE18.ini b/Data/Sys/GameConfig/RBBE18.ini similarity index 100% rename from Data/User/GameConfig/RBBE18.ini rename to Data/Sys/GameConfig/RBBE18.ini diff --git a/Data/User/GameConfig/RBBJ18.ini b/Data/Sys/GameConfig/RBBJ18.ini similarity index 100% rename from Data/User/GameConfig/RBBJ18.ini rename to Data/Sys/GameConfig/RBBJ18.ini diff --git a/Data/User/GameConfig/RBBP99.ini b/Data/Sys/GameConfig/RBBP99.ini similarity index 100% rename from Data/User/GameConfig/RBBP99.ini rename to Data/Sys/GameConfig/RBBP99.ini diff --git a/Data/User/GameConfig/RBHE08.ini b/Data/Sys/GameConfig/RBHE08.ini similarity index 100% rename from Data/User/GameConfig/RBHE08.ini rename to Data/Sys/GameConfig/RBHE08.ini diff --git a/Data/User/GameConfig/RBHJ08.ini b/Data/Sys/GameConfig/RBHJ08.ini similarity index 100% rename from Data/User/GameConfig/RBHJ08.ini rename to Data/Sys/GameConfig/RBHJ08.ini diff --git a/Data/User/GameConfig/RBHP08.ini b/Data/Sys/GameConfig/RBHP08.ini similarity index 100% rename from Data/User/GameConfig/RBHP08.ini rename to Data/Sys/GameConfig/RBHP08.ini diff --git a/Data/User/GameConfig/RBIEE9.ini b/Data/Sys/GameConfig/RBIEE9.ini similarity index 100% rename from Data/User/GameConfig/RBIEE9.ini rename to Data/Sys/GameConfig/RBIEE9.ini diff --git a/Data/User/GameConfig/RBIJ99.ini b/Data/Sys/GameConfig/RBIJ99.ini similarity index 100% rename from Data/User/GameConfig/RBIJ99.ini rename to Data/Sys/GameConfig/RBIJ99.ini diff --git a/Data/User/GameConfig/RBIP99.ini b/Data/Sys/GameConfig/RBIP99.ini similarity index 100% rename from Data/User/GameConfig/RBIP99.ini rename to Data/Sys/GameConfig/RBIP99.ini diff --git a/Data/User/GameConfig/RBKE69.ini b/Data/Sys/GameConfig/RBKE69.ini similarity index 100% rename from Data/User/GameConfig/RBKE69.ini rename to Data/Sys/GameConfig/RBKE69.ini diff --git a/Data/User/GameConfig/RBME5G.ini b/Data/Sys/GameConfig/RBME5G.ini similarity index 100% rename from Data/User/GameConfig/RBME5G.ini rename to Data/Sys/GameConfig/RBME5G.ini diff --git a/Data/User/GameConfig/RBQPUG.ini b/Data/Sys/GameConfig/RBQPUG.ini similarity index 100% rename from Data/User/GameConfig/RBQPUG.ini rename to Data/Sys/GameConfig/RBQPUG.ini diff --git a/Data/User/GameConfig/RBTP8P.ini b/Data/Sys/GameConfig/RBTP8P.ini similarity index 100% rename from Data/User/GameConfig/RBTP8P.ini rename to Data/Sys/GameConfig/RBTP8P.ini diff --git a/Data/User/GameConfig/RBUE08.ini b/Data/Sys/GameConfig/RBUE08.ini similarity index 100% rename from Data/User/GameConfig/RBUE08.ini rename to Data/Sys/GameConfig/RBUE08.ini diff --git a/Data/User/GameConfig/RBUP08.ini b/Data/Sys/GameConfig/RBUP08.ini similarity index 100% rename from Data/User/GameConfig/RBUP08.ini rename to Data/Sys/GameConfig/RBUP08.ini diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/Sys/GameConfig/RBWE01.ini similarity index 100% rename from Data/User/GameConfig/RBWE01.ini rename to Data/Sys/GameConfig/RBWE01.ini diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/Sys/GameConfig/RBWJ01.ini similarity index 100% rename from Data/User/GameConfig/RBWJ01.ini rename to Data/Sys/GameConfig/RBWJ01.ini diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/Sys/GameConfig/RBWP01.ini similarity index 100% rename from Data/User/GameConfig/RBWP01.ini rename to Data/Sys/GameConfig/RBWP01.ini diff --git a/Data/User/GameConfig/RBXJ8P.ini b/Data/Sys/GameConfig/RBXJ8P.ini similarity index 100% rename from Data/User/GameConfig/RBXJ8P.ini rename to Data/Sys/GameConfig/RBXJ8P.ini diff --git a/Data/User/GameConfig/RBZXUG.ini b/Data/Sys/GameConfig/RBZXUG.ini similarity index 100% rename from Data/User/GameConfig/RBZXUG.ini rename to Data/Sys/GameConfig/RBZXUG.ini diff --git a/Data/User/GameConfig/RCJE8P.ini b/Data/Sys/GameConfig/RCJE8P.ini similarity index 100% rename from Data/User/GameConfig/RCJE8P.ini rename to Data/Sys/GameConfig/RCJE8P.ini diff --git a/Data/User/GameConfig/RCJP8P.ini b/Data/Sys/GameConfig/RCJP8P.ini similarity index 100% rename from Data/User/GameConfig/RCJP8P.ini rename to Data/Sys/GameConfig/RCJP8P.ini diff --git a/Data/User/GameConfig/RCKPGN.ini b/Data/Sys/GameConfig/RCKPGN.ini similarity index 100% rename from Data/User/GameConfig/RCKPGN.ini rename to Data/Sys/GameConfig/RCKPGN.ini diff --git a/Data/User/GameConfig/RCPE18.ini b/Data/Sys/GameConfig/RCPE18.ini similarity index 100% rename from Data/User/GameConfig/RCPE18.ini rename to Data/Sys/GameConfig/RCPE18.ini diff --git a/Data/User/GameConfig/RD2E41.ini b/Data/Sys/GameConfig/RD2E41.ini similarity index 100% rename from Data/User/GameConfig/RD2E41.ini rename to Data/Sys/GameConfig/RD2E41.ini diff --git a/Data/User/GameConfig/RD2J41.ini b/Data/Sys/GameConfig/RD2J41.ini similarity index 100% rename from Data/User/GameConfig/RD2J41.ini rename to Data/Sys/GameConfig/RD2J41.ini diff --git a/Data/User/GameConfig/RD2K41.ini b/Data/Sys/GameConfig/RD2K41.ini similarity index 100% rename from Data/User/GameConfig/RD2K41.ini rename to Data/Sys/GameConfig/RD2K41.ini diff --git a/Data/User/GameConfig/RD2P41.ini b/Data/Sys/GameConfig/RD2P41.ini similarity index 100% rename from Data/User/GameConfig/RD2P41.ini rename to Data/Sys/GameConfig/RD2P41.ini diff --git a/Data/User/GameConfig/RD2X41.ini b/Data/Sys/GameConfig/RD2X41.ini similarity index 100% rename from Data/User/GameConfig/RD2X41.ini rename to Data/Sys/GameConfig/RD2X41.ini diff --git a/Data/User/GameConfig/RDBPAF.ini b/Data/Sys/GameConfig/RDBPAF.ini similarity index 100% rename from Data/User/GameConfig/RDBPAF.ini rename to Data/Sys/GameConfig/RDBPAF.ini diff --git a/Data/User/GameConfig/RDFP41.ini b/Data/Sys/GameConfig/RDFP41.ini similarity index 100% rename from Data/User/GameConfig/RDFP41.ini rename to Data/Sys/GameConfig/RDFP41.ini diff --git a/Data/User/GameConfig/RDGPA4.ini b/Data/Sys/GameConfig/RDGPA4.ini similarity index 100% rename from Data/User/GameConfig/RDGPA4.ini rename to Data/Sys/GameConfig/RDGPA4.ini diff --git a/Data/User/GameConfig/RDHP78.ini b/Data/Sys/GameConfig/RDHP78.ini similarity index 100% rename from Data/User/GameConfig/RDHP78.ini rename to Data/Sys/GameConfig/RDHP78.ini diff --git a/Data/User/GameConfig/RDIE41.ini b/Data/Sys/GameConfig/RDIE41.ini similarity index 100% rename from Data/User/GameConfig/RDIE41.ini rename to Data/Sys/GameConfig/RDIE41.ini diff --git a/Data/User/GameConfig/RDKE01.ini b/Data/Sys/GameConfig/RDKE01.ini similarity index 100% rename from Data/User/GameConfig/RDKE01.ini rename to Data/Sys/GameConfig/RDKE01.ini diff --git a/Data/User/GameConfig/RDQEGD.ini b/Data/Sys/GameConfig/RDQEGD.ini similarity index 100% rename from Data/User/GameConfig/RDQEGD.ini rename to Data/Sys/GameConfig/RDQEGD.ini diff --git a/Data/User/GameConfig/RDSE70.ini b/Data/Sys/GameConfig/RDSE70.ini similarity index 100% rename from Data/User/GameConfig/RDSE70.ini rename to Data/Sys/GameConfig/RDSE70.ini diff --git a/Data/User/GameConfig/RDSJAF.ini b/Data/Sys/GameConfig/RDSJAF.ini similarity index 100% rename from Data/User/GameConfig/RDSJAF.ini rename to Data/Sys/GameConfig/RDSJAF.ini diff --git a/Data/User/GameConfig/RDSPAF.ini b/Data/Sys/GameConfig/RDSPAF.ini similarity index 100% rename from Data/User/GameConfig/RDSPAF.ini rename to Data/Sys/GameConfig/RDSPAF.ini diff --git a/Data/User/GameConfig/RDVE41.ini b/Data/Sys/GameConfig/RDVE41.ini similarity index 100% rename from Data/User/GameConfig/RDVE41.ini rename to Data/Sys/GameConfig/RDVE41.ini diff --git a/Data/User/GameConfig/RDXP18.ini b/Data/Sys/GameConfig/RDXP18.ini similarity index 100% rename from Data/User/GameConfig/RDXP18.ini rename to Data/Sys/GameConfig/RDXP18.ini diff --git a/Data/User/GameConfig/RDZJ01.ini b/Data/Sys/GameConfig/RDZJ01.ini similarity index 100% rename from Data/User/GameConfig/RDZJ01.ini rename to Data/Sys/GameConfig/RDZJ01.ini diff --git a/Data/User/GameConfig/RDZP01.ini b/Data/Sys/GameConfig/RDZP01.ini similarity index 100% rename from Data/User/GameConfig/RDZP01.ini rename to Data/Sys/GameConfig/RDZP01.ini diff --git a/Data/User/GameConfig/RE4E08.ini b/Data/Sys/GameConfig/RE4E08.ini similarity index 100% rename from Data/User/GameConfig/RE4E08.ini rename to Data/Sys/GameConfig/RE4E08.ini diff --git a/Data/User/GameConfig/RE4J08.ini b/Data/Sys/GameConfig/RE4J08.ini similarity index 100% rename from Data/User/GameConfig/RE4J08.ini rename to Data/Sys/GameConfig/RE4J08.ini diff --git a/Data/User/GameConfig/RE4P08.ini b/Data/Sys/GameConfig/RE4P08.ini similarity index 100% rename from Data/User/GameConfig/RE4P08.ini rename to Data/Sys/GameConfig/RE4P08.ini diff --git a/Data/User/GameConfig/REDE41.ini b/Data/Sys/GameConfig/REDE41.ini similarity index 100% rename from Data/User/GameConfig/REDE41.ini rename to Data/Sys/GameConfig/REDE41.ini diff --git a/Data/User/GameConfig/REDJ41.ini b/Data/Sys/GameConfig/REDJ41.ini similarity index 100% rename from Data/User/GameConfig/REDJ41.ini rename to Data/Sys/GameConfig/REDJ41.ini diff --git a/Data/User/GameConfig/REDP41.ini b/Data/Sys/GameConfig/REDP41.ini similarity index 100% rename from Data/User/GameConfig/REDP41.ini rename to Data/Sys/GameConfig/REDP41.ini diff --git a/Data/User/GameConfig/RELJAB.ini b/Data/Sys/GameConfig/RELJAB.ini similarity index 100% rename from Data/User/GameConfig/RELJAB.ini rename to Data/Sys/GameConfig/RELJAB.ini diff --git a/Data/User/GameConfig/RELS01.ini b/Data/Sys/GameConfig/RELS01.ini similarity index 100% rename from Data/User/GameConfig/RELS01.ini rename to Data/Sys/GameConfig/RELS01.ini diff --git a/Data/User/GameConfig/RENE8P.ini b/Data/Sys/GameConfig/RENE8P.ini similarity index 100% rename from Data/User/GameConfig/RENE8P.ini rename to Data/Sys/GameConfig/RENE8P.ini diff --git a/Data/User/GameConfig/RENJ8P.ini b/Data/Sys/GameConfig/RENJ8P.ini similarity index 100% rename from Data/User/GameConfig/RENJ8P.ini rename to Data/Sys/GameConfig/RENJ8P.ini diff --git a/Data/User/GameConfig/RENP8P.ini b/Data/Sys/GameConfig/RENP8P.ini similarity index 100% rename from Data/User/GameConfig/RENP8P.ini rename to Data/Sys/GameConfig/RENP8P.ini diff --git a/Data/User/GameConfig/REXP01.ini b/Data/Sys/GameConfig/REXP01.ini similarity index 100% rename from Data/User/GameConfig/REXP01.ini rename to Data/Sys/GameConfig/REXP01.ini diff --git a/Data/User/GameConfig/RF4P6M.ini b/Data/Sys/GameConfig/RF4P6M.ini similarity index 100% rename from Data/User/GameConfig/RF4P6M.ini rename to Data/Sys/GameConfig/RF4P6M.ini diff --git a/Data/User/GameConfig/RF7J08.ini b/Data/Sys/GameConfig/RF7J08.ini similarity index 100% rename from Data/User/GameConfig/RF7J08.ini rename to Data/Sys/GameConfig/RF7J08.ini diff --git a/Data/User/GameConfig/RFBE01.ini b/Data/Sys/GameConfig/RFBE01.ini similarity index 100% rename from Data/User/GameConfig/RFBE01.ini rename to Data/Sys/GameConfig/RFBE01.ini diff --git a/Data/User/GameConfig/RFBJ01.ini b/Data/Sys/GameConfig/RFBJ01.ini similarity index 100% rename from Data/User/GameConfig/RFBJ01.ini rename to Data/Sys/GameConfig/RFBJ01.ini diff --git a/Data/User/GameConfig/RFBP01.ini b/Data/Sys/GameConfig/RFBP01.ini similarity index 100% rename from Data/User/GameConfig/RFBP01.ini rename to Data/Sys/GameConfig/RFBP01.ini diff --git a/Data/User/GameConfig/RFCEGD.ini b/Data/Sys/GameConfig/RFCEGD.ini similarity index 100% rename from Data/User/GameConfig/RFCEGD.ini rename to Data/Sys/GameConfig/RFCEGD.ini diff --git a/Data/User/GameConfig/RFCJGD.ini b/Data/Sys/GameConfig/RFCJGD.ini similarity index 100% rename from Data/User/GameConfig/RFCJGD.ini rename to Data/Sys/GameConfig/RFCJGD.ini diff --git a/Data/User/GameConfig/RFCPGD.ini b/Data/Sys/GameConfig/RFCPGD.ini similarity index 100% rename from Data/User/GameConfig/RFCPGD.ini rename to Data/Sys/GameConfig/RFCPGD.ini diff --git a/Data/User/GameConfig/RFEE01.ini b/Data/Sys/GameConfig/RFEE01.ini similarity index 100% rename from Data/User/GameConfig/RFEE01.ini rename to Data/Sys/GameConfig/RFEE01.ini diff --git a/Data/User/GameConfig/RFEJ01.ini b/Data/Sys/GameConfig/RFEJ01.ini similarity index 100% rename from Data/User/GameConfig/RFEJ01.ini rename to Data/Sys/GameConfig/RFEJ01.ini diff --git a/Data/User/GameConfig/RFEP01.ini b/Data/Sys/GameConfig/RFEP01.ini similarity index 100% rename from Data/User/GameConfig/RFEP01.ini rename to Data/Sys/GameConfig/RFEP01.ini diff --git a/Data/User/GameConfig/RFFEGD.ini b/Data/Sys/GameConfig/RFFEGD.ini similarity index 100% rename from Data/User/GameConfig/RFFEGD.ini rename to Data/Sys/GameConfig/RFFEGD.ini diff --git a/Data/User/GameConfig/RFFJGD.ini b/Data/Sys/GameConfig/RFFJGD.ini similarity index 100% rename from Data/User/GameConfig/RFFJGD.ini rename to Data/Sys/GameConfig/RFFJGD.ini diff --git a/Data/User/GameConfig/RFFPGD.ini b/Data/Sys/GameConfig/RFFPGD.ini similarity index 100% rename from Data/User/GameConfig/RFFPGD.ini rename to Data/Sys/GameConfig/RFFPGD.ini diff --git a/Data/User/GameConfig/RFQP69.ini b/Data/Sys/GameConfig/RFQP69.ini similarity index 100% rename from Data/User/GameConfig/RFQP69.ini rename to Data/Sys/GameConfig/RFQP69.ini diff --git a/Data/User/GameConfig/RFSEEB.ini b/Data/Sys/GameConfig/RFSEEB.ini similarity index 100% rename from Data/User/GameConfig/RFSEEB.ini rename to Data/Sys/GameConfig/RFSEEB.ini diff --git a/Data/User/GameConfig/RFSJ8P.ini b/Data/Sys/GameConfig/RFSJ8P.ini similarity index 100% rename from Data/User/GameConfig/RFSJ8P.ini rename to Data/Sys/GameConfig/RFSJ8P.ini diff --git a/Data/User/GameConfig/RG5PWR.ini b/Data/Sys/GameConfig/RG5PWR.ini similarity index 100% rename from Data/User/GameConfig/RG5PWR.ini rename to Data/Sys/GameConfig/RG5PWR.ini diff --git a/Data/User/GameConfig/RGAE8P.ini b/Data/Sys/GameConfig/RGAE8P.ini similarity index 100% rename from Data/User/GameConfig/RGAE8P.ini rename to Data/Sys/GameConfig/RGAE8P.ini diff --git a/Data/User/GameConfig/RGHE52.ini b/Data/Sys/GameConfig/RGHE52.ini similarity index 100% rename from Data/User/GameConfig/RGHE52.ini rename to Data/Sys/GameConfig/RGHE52.ini diff --git a/Data/User/GameConfig/RGLE7D.ini b/Data/Sys/GameConfig/RGLE7D.ini similarity index 100% rename from Data/User/GameConfig/RGLE7D.ini rename to Data/Sys/GameConfig/RGLE7D.ini diff --git a/Data/User/GameConfig/RGQE70.ini b/Data/Sys/GameConfig/RGQE70.ini similarity index 100% rename from Data/User/GameConfig/RGQE70.ini rename to Data/Sys/GameConfig/RGQE70.ini diff --git a/Data/User/GameConfig/RGVP52.ini b/Data/Sys/GameConfig/RGVP52.ini similarity index 100% rename from Data/User/GameConfig/RGVP52.ini rename to Data/Sys/GameConfig/RGVP52.ini diff --git a/Data/User/GameConfig/RH2P41.ini b/Data/Sys/GameConfig/RH2P41.ini similarity index 100% rename from Data/User/GameConfig/RH2P41.ini rename to Data/Sys/GameConfig/RH2P41.ini diff --git a/Data/User/GameConfig/RH8E4F.ini b/Data/Sys/GameConfig/RH8E4F.ini similarity index 100% rename from Data/User/GameConfig/RH8E4F.ini rename to Data/Sys/GameConfig/RH8E4F.ini diff --git a/Data/User/GameConfig/RH8JEL.ini b/Data/Sys/GameConfig/RH8JEL.ini similarity index 100% rename from Data/User/GameConfig/RH8JEL.ini rename to Data/Sys/GameConfig/RH8JEL.ini diff --git a/Data/User/GameConfig/RH8P4F.ini b/Data/Sys/GameConfig/RH8P4F.ini similarity index 100% rename from Data/User/GameConfig/RH8P4F.ini rename to Data/Sys/GameConfig/RH8P4F.ini diff --git a/Data/User/GameConfig/RH8X4F.ini b/Data/Sys/GameConfig/RH8X4F.ini similarity index 100% rename from Data/User/GameConfig/RH8X4F.ini rename to Data/Sys/GameConfig/RH8X4F.ini diff --git a/Data/User/GameConfig/RHAE01.ini b/Data/Sys/GameConfig/RHAE01.ini similarity index 100% rename from Data/User/GameConfig/RHAE01.ini rename to Data/Sys/GameConfig/RHAE01.ini diff --git a/Data/User/GameConfig/RHAJ01.ini b/Data/Sys/GameConfig/RHAJ01.ini similarity index 100% rename from Data/User/GameConfig/RHAJ01.ini rename to Data/Sys/GameConfig/RHAJ01.ini diff --git a/Data/User/GameConfig/RHAK01.ini b/Data/Sys/GameConfig/RHAK01.ini similarity index 100% rename from Data/User/GameConfig/RHAK01.ini rename to Data/Sys/GameConfig/RHAK01.ini diff --git a/Data/User/GameConfig/RHAP01.ini b/Data/Sys/GameConfig/RHAP01.ini similarity index 100% rename from Data/User/GameConfig/RHAP01.ini rename to Data/Sys/GameConfig/RHAP01.ini diff --git a/Data/User/GameConfig/RHAW01.ini b/Data/Sys/GameConfig/RHAW01.ini similarity index 100% rename from Data/User/GameConfig/RHAW01.ini rename to Data/Sys/GameConfig/RHAW01.ini diff --git a/Data/User/GameConfig/RHDE8P.ini b/Data/Sys/GameConfig/RHDE8P.ini similarity index 100% rename from Data/User/GameConfig/RHDE8P.ini rename to Data/Sys/GameConfig/RHDE8P.ini diff --git a/Data/User/GameConfig/RHDJ8P.ini b/Data/Sys/GameConfig/RHDJ8P.ini similarity index 100% rename from Data/User/GameConfig/RHDJ8P.ini rename to Data/Sys/GameConfig/RHDJ8P.ini diff --git a/Data/User/GameConfig/RHDP8P.ini b/Data/Sys/GameConfig/RHDP8P.ini similarity index 100% rename from Data/User/GameConfig/RHDP8P.ini rename to Data/Sys/GameConfig/RHDP8P.ini diff --git a/Data/User/GameConfig/RHMEE9.ini b/Data/Sys/GameConfig/RHMEE9.ini similarity index 100% rename from Data/User/GameConfig/RHMEE9.ini rename to Data/Sys/GameConfig/RHMEE9.ini diff --git a/Data/User/GameConfig/RHMP99.ini b/Data/Sys/GameConfig/RHMP99.ini similarity index 100% rename from Data/User/GameConfig/RHMP99.ini rename to Data/Sys/GameConfig/RHMP99.ini diff --git a/Data/User/GameConfig/RHOE8P.ini b/Data/Sys/GameConfig/RHOE8P.ini similarity index 100% rename from Data/User/GameConfig/RHOE8P.ini rename to Data/Sys/GameConfig/RHOE8P.ini diff --git a/Data/User/GameConfig/RHOJ8P.ini b/Data/Sys/GameConfig/RHOJ8P.ini similarity index 100% rename from Data/User/GameConfig/RHOJ8P.ini rename to Data/Sys/GameConfig/RHOJ8P.ini diff --git a/Data/User/GameConfig/RHOP8P.ini b/Data/Sys/GameConfig/RHOP8P.ini similarity index 100% rename from Data/User/GameConfig/RHOP8P.ini rename to Data/Sys/GameConfig/RHOP8P.ini diff --git a/Data/User/GameConfig/RHTP54.ini b/Data/Sys/GameConfig/RHTP54.ini similarity index 100% rename from Data/User/GameConfig/RHTP54.ini rename to Data/Sys/GameConfig/RHTP54.ini diff --git a/Data/User/GameConfig/RHUP7J.ini b/Data/Sys/GameConfig/RHUP7J.ini similarity index 100% rename from Data/User/GameConfig/RHUP7J.ini rename to Data/Sys/GameConfig/RHUP7J.ini diff --git a/Data/User/GameConfig/RIBPKM.ini b/Data/Sys/GameConfig/RIBPKM.ini similarity index 100% rename from Data/User/GameConfig/RIBPKM.ini rename to Data/Sys/GameConfig/RIBPKM.ini diff --git a/Data/User/GameConfig/RIHP8P.ini b/Data/Sys/GameConfig/RIHP8P.ini similarity index 100% rename from Data/User/GameConfig/RIHP8P.ini rename to Data/Sys/GameConfig/RIHP8P.ini diff --git a/Data/User/GameConfig/RIJE69.ini b/Data/Sys/GameConfig/RIJE69.ini similarity index 100% rename from Data/User/GameConfig/RIJE69.ini rename to Data/Sys/GameConfig/RIJE69.ini diff --git a/Data/User/GameConfig/RINE08.ini b/Data/Sys/GameConfig/RINE08.ini similarity index 100% rename from Data/User/GameConfig/RINE08.ini rename to Data/Sys/GameConfig/RINE08.ini diff --git a/Data/User/GameConfig/RINP08.ini b/Data/Sys/GameConfig/RINP08.ini similarity index 100% rename from Data/User/GameConfig/RINP08.ini rename to Data/Sys/GameConfig/RINP08.ini diff --git a/Data/User/GameConfig/RIPEAF.ini b/Data/Sys/GameConfig/RIPEAF.ini similarity index 100% rename from Data/User/GameConfig/RIPEAF.ini rename to Data/Sys/GameConfig/RIPEAF.ini diff --git a/Data/User/GameConfig/RIPJAF.ini b/Data/Sys/GameConfig/RIPJAF.ini similarity index 100% rename from Data/User/GameConfig/RIPJAF.ini rename to Data/Sys/GameConfig/RIPJAF.ini diff --git a/Data/User/GameConfig/RIPPAF.ini b/Data/Sys/GameConfig/RIPPAF.ini similarity index 100% rename from Data/User/GameConfig/RIPPAF.ini rename to Data/Sys/GameConfig/RIPPAF.ini diff --git a/Data/User/GameConfig/RIUJAF.ini b/Data/Sys/GameConfig/RIUJAF.ini similarity index 100% rename from Data/User/GameConfig/RIUJAF.ini rename to Data/Sys/GameConfig/RIUJAF.ini diff --git a/Data/User/GameConfig/RIUPAF.ini b/Data/Sys/GameConfig/RIUPAF.ini similarity index 100% rename from Data/User/GameConfig/RIUPAF.ini rename to Data/Sys/GameConfig/RIUPAF.ini diff --git a/Data/User/GameConfig/RIVEXJ.ini b/Data/Sys/GameConfig/RIVEXJ.ini similarity index 100% rename from Data/User/GameConfig/RIVEXJ.ini rename to Data/Sys/GameConfig/RIVEXJ.ini diff --git a/Data/User/GameConfig/RJ3P7J.ini b/Data/Sys/GameConfig/RJ3P7J.ini similarity index 100% rename from Data/User/GameConfig/RJ3P7J.ini rename to Data/Sys/GameConfig/RJ3P7J.ini diff --git a/Data/User/GameConfig/RJAP52.ini b/Data/Sys/GameConfig/RJAP52.ini similarity index 100% rename from Data/User/GameConfig/RJAP52.ini rename to Data/Sys/GameConfig/RJAP52.ini diff --git a/Data/User/GameConfig/RJCP52.ini b/Data/Sys/GameConfig/RJCP52.ini similarity index 100% rename from Data/User/GameConfig/RJCP52.ini rename to Data/Sys/GameConfig/RJCP52.ini diff --git a/Data/User/GameConfig/RJSXUG.ini b/Data/Sys/GameConfig/RJSXUG.ini similarity index 100% rename from Data/User/GameConfig/RJSXUG.ini rename to Data/Sys/GameConfig/RJSXUG.ini diff --git a/Data/User/GameConfig/RK2EEB.ini b/Data/Sys/GameConfig/RK2EEB.ini similarity index 100% rename from Data/User/GameConfig/RK2EEB.ini rename to Data/Sys/GameConfig/RK2EEB.ini diff --git a/Data/User/GameConfig/RK2JEB.ini b/Data/Sys/GameConfig/RK2JEB.ini similarity index 100% rename from Data/User/GameConfig/RK2JEB.ini rename to Data/Sys/GameConfig/RK2JEB.ini diff --git a/Data/User/GameConfig/RK2P01.ini b/Data/Sys/GameConfig/RK2P01.ini similarity index 100% rename from Data/User/GameConfig/RK2P01.ini rename to Data/Sys/GameConfig/RK2P01.ini diff --git a/Data/User/GameConfig/RK5E01.ini b/Data/Sys/GameConfig/RK5E01.ini similarity index 100% rename from Data/User/GameConfig/RK5E01.ini rename to Data/Sys/GameConfig/RK5E01.ini diff --git a/Data/User/GameConfig/RKDEEB.ini b/Data/Sys/GameConfig/RKDEEB.ini similarity index 100% rename from Data/User/GameConfig/RKDEEB.ini rename to Data/Sys/GameConfig/RKDEEB.ini diff --git a/Data/User/GameConfig/RKDJEB.ini b/Data/Sys/GameConfig/RKDJEB.ini similarity index 100% rename from Data/User/GameConfig/RKDJEB.ini rename to Data/Sys/GameConfig/RKDJEB.ini diff --git a/Data/User/GameConfig/RKDP01.ini b/Data/Sys/GameConfig/RKDP01.ini similarity index 100% rename from Data/User/GameConfig/RKDP01.ini rename to Data/Sys/GameConfig/RKDP01.ini diff --git a/Data/User/GameConfig/RKDPEB.ini b/Data/Sys/GameConfig/RKDPEB.ini similarity index 100% rename from Data/User/GameConfig/RKDPEB.ini rename to Data/Sys/GameConfig/RKDPEB.ini diff --git a/Data/User/GameConfig/RKIPUG.ini b/Data/Sys/GameConfig/RKIPUG.ini similarity index 100% rename from Data/User/GameConfig/RKIPUG.ini rename to Data/Sys/GameConfig/RKIPUG.ini diff --git a/Data/User/GameConfig/RKMP5D.ini b/Data/Sys/GameConfig/RKMP5D.ini similarity index 100% rename from Data/User/GameConfig/RKMP5D.ini rename to Data/Sys/GameConfig/RKMP5D.ini diff --git a/Data/User/GameConfig/RKSPUG.ini b/Data/Sys/GameConfig/RKSPUG.ini similarity index 100% rename from Data/User/GameConfig/RKSPUG.ini rename to Data/Sys/GameConfig/RKSPUG.ini diff --git a/Data/User/GameConfig/RLBEWR.ini b/Data/Sys/GameConfig/RLBEWR.ini similarity index 100% rename from Data/User/GameConfig/RLBEWR.ini rename to Data/Sys/GameConfig/RLBEWR.ini diff --git a/Data/User/GameConfig/RLEEFS.ini b/Data/Sys/GameConfig/RLEEFS.ini similarity index 100% rename from Data/User/GameConfig/RLEEFS.ini rename to Data/Sys/GameConfig/RLEEFS.ini diff --git a/Data/User/GameConfig/RLGE64.ini b/Data/Sys/GameConfig/RLGE64.ini similarity index 100% rename from Data/User/GameConfig/RLGE64.ini rename to Data/Sys/GameConfig/RLGE64.ini diff --git a/Data/User/GameConfig/RLGJ52.ini b/Data/Sys/GameConfig/RLGJ52.ini similarity index 100% rename from Data/User/GameConfig/RLGJ52.ini rename to Data/Sys/GameConfig/RLGJ52.ini diff --git a/Data/User/GameConfig/RLGP64.ini b/Data/Sys/GameConfig/RLGP64.ini similarity index 100% rename from Data/User/GameConfig/RLGP64.ini rename to Data/Sys/GameConfig/RLGP64.ini diff --git a/Data/User/GameConfig/RLJPKM.ini b/Data/Sys/GameConfig/RLJPKM.ini similarity index 100% rename from Data/User/GameConfig/RLJPKM.ini rename to Data/Sys/GameConfig/RLJPKM.ini diff --git a/Data/User/GameConfig/RLXEMJ.ini b/Data/Sys/GameConfig/RLXEMJ.ini similarity index 100% rename from Data/User/GameConfig/RLXEMJ.ini rename to Data/Sys/GameConfig/RLXEMJ.ini diff --git a/Data/User/GameConfig/RM2E69.ini b/Data/Sys/GameConfig/RM2E69.ini similarity index 100% rename from Data/User/GameConfig/RM2E69.ini rename to Data/Sys/GameConfig/RM2E69.ini diff --git a/Data/User/GameConfig/RM3E01.ini b/Data/Sys/GameConfig/RM3E01.ini similarity index 100% rename from Data/User/GameConfig/RM3E01.ini rename to Data/Sys/GameConfig/RM3E01.ini diff --git a/Data/User/GameConfig/RM3J01.ini b/Data/Sys/GameConfig/RM3J01.ini similarity index 100% rename from Data/User/GameConfig/RM3J01.ini rename to Data/Sys/GameConfig/RM3J01.ini diff --git a/Data/User/GameConfig/RM3P01.ini b/Data/Sys/GameConfig/RM3P01.ini similarity index 100% rename from Data/User/GameConfig/RM3P01.ini rename to Data/Sys/GameConfig/RM3P01.ini diff --git a/Data/User/GameConfig/RM6EEB.ini b/Data/Sys/GameConfig/RM6EEB.ini similarity index 100% rename from Data/User/GameConfig/RM6EEB.ini rename to Data/Sys/GameConfig/RM6EEB.ini diff --git a/Data/User/GameConfig/RM8E01.ini b/Data/Sys/GameConfig/RM8E01.ini similarity index 100% rename from Data/User/GameConfig/RM8E01.ini rename to Data/Sys/GameConfig/RM8E01.ini diff --git a/Data/User/GameConfig/RM8J01.ini b/Data/Sys/GameConfig/RM8J01.ini similarity index 100% rename from Data/User/GameConfig/RM8J01.ini rename to Data/Sys/GameConfig/RM8J01.ini diff --git a/Data/User/GameConfig/RM8K01.ini b/Data/Sys/GameConfig/RM8K01.ini similarity index 100% rename from Data/User/GameConfig/RM8K01.ini rename to Data/Sys/GameConfig/RM8K01.ini diff --git a/Data/User/GameConfig/RM8P01.ini b/Data/Sys/GameConfig/RM8P01.ini similarity index 100% rename from Data/User/GameConfig/RM8P01.ini rename to Data/Sys/GameConfig/RM8P01.ini diff --git a/Data/User/GameConfig/RMAE01.ini b/Data/Sys/GameConfig/RMAE01.ini similarity index 100% rename from Data/User/GameConfig/RMAE01.ini rename to Data/Sys/GameConfig/RMAE01.ini diff --git a/Data/User/GameConfig/RMAP01.ini b/Data/Sys/GameConfig/RMAP01.ini similarity index 100% rename from Data/User/GameConfig/RMAP01.ini rename to Data/Sys/GameConfig/RMAP01.ini diff --git a/Data/User/GameConfig/RMCE01.ini b/Data/Sys/GameConfig/RMCE01.ini similarity index 100% rename from Data/User/GameConfig/RMCE01.ini rename to Data/Sys/GameConfig/RMCE01.ini diff --git a/Data/User/GameConfig/RMCJ01.ini b/Data/Sys/GameConfig/RMCJ01.ini similarity index 100% rename from Data/User/GameConfig/RMCJ01.ini rename to Data/Sys/GameConfig/RMCJ01.ini diff --git a/Data/User/GameConfig/RMCK01.ini b/Data/Sys/GameConfig/RMCK01.ini similarity index 100% rename from Data/User/GameConfig/RMCK01.ini rename to Data/Sys/GameConfig/RMCK01.ini diff --git a/Data/User/GameConfig/RMCP01.ini b/Data/Sys/GameConfig/RMCP01.ini similarity index 100% rename from Data/User/GameConfig/RMCP01.ini rename to Data/Sys/GameConfig/RMCP01.ini diff --git a/Data/User/GameConfig/RMGE01.ini b/Data/Sys/GameConfig/RMGE01.ini similarity index 100% rename from Data/User/GameConfig/RMGE01.ini rename to Data/Sys/GameConfig/RMGE01.ini diff --git a/Data/User/GameConfig/RMGJ01.ini b/Data/Sys/GameConfig/RMGJ01.ini similarity index 100% rename from Data/User/GameConfig/RMGJ01.ini rename to Data/Sys/GameConfig/RMGJ01.ini diff --git a/Data/User/GameConfig/RMGK01.ini b/Data/Sys/GameConfig/RMGK01.ini similarity index 100% rename from Data/User/GameConfig/RMGK01.ini rename to Data/Sys/GameConfig/RMGK01.ini diff --git a/Data/User/GameConfig/RMGP01.ini b/Data/Sys/GameConfig/RMGP01.ini similarity index 100% rename from Data/User/GameConfig/RMGP01.ini rename to Data/Sys/GameConfig/RMGP01.ini diff --git a/Data/User/GameConfig/RMHE08.ini b/Data/Sys/GameConfig/RMHE08.ini similarity index 100% rename from Data/User/GameConfig/RMHE08.ini rename to Data/Sys/GameConfig/RMHE08.ini diff --git a/Data/User/GameConfig/RMHJ08.ini b/Data/Sys/GameConfig/RMHJ08.ini similarity index 100% rename from Data/User/GameConfig/RMHJ08.ini rename to Data/Sys/GameConfig/RMHJ08.ini diff --git a/Data/User/GameConfig/RMHP08.ini b/Data/Sys/GameConfig/RMHP08.ini similarity index 100% rename from Data/User/GameConfig/RMHP08.ini rename to Data/Sys/GameConfig/RMHP08.ini diff --git a/Data/User/GameConfig/RMKE01.ini b/Data/Sys/GameConfig/RMKE01.ini similarity index 100% rename from Data/User/GameConfig/RMKE01.ini rename to Data/Sys/GameConfig/RMKE01.ini diff --git a/Data/User/GameConfig/RMKJ01.ini b/Data/Sys/GameConfig/RMKJ01.ini similarity index 100% rename from Data/User/GameConfig/RMKJ01.ini rename to Data/Sys/GameConfig/RMKJ01.ini diff --git a/Data/User/GameConfig/RMKP01.ini b/Data/Sys/GameConfig/RMKP01.ini similarity index 100% rename from Data/User/GameConfig/RMKP01.ini rename to Data/Sys/GameConfig/RMKP01.ini diff --git a/Data/User/GameConfig/RMLEH4.ini b/Data/Sys/GameConfig/RMLEH4.ini similarity index 100% rename from Data/User/GameConfig/RMLEH4.ini rename to Data/Sys/GameConfig/RMLEH4.ini diff --git a/Data/User/GameConfig/RMLJH4.ini b/Data/Sys/GameConfig/RMLJH4.ini similarity index 100% rename from Data/User/GameConfig/RMLJH4.ini rename to Data/Sys/GameConfig/RMLJH4.ini diff --git a/Data/User/GameConfig/RMLK52.ini b/Data/Sys/GameConfig/RMLK52.ini similarity index 100% rename from Data/User/GameConfig/RMLK52.ini rename to Data/Sys/GameConfig/RMLK52.ini diff --git a/Data/User/GameConfig/RMLP7U.ini b/Data/Sys/GameConfig/RMLP7U.ini similarity index 100% rename from Data/User/GameConfig/RMLP7U.ini rename to Data/Sys/GameConfig/RMLP7U.ini diff --git a/Data/User/GameConfig/RMLPH4.ini b/Data/Sys/GameConfig/RMLPH4.ini similarity index 100% rename from Data/User/GameConfig/RMLPH4.ini rename to Data/Sys/GameConfig/RMLPH4.ini diff --git a/Data/User/GameConfig/RMSE52.ini b/Data/Sys/GameConfig/RMSE52.ini similarity index 100% rename from Data/User/GameConfig/RMSE52.ini rename to Data/Sys/GameConfig/RMSE52.ini diff --git a/Data/User/GameConfig/RNEEDA.ini b/Data/Sys/GameConfig/RNEEDA.ini similarity index 100% rename from Data/User/GameConfig/RNEEDA.ini rename to Data/Sys/GameConfig/RNEEDA.ini diff --git a/Data/User/GameConfig/RNEJDA.ini b/Data/Sys/GameConfig/RNEJDA.ini similarity index 100% rename from Data/User/GameConfig/RNEJDA.ini rename to Data/Sys/GameConfig/RNEJDA.ini diff --git a/Data/User/GameConfig/RNEPDA.ini b/Data/Sys/GameConfig/RNEPDA.ini similarity index 100% rename from Data/User/GameConfig/RNEPDA.ini rename to Data/Sys/GameConfig/RNEPDA.ini diff --git a/Data/User/GameConfig/RNHE41.ini b/Data/Sys/GameConfig/RNHE41.ini similarity index 100% rename from Data/User/GameConfig/RNHE41.ini rename to Data/Sys/GameConfig/RNHE41.ini diff --git a/Data/User/GameConfig/RNMXUG.ini b/Data/Sys/GameConfig/RNMXUG.ini similarity index 100% rename from Data/User/GameConfig/RNMXUG.ini rename to Data/Sys/GameConfig/RNMXUG.ini diff --git a/Data/User/GameConfig/RNOJ01.ini b/Data/Sys/GameConfig/RNOJ01.ini similarity index 100% rename from Data/User/GameConfig/RNOJ01.ini rename to Data/Sys/GameConfig/RNOJ01.ini diff --git a/Data/User/GameConfig/RNOP01.ini b/Data/Sys/GameConfig/RNOP01.ini similarity index 100% rename from Data/User/GameConfig/RNOP01.ini rename to Data/Sys/GameConfig/RNOP01.ini diff --git a/Data/User/GameConfig/RO2P7N.ini b/Data/Sys/GameConfig/RO2P7N.ini similarity index 100% rename from Data/User/GameConfig/RO2P7N.ini rename to Data/Sys/GameConfig/RO2P7N.ini diff --git a/Data/User/GameConfig/RO3EXJ.ini b/Data/Sys/GameConfig/RO3EXJ.ini similarity index 100% rename from Data/User/GameConfig/RO3EXJ.ini rename to Data/Sys/GameConfig/RO3EXJ.ini diff --git a/Data/User/GameConfig/RO3J99.ini b/Data/Sys/GameConfig/RO3J99.ini similarity index 100% rename from Data/User/GameConfig/RO3J99.ini rename to Data/Sys/GameConfig/RO3J99.ini diff --git a/Data/User/GameConfig/RO3P99.ini b/Data/Sys/GameConfig/RO3P99.ini similarity index 100% rename from Data/User/GameConfig/RO3P99.ini rename to Data/Sys/GameConfig/RO3P99.ini diff --git a/Data/User/GameConfig/RO7P7D.ini b/Data/Sys/GameConfig/RO7P7D.ini similarity index 100% rename from Data/User/GameConfig/RO7P7D.ini rename to Data/Sys/GameConfig/RO7P7D.ini diff --git a/Data/User/GameConfig/RO8E7D.ini b/Data/Sys/GameConfig/RO8E7D.ini similarity index 100% rename from Data/User/GameConfig/RO8E7D.ini rename to Data/Sys/GameConfig/RO8E7D.ini diff --git a/Data/User/GameConfig/RO9EFS.ini b/Data/Sys/GameConfig/RO9EFS.ini similarity index 100% rename from Data/User/GameConfig/RO9EFS.ini rename to Data/Sys/GameConfig/RO9EFS.ini diff --git a/Data/User/GameConfig/RO9PNK.ini b/Data/Sys/GameConfig/RO9PNK.ini similarity index 100% rename from Data/User/GameConfig/RO9PNK.ini rename to Data/Sys/GameConfig/RO9PNK.ini diff --git a/Data/User/GameConfig/ROAE36.ini b/Data/Sys/GameConfig/ROAE36.ini similarity index 100% rename from Data/User/GameConfig/ROAE36.ini rename to Data/Sys/GameConfig/ROAE36.ini diff --git a/Data/User/GameConfig/ROAP36.ini b/Data/Sys/GameConfig/ROAP36.ini similarity index 100% rename from Data/User/GameConfig/ROAP36.ini rename to Data/Sys/GameConfig/ROAP36.ini diff --git a/Data/User/GameConfig/ROCPNK.ini b/Data/Sys/GameConfig/ROCPNK.ini similarity index 100% rename from Data/User/GameConfig/ROCPNK.ini rename to Data/Sys/GameConfig/ROCPNK.ini diff --git a/Data/User/GameConfig/RODE01.ini b/Data/Sys/GameConfig/RODE01.ini similarity index 100% rename from Data/User/GameConfig/RODE01.ini rename to Data/Sys/GameConfig/RODE01.ini diff --git a/Data/User/GameConfig/RODJ01.ini b/Data/Sys/GameConfig/RODJ01.ini similarity index 100% rename from Data/User/GameConfig/RODJ01.ini rename to Data/Sys/GameConfig/RODJ01.ini diff --git a/Data/User/GameConfig/RODK01.ini b/Data/Sys/GameConfig/RODK01.ini similarity index 100% rename from Data/User/GameConfig/RODK01.ini rename to Data/Sys/GameConfig/RODK01.ini diff --git a/Data/User/GameConfig/RODP01.ini b/Data/Sys/GameConfig/RODP01.ini similarity index 100% rename from Data/User/GameConfig/RODP01.ini rename to Data/Sys/GameConfig/RODP01.ini diff --git a/Data/User/GameConfig/ROLE8P.ini b/Data/Sys/GameConfig/ROLE8P.ini similarity index 100% rename from Data/User/GameConfig/ROLE8P.ini rename to Data/Sys/GameConfig/ROLE8P.ini diff --git a/Data/User/GameConfig/ROLJ01.ini b/Data/Sys/GameConfig/ROLJ01.ini similarity index 100% rename from Data/User/GameConfig/ROLJ01.ini rename to Data/Sys/GameConfig/ROLJ01.ini diff --git a/Data/User/GameConfig/ROLK01.ini b/Data/Sys/GameConfig/ROLK01.ini similarity index 100% rename from Data/User/GameConfig/ROLK01.ini rename to Data/Sys/GameConfig/ROLK01.ini diff --git a/Data/User/GameConfig/ROLP8P.ini b/Data/Sys/GameConfig/ROLP8P.ini similarity index 100% rename from Data/User/GameConfig/ROLP8P.ini rename to Data/Sys/GameConfig/ROLP8P.ini diff --git a/Data/User/GameConfig/RONEG9.ini b/Data/Sys/GameConfig/RONEG9.ini similarity index 100% rename from Data/User/GameConfig/RONEG9.ini rename to Data/Sys/GameConfig/RONEG9.ini diff --git a/Data/User/GameConfig/RONJG9.ini b/Data/Sys/GameConfig/RONJG9.ini similarity index 100% rename from Data/User/GameConfig/RONJG9.ini rename to Data/Sys/GameConfig/RONJG9.ini diff --git a/Data/User/GameConfig/RONPG9.ini b/Data/Sys/GameConfig/RONPG9.ini similarity index 100% rename from Data/User/GameConfig/RONPG9.ini rename to Data/Sys/GameConfig/RONPG9.ini diff --git a/Data/User/GameConfig/ROUJAF.ini b/Data/Sys/GameConfig/ROUJAF.ini similarity index 100% rename from Data/User/GameConfig/ROUJAF.ini rename to Data/Sys/GameConfig/ROUJAF.ini diff --git a/Data/User/GameConfig/ROUPAF.ini b/Data/Sys/GameConfig/ROUPAF.ini similarity index 100% rename from Data/User/GameConfig/ROUPAF.ini rename to Data/Sys/GameConfig/ROUPAF.ini diff --git a/Data/User/GameConfig/ROWE08.ini b/Data/Sys/GameConfig/ROWE08.ini similarity index 100% rename from Data/User/GameConfig/ROWE08.ini rename to Data/Sys/GameConfig/ROWE08.ini diff --git a/Data/User/GameConfig/ROWJ08.ini b/Data/Sys/GameConfig/ROWJ08.ini similarity index 100% rename from Data/User/GameConfig/ROWJ08.ini rename to Data/Sys/GameConfig/ROWJ08.ini diff --git a/Data/User/GameConfig/ROWP08.ini b/Data/Sys/GameConfig/ROWP08.ini similarity index 100% rename from Data/User/GameConfig/ROWP08.ini rename to Data/Sys/GameConfig/ROWP08.ini diff --git a/Data/User/GameConfig/RP7P52.ini b/Data/Sys/GameConfig/RP7P52.ini similarity index 100% rename from Data/User/GameConfig/RP7P52.ini rename to Data/Sys/GameConfig/RP7P52.ini diff --git a/Data/User/GameConfig/RPBE01.ini b/Data/Sys/GameConfig/RPBE01.ini similarity index 100% rename from Data/User/GameConfig/RPBE01.ini rename to Data/Sys/GameConfig/RPBE01.ini diff --git a/Data/User/GameConfig/RPBJ01.ini b/Data/Sys/GameConfig/RPBJ01.ini similarity index 100% rename from Data/User/GameConfig/RPBJ01.ini rename to Data/Sys/GameConfig/RPBJ01.ini diff --git a/Data/User/GameConfig/RPBP01.ini b/Data/Sys/GameConfig/RPBP01.ini similarity index 100% rename from Data/User/GameConfig/RPBP01.ini rename to Data/Sys/GameConfig/RPBP01.ini diff --git a/Data/User/GameConfig/RPDPGN.ini b/Data/Sys/GameConfig/RPDPGN.ini similarity index 100% rename from Data/User/GameConfig/RPDPGN.ini rename to Data/Sys/GameConfig/RPDPGN.ini diff --git a/Data/User/GameConfig/RPJE7U.ini b/Data/Sys/GameConfig/RPJE7U.ini similarity index 100% rename from Data/User/GameConfig/RPJE7U.ini rename to Data/Sys/GameConfig/RPJE7U.ini diff --git a/Data/User/GameConfig/RPJJ99.ini b/Data/Sys/GameConfig/RPJJ99.ini similarity index 100% rename from Data/User/GameConfig/RPJJ99.ini rename to Data/Sys/GameConfig/RPJJ99.ini diff --git a/Data/User/GameConfig/RPPE41.ini b/Data/Sys/GameConfig/RPPE41.ini similarity index 100% rename from Data/User/GameConfig/RPPE41.ini rename to Data/Sys/GameConfig/RPPE41.ini diff --git a/Data/User/GameConfig/RPWZ41.ini b/Data/Sys/GameConfig/RPWZ41.ini similarity index 100% rename from Data/User/GameConfig/RPWZ41.ini rename to Data/Sys/GameConfig/RPWZ41.ini diff --git a/Data/User/GameConfig/RPYP9B.ini b/Data/Sys/GameConfig/RPYP9B.ini similarity index 100% rename from Data/User/GameConfig/RPYP9B.ini rename to Data/Sys/GameConfig/RPYP9B.ini diff --git a/Data/User/GameConfig/RQ6EJJ.ini b/Data/Sys/GameConfig/RQ6EJJ.ini similarity index 100% rename from Data/User/GameConfig/RQ6EJJ.ini rename to Data/Sys/GameConfig/RQ6EJJ.ini diff --git a/Data/User/GameConfig/RQ6PKM.ini b/Data/Sys/GameConfig/RQ6PKM.ini similarity index 100% rename from Data/User/GameConfig/RQ6PKM.ini rename to Data/Sys/GameConfig/RQ6PKM.ini diff --git a/Data/User/GameConfig/RQ6XKM.ini b/Data/Sys/GameConfig/RQ6XKM.ini similarity index 100% rename from Data/User/GameConfig/RQ6XKM.ini rename to Data/Sys/GameConfig/RQ6XKM.ini diff --git a/Data/User/GameConfig/RQBENR.ini b/Data/Sys/GameConfig/RQBENR.ini similarity index 100% rename from Data/User/GameConfig/RQBENR.ini rename to Data/Sys/GameConfig/RQBENR.ini diff --git a/Data/User/GameConfig/RQLE64.ini b/Data/Sys/GameConfig/RQLE64.ini similarity index 100% rename from Data/User/GameConfig/RQLE64.ini rename to Data/Sys/GameConfig/RQLE64.ini diff --git a/Data/User/GameConfig/RQOP69.ini b/Data/Sys/GameConfig/RQOP69.ini similarity index 100% rename from Data/User/GameConfig/RQOP69.ini rename to Data/Sys/GameConfig/RQOP69.ini diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/Sys/GameConfig/RQREXJ.ini similarity index 100% rename from Data/User/GameConfig/RQREXJ.ini rename to Data/Sys/GameConfig/RQREXJ.ini diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/Sys/GameConfig/RQRJAF.ini similarity index 100% rename from Data/User/GameConfig/RQRJAF.ini rename to Data/Sys/GameConfig/RQRJAF.ini diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/Sys/GameConfig/RQRPAF.ini similarity index 100% rename from Data/User/GameConfig/RQRPAF.ini rename to Data/Sys/GameConfig/RQRPAF.ini diff --git a/Data/User/GameConfig/RR2PUG.ini b/Data/Sys/GameConfig/RR2PUG.ini similarity index 100% rename from Data/User/GameConfig/RR2PUG.ini rename to Data/Sys/GameConfig/RR2PUG.ini diff --git a/Data/User/GameConfig/RR5P70.ini b/Data/Sys/GameConfig/RR5P70.ini similarity index 100% rename from Data/User/GameConfig/RR5P70.ini rename to Data/Sys/GameConfig/RR5P70.ini diff --git a/Data/User/GameConfig/RRAXUG.ini b/Data/Sys/GameConfig/RRAXUG.ini similarity index 100% rename from Data/User/GameConfig/RRAXUG.ini rename to Data/Sys/GameConfig/RRAXUG.ini diff --git a/Data/User/GameConfig/RRBE41.ini b/Data/Sys/GameConfig/RRBE41.ini similarity index 100% rename from Data/User/GameConfig/RRBE41.ini rename to Data/Sys/GameConfig/RRBE41.ini diff --git a/Data/User/GameConfig/RRBJ41.ini b/Data/Sys/GameConfig/RRBJ41.ini similarity index 100% rename from Data/User/GameConfig/RRBJ41.ini rename to Data/Sys/GameConfig/RRBJ41.ini diff --git a/Data/User/GameConfig/RRBP41.ini b/Data/Sys/GameConfig/RRBP41.ini similarity index 100% rename from Data/User/GameConfig/RRBP41.ini rename to Data/Sys/GameConfig/RRBP41.ini diff --git a/Data/User/GameConfig/RRKE70.ini b/Data/Sys/GameConfig/RRKE70.ini similarity index 100% rename from Data/User/GameConfig/RRKE70.ini rename to Data/Sys/GameConfig/RRKE70.ini diff --git a/Data/User/GameConfig/RRKP70.ini b/Data/Sys/GameConfig/RRKP70.ini similarity index 100% rename from Data/User/GameConfig/RRKP70.ini rename to Data/Sys/GameConfig/RRKP70.ini diff --git a/Data/User/GameConfig/RRMX69.ini b/Data/Sys/GameConfig/RRMX69.ini similarity index 100% rename from Data/User/GameConfig/RRMX69.ini rename to Data/Sys/GameConfig/RRMX69.ini diff --git a/Data/User/GameConfig/RRXXUG.ini b/Data/Sys/GameConfig/RRXXUG.ini similarity index 100% rename from Data/User/GameConfig/RRXXUG.ini rename to Data/Sys/GameConfig/RRXXUG.ini diff --git a/Data/User/GameConfig/RRYPHY.ini b/Data/Sys/GameConfig/RRYPHY.ini similarity index 100% rename from Data/User/GameConfig/RRYPHY.ini rename to Data/Sys/GameConfig/RRYPHY.ini diff --git a/Data/User/GameConfig/RRZEGY.ini b/Data/Sys/GameConfig/RRZEGY.ini similarity index 100% rename from Data/User/GameConfig/RRZEGY.ini rename to Data/Sys/GameConfig/RRZEGY.ini diff --git a/Data/User/GameConfig/RRZPGY.ini b/Data/Sys/GameConfig/RRZPGY.ini similarity index 100% rename from Data/User/GameConfig/RRZPGY.ini rename to Data/Sys/GameConfig/RRZPGY.ini diff --git a/Data/User/GameConfig/RS5EC8.ini b/Data/Sys/GameConfig/RS5EC8.ini similarity index 100% rename from Data/User/GameConfig/RS5EC8.ini rename to Data/Sys/GameConfig/RS5EC8.ini diff --git a/Data/User/GameConfig/RS5JC8.ini b/Data/Sys/GameConfig/RS5JC8.ini similarity index 100% rename from Data/User/GameConfig/RS5JC8.ini rename to Data/Sys/GameConfig/RS5JC8.ini diff --git a/Data/User/GameConfig/RS5PC8.ini b/Data/Sys/GameConfig/RS5PC8.ini similarity index 100% rename from Data/User/GameConfig/RS5PC8.ini rename to Data/Sys/GameConfig/RS5PC8.ini diff --git a/Data/User/GameConfig/RS8J8N.ini b/Data/Sys/GameConfig/RS8J8N.ini similarity index 100% rename from Data/User/GameConfig/RS8J8N.ini rename to Data/Sys/GameConfig/RS8J8N.ini diff --git a/Data/User/GameConfig/RS9E8P.ini b/Data/Sys/GameConfig/RS9E8P.ini similarity index 100% rename from Data/User/GameConfig/RS9E8P.ini rename to Data/Sys/GameConfig/RS9E8P.ini diff --git a/Data/User/GameConfig/RS9P8P.ini b/Data/Sys/GameConfig/RS9P8P.ini similarity index 100% rename from Data/User/GameConfig/RS9P8P.ini rename to Data/Sys/GameConfig/RS9P8P.ini diff --git a/Data/User/GameConfig/RSBE01.ini b/Data/Sys/GameConfig/RSBE01.ini similarity index 100% rename from Data/User/GameConfig/RSBE01.ini rename to Data/Sys/GameConfig/RSBE01.ini diff --git a/Data/User/GameConfig/RSBJ01.ini b/Data/Sys/GameConfig/RSBJ01.ini similarity index 100% rename from Data/User/GameConfig/RSBJ01.ini rename to Data/Sys/GameConfig/RSBJ01.ini diff --git a/Data/User/GameConfig/RSBP01.ini b/Data/Sys/GameConfig/RSBP01.ini similarity index 100% rename from Data/User/GameConfig/RSBP01.ini rename to Data/Sys/GameConfig/RSBP01.ini diff --git a/Data/User/GameConfig/RSFE7U.ini b/Data/Sys/GameConfig/RSFE7U.ini similarity index 100% rename from Data/User/GameConfig/RSFE7U.ini rename to Data/Sys/GameConfig/RSFE7U.ini diff --git a/Data/User/GameConfig/RSFJ99.ini b/Data/Sys/GameConfig/RSFJ99.ini similarity index 100% rename from Data/User/GameConfig/RSFJ99.ini rename to Data/Sys/GameConfig/RSFJ99.ini diff --git a/Data/User/GameConfig/RSFP99.ini b/Data/Sys/GameConfig/RSFP99.ini similarity index 100% rename from Data/User/GameConfig/RSFP99.ini rename to Data/Sys/GameConfig/RSFP99.ini diff --git a/Data/User/GameConfig/RSIE69.ini b/Data/Sys/GameConfig/RSIE69.ini similarity index 100% rename from Data/User/GameConfig/RSIE69.ini rename to Data/Sys/GameConfig/RSIE69.ini diff --git a/Data/User/GameConfig/RSIJ13.ini b/Data/Sys/GameConfig/RSIJ13.ini similarity index 100% rename from Data/User/GameConfig/RSIJ13.ini rename to Data/Sys/GameConfig/RSIJ13.ini diff --git a/Data/User/GameConfig/RSIP69.ini b/Data/Sys/GameConfig/RSIP69.ini similarity index 100% rename from Data/User/GameConfig/RSIP69.ini rename to Data/Sys/GameConfig/RSIP69.ini diff --git a/Data/User/GameConfig/RSLEAF.ini b/Data/Sys/GameConfig/RSLEAF.ini similarity index 100% rename from Data/User/GameConfig/RSLEAF.ini rename to Data/Sys/GameConfig/RSLEAF.ini diff --git a/Data/User/GameConfig/RSLJAF.ini b/Data/Sys/GameConfig/RSLJAF.ini similarity index 100% rename from Data/User/GameConfig/RSLJAF.ini rename to Data/Sys/GameConfig/RSLJAF.ini diff --git a/Data/User/GameConfig/RSLKAF.ini b/Data/Sys/GameConfig/RSLKAF.ini similarity index 100% rename from Data/User/GameConfig/RSLKAF.ini rename to Data/Sys/GameConfig/RSLKAF.ini diff --git a/Data/User/GameConfig/RSLPAF.ini b/Data/Sys/GameConfig/RSLPAF.ini similarity index 100% rename from Data/User/GameConfig/RSLPAF.ini rename to Data/Sys/GameConfig/RSLPAF.ini diff --git a/Data/User/GameConfig/RSME8P.ini b/Data/Sys/GameConfig/RSME8P.ini similarity index 100% rename from Data/User/GameConfig/RSME8P.ini rename to Data/Sys/GameConfig/RSME8P.ini diff --git a/Data/User/GameConfig/RSMP8P.ini b/Data/Sys/GameConfig/RSMP8P.ini similarity index 100% rename from Data/User/GameConfig/RSMP8P.ini rename to Data/Sys/GameConfig/RSMP8P.ini diff --git a/Data/User/GameConfig/RSPE01.ini b/Data/Sys/GameConfig/RSPE01.ini similarity index 100% rename from Data/User/GameConfig/RSPE01.ini rename to Data/Sys/GameConfig/RSPE01.ini diff --git a/Data/User/GameConfig/RSPP01.ini b/Data/Sys/GameConfig/RSPP01.ini similarity index 100% rename from Data/User/GameConfig/RSPP01.ini rename to Data/Sys/GameConfig/RSPP01.ini diff --git a/Data/User/GameConfig/RSRE8P.ini b/Data/Sys/GameConfig/RSRE8P.ini similarity index 100% rename from Data/User/GameConfig/RSRE8P.ini rename to Data/Sys/GameConfig/RSRE8P.ini diff --git a/Data/User/GameConfig/RSRP8P.ini b/Data/Sys/GameConfig/RSRP8P.ini similarity index 100% rename from Data/User/GameConfig/RSRP8P.ini rename to Data/Sys/GameConfig/RSRP8P.ini diff --git a/Data/User/GameConfig/RSTP64.ini b/Data/Sys/GameConfig/RSTP64.ini similarity index 100% rename from Data/User/GameConfig/RSTP64.ini rename to Data/Sys/GameConfig/RSTP64.ini diff --git a/Data/User/GameConfig/RSUP41.ini b/Data/Sys/GameConfig/RSUP41.ini similarity index 100% rename from Data/User/GameConfig/RSUP41.ini rename to Data/Sys/GameConfig/RSUP41.ini diff --git a/Data/User/GameConfig/RSVE8P.ini b/Data/Sys/GameConfig/RSVE8P.ini similarity index 100% rename from Data/User/GameConfig/RSVE8P.ini rename to Data/Sys/GameConfig/RSVE8P.ini diff --git a/Data/User/GameConfig/RSVJ8P.ini b/Data/Sys/GameConfig/RSVJ8P.ini similarity index 100% rename from Data/User/GameConfig/RSVJ8P.ini rename to Data/Sys/GameConfig/RSVJ8P.ini diff --git a/Data/User/GameConfig/RSVP8P.ini b/Data/Sys/GameConfig/RSVP8P.ini similarity index 100% rename from Data/User/GameConfig/RSVP8P.ini rename to Data/Sys/GameConfig/RSVP8P.ini diff --git a/Data/User/GameConfig/RSWP08.ini b/Data/Sys/GameConfig/RSWP08.ini similarity index 100% rename from Data/User/GameConfig/RSWP08.ini rename to Data/Sys/GameConfig/RSWP08.ini diff --git a/Data/User/GameConfig/RSXE69.ini b/Data/Sys/GameConfig/RSXE69.ini similarity index 100% rename from Data/User/GameConfig/RSXE69.ini rename to Data/Sys/GameConfig/RSXE69.ini diff --git a/Data/User/GameConfig/RSXJ13.ini b/Data/Sys/GameConfig/RSXJ13.ini similarity index 100% rename from Data/User/GameConfig/RSXJ13.ini rename to Data/Sys/GameConfig/RSXJ13.ini diff --git a/Data/User/GameConfig/RSXK69.ini b/Data/Sys/GameConfig/RSXK69.ini similarity index 100% rename from Data/User/GameConfig/RSXK69.ini rename to Data/Sys/GameConfig/RSXK69.ini diff --git a/Data/User/GameConfig/RSXP69.ini b/Data/Sys/GameConfig/RSXP69.ini similarity index 100% rename from Data/User/GameConfig/RSXP69.ini rename to Data/Sys/GameConfig/RSXP69.ini diff --git a/Data/User/GameConfig/RSZPGT.ini b/Data/Sys/GameConfig/RSZPGT.ini similarity index 100% rename from Data/User/GameConfig/RSZPGT.ini rename to Data/Sys/GameConfig/RSZPGT.ini diff --git a/Data/User/GameConfig/RT3E54.ini b/Data/Sys/GameConfig/RT3E54.ini similarity index 100% rename from Data/User/GameConfig/RT3E54.ini rename to Data/Sys/GameConfig/RT3E54.ini diff --git a/Data/User/GameConfig/RT3JEL.ini b/Data/Sys/GameConfig/RT3JEL.ini similarity index 100% rename from Data/User/GameConfig/RT3JEL.ini rename to Data/Sys/GameConfig/RT3JEL.ini diff --git a/Data/User/GameConfig/RT3P54.ini b/Data/Sys/GameConfig/RT3P54.ini similarity index 100% rename from Data/User/GameConfig/RT3P54.ini rename to Data/Sys/GameConfig/RT3P54.ini diff --git a/Data/User/GameConfig/RT4EAF.ini b/Data/Sys/GameConfig/RT4EAF.ini similarity index 100% rename from Data/User/GameConfig/RT4EAF.ini rename to Data/Sys/GameConfig/RT4EAF.ini diff --git a/Data/User/GameConfig/RT4JAF.ini b/Data/Sys/GameConfig/RT4JAF.ini similarity index 100% rename from Data/User/GameConfig/RT4JAF.ini rename to Data/Sys/GameConfig/RT4JAF.ini diff --git a/Data/User/GameConfig/RT4PAF.ini b/Data/Sys/GameConfig/RT4PAF.ini similarity index 100% rename from Data/User/GameConfig/RT4PAF.ini rename to Data/Sys/GameConfig/RT4PAF.ini diff --git a/Data/User/GameConfig/RT5E8P.ini b/Data/Sys/GameConfig/RT5E8P.ini similarity index 100% rename from Data/User/GameConfig/RT5E8P.ini rename to Data/Sys/GameConfig/RT5E8P.ini diff --git a/Data/User/GameConfig/RT5P8P.ini b/Data/Sys/GameConfig/RT5P8P.ini similarity index 100% rename from Data/User/GameConfig/RT5P8P.ini rename to Data/Sys/GameConfig/RT5P8P.ini diff --git a/Data/User/GameConfig/RT9E52.ini b/Data/Sys/GameConfig/RT9E52.ini similarity index 100% rename from Data/User/GameConfig/RT9E52.ini rename to Data/Sys/GameConfig/RT9E52.ini diff --git a/Data/User/GameConfig/RTBP52.ini b/Data/Sys/GameConfig/RTBP52.ini similarity index 100% rename from Data/User/GameConfig/RTBP52.ini rename to Data/Sys/GameConfig/RTBP52.ini diff --git a/Data/User/GameConfig/RTCP41.ini b/Data/Sys/GameConfig/RTCP41.ini similarity index 100% rename from Data/User/GameConfig/RTCP41.ini rename to Data/Sys/GameConfig/RTCP41.ini diff --git a/Data/User/GameConfig/RTHE52.ini b/Data/Sys/GameConfig/RTHE52.ini similarity index 100% rename from Data/User/GameConfig/RTHE52.ini rename to Data/Sys/GameConfig/RTHE52.ini diff --git a/Data/User/GameConfig/RTME41.ini b/Data/Sys/GameConfig/RTME41.ini similarity index 100% rename from Data/User/GameConfig/RTME41.ini rename to Data/Sys/GameConfig/RTME41.ini diff --git a/Data/User/GameConfig/RTMP41.ini b/Data/Sys/GameConfig/RTMP41.ini similarity index 100% rename from Data/User/GameConfig/RTMP41.ini rename to Data/Sys/GameConfig/RTMP41.ini diff --git a/Data/User/GameConfig/RTNE41.ini b/Data/Sys/GameConfig/RTNE41.ini similarity index 100% rename from Data/User/GameConfig/RTNE41.ini rename to Data/Sys/GameConfig/RTNE41.ini diff --git a/Data/User/GameConfig/RTNJCQ.ini b/Data/Sys/GameConfig/RTNJCQ.ini similarity index 100% rename from Data/User/GameConfig/RTNJCQ.ini rename to Data/Sys/GameConfig/RTNJCQ.ini diff --git a/Data/User/GameConfig/RTNP41.ini b/Data/Sys/GameConfig/RTNP41.ini similarity index 100% rename from Data/User/GameConfig/RTNP41.ini rename to Data/Sys/GameConfig/RTNP41.ini diff --git a/Data/User/GameConfig/RTZE08.ini b/Data/Sys/GameConfig/RTZE08.ini similarity index 100% rename from Data/User/GameConfig/RTZE08.ini rename to Data/Sys/GameConfig/RTZE08.ini diff --git a/Data/User/GameConfig/RTZJ08.ini b/Data/Sys/GameConfig/RTZJ08.ini similarity index 100% rename from Data/User/GameConfig/RTZJ08.ini rename to Data/Sys/GameConfig/RTZJ08.ini diff --git a/Data/User/GameConfig/RTZK08.ini b/Data/Sys/GameConfig/RTZK08.ini similarity index 100% rename from Data/User/GameConfig/RTZK08.ini rename to Data/Sys/GameConfig/RTZK08.ini diff --git a/Data/User/GameConfig/RTZP08.ini b/Data/Sys/GameConfig/RTZP08.ini similarity index 100% rename from Data/User/GameConfig/RTZP08.ini rename to Data/Sys/GameConfig/RTZP08.ini diff --git a/Data/User/GameConfig/RUCXRT.ini b/Data/Sys/GameConfig/RUCXRT.ini similarity index 100% rename from Data/User/GameConfig/RUCXRT.ini rename to Data/Sys/GameConfig/RUCXRT.ini diff --git a/Data/User/GameConfig/RUUE01.ini b/Data/Sys/GameConfig/RUUE01.ini similarity index 100% rename from Data/User/GameConfig/RUUE01.ini rename to Data/Sys/GameConfig/RUUE01.ini diff --git a/Data/User/GameConfig/RUUJ01.ini b/Data/Sys/GameConfig/RUUJ01.ini similarity index 100% rename from Data/User/GameConfig/RUUJ01.ini rename to Data/Sys/GameConfig/RUUJ01.ini diff --git a/Data/User/GameConfig/RUUK01.ini b/Data/Sys/GameConfig/RUUK01.ini similarity index 100% rename from Data/User/GameConfig/RUUK01.ini rename to Data/Sys/GameConfig/RUUK01.ini diff --git a/Data/User/GameConfig/RUUP01.ini b/Data/Sys/GameConfig/RUUP01.ini similarity index 100% rename from Data/User/GameConfig/RUUP01.ini rename to Data/Sys/GameConfig/RUUP01.ini diff --git a/Data/User/GameConfig/RUYE41.ini b/Data/Sys/GameConfig/RUYE41.ini similarity index 100% rename from Data/User/GameConfig/RUYE41.ini rename to Data/Sys/GameConfig/RUYE41.ini diff --git a/Data/User/GameConfig/RVKEXJ.ini b/Data/Sys/GameConfig/RVKEXJ.ini similarity index 100% rename from Data/User/GameConfig/RVKEXJ.ini rename to Data/Sys/GameConfig/RVKEXJ.ini diff --git a/Data/User/GameConfig/RVKP99.ini b/Data/Sys/GameConfig/RVKP99.ini similarity index 100% rename from Data/User/GameConfig/RVKP99.ini rename to Data/Sys/GameConfig/RVKP99.ini diff --git a/Data/User/GameConfig/RVOPPL.ini b/Data/Sys/GameConfig/RVOPPL.ini similarity index 100% rename from Data/User/GameConfig/RVOPPL.ini rename to Data/Sys/GameConfig/RVOPPL.ini diff --git a/Data/User/GameConfig/RVQP41.ini b/Data/Sys/GameConfig/RVQP41.ini similarity index 100% rename from Data/User/GameConfig/RVQP41.ini rename to Data/Sys/GameConfig/RVQP41.ini diff --git a/Data/User/GameConfig/RVSE69.ini b/Data/Sys/GameConfig/RVSE69.ini similarity index 100% rename from Data/User/GameConfig/RVSE69.ini rename to Data/Sys/GameConfig/RVSE69.ini diff --git a/Data/User/GameConfig/RVSP69.ini b/Data/Sys/GameConfig/RVSP69.ini similarity index 100% rename from Data/User/GameConfig/RVSP69.ini rename to Data/Sys/GameConfig/RVSP69.ini diff --git a/Data/User/GameConfig/RVUP8P.ini b/Data/Sys/GameConfig/RVUP8P.ini similarity index 100% rename from Data/User/GameConfig/RVUP8P.ini rename to Data/Sys/GameConfig/RVUP8P.ini diff --git a/Data/User/GameConfig/RVVP78.ini b/Data/Sys/GameConfig/RVVP78.ini similarity index 100% rename from Data/User/GameConfig/RVVP78.ini rename to Data/Sys/GameConfig/RVVP78.ini diff --git a/Data/User/GameConfig/RVZP52.ini b/Data/Sys/GameConfig/RVZP52.ini similarity index 100% rename from Data/User/GameConfig/RVZP52.ini rename to Data/Sys/GameConfig/RVZP52.ini diff --git a/Data/User/GameConfig/RW9X78.ini b/Data/Sys/GameConfig/RW9X78.ini similarity index 100% rename from Data/User/GameConfig/RW9X78.ini rename to Data/Sys/GameConfig/RW9X78.ini diff --git a/Data/User/GameConfig/RWBXUG.ini b/Data/Sys/GameConfig/RWBXUG.ini similarity index 100% rename from Data/User/GameConfig/RWBXUG.ini rename to Data/Sys/GameConfig/RWBXUG.ini diff --git a/Data/User/GameConfig/RWEPA4.ini b/Data/Sys/GameConfig/RWEPA4.ini similarity index 100% rename from Data/User/GameConfig/RWEPA4.ini rename to Data/Sys/GameConfig/RWEPA4.ini diff --git a/Data/User/GameConfig/RWLE01.ini b/Data/Sys/GameConfig/RWLE01.ini similarity index 100% rename from Data/User/GameConfig/RWLE01.ini rename to Data/Sys/GameConfig/RWLE01.ini diff --git a/Data/User/GameConfig/RWRE4F.ini b/Data/Sys/GameConfig/RWRE4F.ini similarity index 100% rename from Data/User/GameConfig/RWRE4F.ini rename to Data/Sys/GameConfig/RWRE4F.ini diff --git a/Data/User/GameConfig/RWRP4F.ini b/Data/Sys/GameConfig/RWRP4F.ini similarity index 100% rename from Data/User/GameConfig/RWRP4F.ini rename to Data/Sys/GameConfig/RWRP4F.ini diff --git a/Data/User/GameConfig/RWSE8P.ini b/Data/Sys/GameConfig/RWSE8P.ini similarity index 100% rename from Data/User/GameConfig/RWSE8P.ini rename to Data/Sys/GameConfig/RWSE8P.ini diff --git a/Data/User/GameConfig/RWSJ01.ini b/Data/Sys/GameConfig/RWSJ01.ini similarity index 100% rename from Data/User/GameConfig/RWSJ01.ini rename to Data/Sys/GameConfig/RWSJ01.ini diff --git a/Data/User/GameConfig/RWSK01.ini b/Data/Sys/GameConfig/RWSK01.ini similarity index 100% rename from Data/User/GameConfig/RWSK01.ini rename to Data/Sys/GameConfig/RWSK01.ini diff --git a/Data/User/GameConfig/RWSP8P.ini b/Data/Sys/GameConfig/RWSP8P.ini similarity index 100% rename from Data/User/GameConfig/RWSP8P.ini rename to Data/Sys/GameConfig/RWSP8P.ini diff --git a/Data/User/GameConfig/RWUX52.ini b/Data/Sys/GameConfig/RWUX52.ini similarity index 100% rename from Data/User/GameConfig/RWUX52.ini rename to Data/Sys/GameConfig/RWUX52.ini diff --git a/Data/User/GameConfig/RX3E01.ini b/Data/Sys/GameConfig/RX3E01.ini similarity index 100% rename from Data/User/GameConfig/RX3E01.ini rename to Data/Sys/GameConfig/RX3E01.ini diff --git a/Data/User/GameConfig/RX9P69.ini b/Data/Sys/GameConfig/RX9P69.ini similarity index 100% rename from Data/User/GameConfig/RX9P69.ini rename to Data/Sys/GameConfig/RX9P69.ini diff --git a/Data/User/GameConfig/RX9Y69.ini b/Data/Sys/GameConfig/RX9Y69.ini similarity index 100% rename from Data/User/GameConfig/RX9Y69.ini rename to Data/Sys/GameConfig/RX9Y69.ini diff --git a/Data/User/GameConfig/RXXE4Q.ini b/Data/Sys/GameConfig/RXXE4Q.ini similarity index 100% rename from Data/User/GameConfig/RXXE4Q.ini rename to Data/Sys/GameConfig/RXXE4Q.ini diff --git a/Data/User/GameConfig/RXXJ4Q.ini b/Data/Sys/GameConfig/RXXJ4Q.ini similarity index 100% rename from Data/User/GameConfig/RXXJ4Q.ini rename to Data/Sys/GameConfig/RXXJ4Q.ini diff --git a/Data/User/GameConfig/RXXP4Q.ini b/Data/Sys/GameConfig/RXXP4Q.ini similarity index 100% rename from Data/User/GameConfig/RXXP4Q.ini rename to Data/Sys/GameConfig/RXXP4Q.ini diff --git a/Data/User/GameConfig/RYBE69.ini b/Data/Sys/GameConfig/RYBE69.ini similarity index 100% rename from Data/User/GameConfig/RYBE69.ini rename to Data/Sys/GameConfig/RYBE69.ini diff --git a/Data/User/GameConfig/RYOEA4.ini b/Data/Sys/GameConfig/RYOEA4.ini similarity index 100% rename from Data/User/GameConfig/RYOEA4.ini rename to Data/Sys/GameConfig/RYOEA4.ini diff --git a/Data/User/GameConfig/RYQP69.ini b/Data/Sys/GameConfig/RYQP69.ini similarity index 100% rename from Data/User/GameConfig/RYQP69.ini rename to Data/Sys/GameConfig/RYQP69.ini diff --git a/Data/User/GameConfig/RYXP7J.ini b/Data/Sys/GameConfig/RYXP7J.ini similarity index 100% rename from Data/User/GameConfig/RYXP7J.ini rename to Data/Sys/GameConfig/RYXP7J.ini diff --git a/Data/User/GameConfig/RZ9PG9.ini b/Data/Sys/GameConfig/RZ9PG9.ini similarity index 100% rename from Data/User/GameConfig/RZ9PG9.ini rename to Data/Sys/GameConfig/RZ9PG9.ini diff --git a/Data/User/GameConfig/RZDE01.ini b/Data/Sys/GameConfig/RZDE01.ini similarity index 100% rename from Data/User/GameConfig/RZDE01.ini rename to Data/Sys/GameConfig/RZDE01.ini diff --git a/Data/User/GameConfig/RZDJ01.ini b/Data/Sys/GameConfig/RZDJ01.ini similarity index 100% rename from Data/User/GameConfig/RZDJ01.ini rename to Data/Sys/GameConfig/RZDJ01.ini diff --git a/Data/User/GameConfig/RZDK01.ini b/Data/Sys/GameConfig/RZDK01.ini similarity index 100% rename from Data/User/GameConfig/RZDK01.ini rename to Data/Sys/GameConfig/RZDK01.ini diff --git a/Data/User/GameConfig/RZDP01.ini b/Data/Sys/GameConfig/RZDP01.ini similarity index 100% rename from Data/User/GameConfig/RZDP01.ini rename to Data/Sys/GameConfig/RZDP01.ini diff --git a/Data/User/GameConfig/RZJD69.ini b/Data/Sys/GameConfig/RZJD69.ini similarity index 100% rename from Data/User/GameConfig/RZJD69.ini rename to Data/Sys/GameConfig/RZJD69.ini diff --git a/Data/User/GameConfig/RZJE69.ini b/Data/Sys/GameConfig/RZJE69.ini similarity index 100% rename from Data/User/GameConfig/RZJE69.ini rename to Data/Sys/GameConfig/RZJE69.ini diff --git a/Data/User/GameConfig/RZJJ13.ini b/Data/Sys/GameConfig/RZJJ13.ini similarity index 100% rename from Data/User/GameConfig/RZJJ13.ini rename to Data/Sys/GameConfig/RZJJ13.ini diff --git a/Data/User/GameConfig/RZJP69.ini b/Data/Sys/GameConfig/RZJP69.ini similarity index 100% rename from Data/User/GameConfig/RZJP69.ini rename to Data/Sys/GameConfig/RZJP69.ini diff --git a/Data/User/GameConfig/RZPE01.ini b/Data/Sys/GameConfig/RZPE01.ini similarity index 100% rename from Data/User/GameConfig/RZPE01.ini rename to Data/Sys/GameConfig/RZPE01.ini diff --git a/Data/User/GameConfig/RZTE01.ini b/Data/Sys/GameConfig/RZTE01.ini similarity index 100% rename from Data/User/GameConfig/RZTE01.ini rename to Data/Sys/GameConfig/RZTE01.ini diff --git a/Data/User/GameConfig/RZTJ01.ini b/Data/Sys/GameConfig/RZTJ01.ini similarity index 100% rename from Data/User/GameConfig/RZTJ01.ini rename to Data/Sys/GameConfig/RZTJ01.ini diff --git a/Data/User/GameConfig/RZTK01.ini b/Data/Sys/GameConfig/RZTK01.ini similarity index 100% rename from Data/User/GameConfig/RZTK01.ini rename to Data/Sys/GameConfig/RZTK01.ini diff --git a/Data/User/GameConfig/RZTP01.ini b/Data/Sys/GameConfig/RZTP01.ini similarity index 100% rename from Data/User/GameConfig/RZTP01.ini rename to Data/Sys/GameConfig/RZTP01.ini diff --git a/Data/User/GameConfig/RZTW01.ini b/Data/Sys/GameConfig/RZTW01.ini similarity index 100% rename from Data/User/GameConfig/RZTW01.ini rename to Data/Sys/GameConfig/RZTW01.ini diff --git a/Data/User/GameConfig/RZZE8P.ini b/Data/Sys/GameConfig/RZZE8P.ini similarity index 100% rename from Data/User/GameConfig/RZZE8P.ini rename to Data/Sys/GameConfig/RZZE8P.ini diff --git a/Data/User/GameConfig/RZZJEL.ini b/Data/Sys/GameConfig/RZZJEL.ini similarity index 100% rename from Data/User/GameConfig/RZZJEL.ini rename to Data/Sys/GameConfig/RZZJEL.ini diff --git a/Data/User/GameConfig/RZZP8P.ini b/Data/Sys/GameConfig/RZZP8P.ini similarity index 100% rename from Data/User/GameConfig/RZZP8P.ini rename to Data/Sys/GameConfig/RZZP8P.ini diff --git a/Data/User/GameConfig/S2IP8P.ini b/Data/Sys/GameConfig/S2IP8P.ini similarity index 100% rename from Data/User/GameConfig/S2IP8P.ini rename to Data/Sys/GameConfig/S2IP8P.ini diff --git a/Data/User/GameConfig/S2LE01.ini b/Data/Sys/GameConfig/S2LE01.ini similarity index 100% rename from Data/User/GameConfig/S2LE01.ini rename to Data/Sys/GameConfig/S2LE01.ini diff --git a/Data/User/GameConfig/S2LJ01.ini b/Data/Sys/GameConfig/S2LJ01.ini similarity index 100% rename from Data/User/GameConfig/S2LJ01.ini rename to Data/Sys/GameConfig/S2LJ01.ini diff --git a/Data/User/GameConfig/S2LP01.ini b/Data/Sys/GameConfig/S2LP01.ini similarity index 100% rename from Data/User/GameConfig/S2LP01.ini rename to Data/Sys/GameConfig/S2LP01.ini diff --git a/Data/User/GameConfig/S2TJAF.ini b/Data/Sys/GameConfig/S2TJAF.ini similarity index 100% rename from Data/User/GameConfig/S2TJAF.ini rename to Data/Sys/GameConfig/S2TJAF.ini diff --git a/Data/User/GameConfig/S2WE78.ini b/Data/Sys/GameConfig/S2WE78.ini similarity index 100% rename from Data/User/GameConfig/S2WE78.ini rename to Data/Sys/GameConfig/S2WE78.ini diff --git a/Data/User/GameConfig/S2WP78.ini b/Data/Sys/GameConfig/S2WP78.ini similarity index 100% rename from Data/User/GameConfig/S2WP78.ini rename to Data/Sys/GameConfig/S2WP78.ini diff --git a/Data/User/GameConfig/S3BEWR.ini b/Data/Sys/GameConfig/S3BEWR.ini similarity index 100% rename from Data/User/GameConfig/S3BEWR.ini rename to Data/Sys/GameConfig/S3BEWR.ini diff --git a/Data/User/GameConfig/S3BPWR.ini b/Data/Sys/GameConfig/S3BPWR.ini similarity index 100% rename from Data/User/GameConfig/S3BPWR.ini rename to Data/Sys/GameConfig/S3BPWR.ini diff --git a/Data/User/GameConfig/S59E01.ini b/Data/Sys/GameConfig/S59E01.ini similarity index 100% rename from Data/User/GameConfig/S59E01.ini rename to Data/Sys/GameConfig/S59E01.ini diff --git a/Data/User/GameConfig/S59JC8.ini b/Data/Sys/GameConfig/S59JC8.ini similarity index 100% rename from Data/User/GameConfig/S59JC8.ini rename to Data/Sys/GameConfig/S59JC8.ini diff --git a/Data/User/GameConfig/S59P01.ini b/Data/Sys/GameConfig/S59P01.ini similarity index 100% rename from Data/User/GameConfig/S59P01.ini rename to Data/Sys/GameConfig/S59P01.ini diff --git a/Data/User/GameConfig/S72E01.ini b/Data/Sys/GameConfig/S72E01.ini similarity index 100% rename from Data/User/GameConfig/S72E01.ini rename to Data/Sys/GameConfig/S72E01.ini diff --git a/Data/User/GameConfig/S72J01.ini b/Data/Sys/GameConfig/S72J01.ini similarity index 100% rename from Data/User/GameConfig/S72J01.ini rename to Data/Sys/GameConfig/S72J01.ini diff --git a/Data/User/GameConfig/S75E69.ini b/Data/Sys/GameConfig/S75E69.ini similarity index 100% rename from Data/User/GameConfig/S75E69.ini rename to Data/Sys/GameConfig/S75E69.ini diff --git a/Data/User/GameConfig/S75P69.ini b/Data/Sys/GameConfig/S75P69.ini similarity index 100% rename from Data/User/GameConfig/S75P69.ini rename to Data/Sys/GameConfig/S75P69.ini diff --git a/Data/User/GameConfig/SAKENS.ini b/Data/Sys/GameConfig/SAKENS.ini similarity index 100% rename from Data/User/GameConfig/SAKENS.ini rename to Data/Sys/GameConfig/SAKENS.ini diff --git a/Data/User/GameConfig/SAKPNS.ini b/Data/Sys/GameConfig/SAKPNS.ini similarity index 100% rename from Data/User/GameConfig/SAKPNS.ini rename to Data/Sys/GameConfig/SAKPNS.ini diff --git a/Data/User/GameConfig/SB3E08.ini b/Data/Sys/GameConfig/SB3E08.ini similarity index 100% rename from Data/User/GameConfig/SB3E08.ini rename to Data/Sys/GameConfig/SB3E08.ini diff --git a/Data/User/GameConfig/SB3J08.ini b/Data/Sys/GameConfig/SB3J08.ini similarity index 100% rename from Data/User/GameConfig/SB3J08.ini rename to Data/Sys/GameConfig/SB3J08.ini diff --git a/Data/User/GameConfig/SB3P08.ini b/Data/Sys/GameConfig/SB3P08.ini similarity index 100% rename from Data/User/GameConfig/SB3P08.ini rename to Data/Sys/GameConfig/SB3P08.ini diff --git a/Data/User/GameConfig/SB4E01.ini b/Data/Sys/GameConfig/SB4E01.ini similarity index 100% rename from Data/User/GameConfig/SB4E01.ini rename to Data/Sys/GameConfig/SB4E01.ini diff --git a/Data/User/GameConfig/SB4J01.ini b/Data/Sys/GameConfig/SB4J01.ini similarity index 100% rename from Data/User/GameConfig/SB4J01.ini rename to Data/Sys/GameConfig/SB4J01.ini diff --git a/Data/User/GameConfig/SB4P01.ini b/Data/Sys/GameConfig/SB4P01.ini similarity index 100% rename from Data/User/GameConfig/SB4P01.ini rename to Data/Sys/GameConfig/SB4P01.ini diff --git a/Data/User/GameConfig/SBDE08.ini b/Data/Sys/GameConfig/SBDE08.ini similarity index 100% rename from Data/User/GameConfig/SBDE08.ini rename to Data/Sys/GameConfig/SBDE08.ini diff --git a/Data/User/GameConfig/SBDJ08.ini b/Data/Sys/GameConfig/SBDJ08.ini similarity index 100% rename from Data/User/GameConfig/SBDJ08.ini rename to Data/Sys/GameConfig/SBDJ08.ini diff --git a/Data/User/GameConfig/SBDK08.ini b/Data/Sys/GameConfig/SBDK08.ini similarity index 100% rename from Data/User/GameConfig/SBDK08.ini rename to Data/Sys/GameConfig/SBDK08.ini diff --git a/Data/User/GameConfig/SBDP08.ini b/Data/Sys/GameConfig/SBDP08.ini similarity index 100% rename from Data/User/GameConfig/SBDP08.ini rename to Data/Sys/GameConfig/SBDP08.ini diff --git a/Data/User/GameConfig/SBLE5G.ini b/Data/Sys/GameConfig/SBLE5G.ini similarity index 100% rename from Data/User/GameConfig/SBLE5G.ini rename to Data/Sys/GameConfig/SBLE5G.ini diff --git a/Data/User/GameConfig/SBNEG9.ini b/Data/Sys/GameConfig/SBNEG9.ini similarity index 100% rename from Data/User/GameConfig/SBNEG9.ini rename to Data/Sys/GameConfig/SBNEG9.ini diff --git a/Data/User/GameConfig/SBVE78.ini b/Data/Sys/GameConfig/SBVE78.ini similarity index 100% rename from Data/User/GameConfig/SBVE78.ini rename to Data/Sys/GameConfig/SBVE78.ini diff --git a/Data/User/GameConfig/SC2E8P.ini b/Data/Sys/GameConfig/SC2E8P.ini similarity index 100% rename from Data/User/GameConfig/SC2E8P.ini rename to Data/Sys/GameConfig/SC2E8P.ini diff --git a/Data/User/GameConfig/SC2P8P.ini b/Data/Sys/GameConfig/SC2P8P.ini similarity index 100% rename from Data/User/GameConfig/SC2P8P.ini rename to Data/Sys/GameConfig/SC2P8P.ini diff --git a/Data/User/GameConfig/SC4E64.ini b/Data/Sys/GameConfig/SC4E64.ini similarity index 100% rename from Data/User/GameConfig/SC4E64.ini rename to Data/Sys/GameConfig/SC4E64.ini diff --git a/Data/User/GameConfig/SC4P64.ini b/Data/Sys/GameConfig/SC4P64.ini similarity index 100% rename from Data/User/GameConfig/SC4P64.ini rename to Data/Sys/GameConfig/SC4P64.ini diff --git a/Data/User/GameConfig/SC7D52.ini b/Data/Sys/GameConfig/SC7D52.ini similarity index 100% rename from Data/User/GameConfig/SC7D52.ini rename to Data/Sys/GameConfig/SC7D52.ini diff --git a/Data/User/GameConfig/SC7E52.ini b/Data/Sys/GameConfig/SC7E52.ini similarity index 100% rename from Data/User/GameConfig/SC7E52.ini rename to Data/Sys/GameConfig/SC7E52.ini diff --git a/Data/User/GameConfig/SC7F52.ini b/Data/Sys/GameConfig/SC7F52.ini similarity index 100% rename from Data/User/GameConfig/SC7F52.ini rename to Data/Sys/GameConfig/SC7F52.ini diff --git a/Data/User/GameConfig/SC7I52.ini b/Data/Sys/GameConfig/SC7I52.ini similarity index 100% rename from Data/User/GameConfig/SC7I52.ini rename to Data/Sys/GameConfig/SC7I52.ini diff --git a/Data/User/GameConfig/SC7P52.ini b/Data/Sys/GameConfig/SC7P52.ini similarity index 100% rename from Data/User/GameConfig/SC7P52.ini rename to Data/Sys/GameConfig/SC7P52.ini diff --git a/Data/User/GameConfig/SC7S52.ini b/Data/Sys/GameConfig/SC7S52.ini similarity index 100% rename from Data/User/GameConfig/SC7S52.ini rename to Data/Sys/GameConfig/SC7S52.ini diff --git a/Data/User/GameConfig/SC8E01.ini b/Data/Sys/GameConfig/SC8E01.ini similarity index 100% rename from Data/User/GameConfig/SC8E01.ini rename to Data/Sys/GameConfig/SC8E01.ini diff --git a/Data/User/GameConfig/SC8J01.ini b/Data/Sys/GameConfig/SC8J01.ini similarity index 100% rename from Data/User/GameConfig/SC8J01.ini rename to Data/Sys/GameConfig/SC8J01.ini diff --git a/Data/User/GameConfig/SC8P01.ini b/Data/Sys/GameConfig/SC8P01.ini similarity index 100% rename from Data/User/GameConfig/SC8P01.ini rename to Data/Sys/GameConfig/SC8P01.ini diff --git a/Data/User/GameConfig/SCAE18.ini b/Data/Sys/GameConfig/SCAE18.ini similarity index 100% rename from Data/User/GameConfig/SCAE18.ini rename to Data/Sys/GameConfig/SCAE18.ini diff --git a/Data/User/GameConfig/SCAJ18.ini b/Data/Sys/GameConfig/SCAJ18.ini similarity index 100% rename from Data/User/GameConfig/SCAJ18.ini rename to Data/Sys/GameConfig/SCAJ18.ini diff --git a/Data/User/GameConfig/SCAP18.ini b/Data/Sys/GameConfig/SCAP18.ini similarity index 100% rename from Data/User/GameConfig/SCAP18.ini rename to Data/Sys/GameConfig/SCAP18.ini diff --git a/Data/User/GameConfig/SCYE4Q.ini b/Data/Sys/GameConfig/SCYE4Q.ini similarity index 100% rename from Data/User/GameConfig/SCYE4Q.ini rename to Data/Sys/GameConfig/SCYE4Q.ini diff --git a/Data/User/GameConfig/SCYP4Q.ini b/Data/Sys/GameConfig/SCYP4Q.ini similarity index 100% rename from Data/User/GameConfig/SCYP4Q.ini rename to Data/Sys/GameConfig/SCYP4Q.ini diff --git a/Data/User/GameConfig/SCYX4Q.ini b/Data/Sys/GameConfig/SCYX4Q.ini similarity index 100% rename from Data/User/GameConfig/SCYX4Q.ini rename to Data/Sys/GameConfig/SCYX4Q.ini diff --git a/Data/User/GameConfig/SCYY4Q.ini b/Data/Sys/GameConfig/SCYY4Q.ini similarity index 100% rename from Data/User/GameConfig/SCYY4Q.ini rename to Data/Sys/GameConfig/SCYY4Q.ini diff --git a/Data/User/GameConfig/SCYZ4Q.ini b/Data/Sys/GameConfig/SCYZ4Q.ini similarity index 100% rename from Data/User/GameConfig/SCYZ4Q.ini rename to Data/Sys/GameConfig/SCYZ4Q.ini diff --git a/Data/User/GameConfig/SD2E41.ini b/Data/Sys/GameConfig/SD2E41.ini similarity index 100% rename from Data/User/GameConfig/SD2E41.ini rename to Data/Sys/GameConfig/SD2E41.ini diff --git a/Data/User/GameConfig/SD2J01.ini b/Data/Sys/GameConfig/SD2J01.ini similarity index 100% rename from Data/User/GameConfig/SD2J01.ini rename to Data/Sys/GameConfig/SD2J01.ini diff --git a/Data/User/GameConfig/SD2P41.ini b/Data/Sys/GameConfig/SD2P41.ini similarity index 100% rename from Data/User/GameConfig/SD2P41.ini rename to Data/Sys/GameConfig/SD2P41.ini diff --git a/Data/User/GameConfig/SD2Y41.ini b/Data/Sys/GameConfig/SD2Y41.ini similarity index 100% rename from Data/User/GameConfig/SD2Y41.ini rename to Data/Sys/GameConfig/SD2Y41.ini diff --git a/Data/User/GameConfig/SDBE78.ini b/Data/Sys/GameConfig/SDBE78.ini similarity index 100% rename from Data/User/GameConfig/SDBE78.ini rename to Data/Sys/GameConfig/SDBE78.ini diff --git a/Data/User/GameConfig/SDBP78.ini b/Data/Sys/GameConfig/SDBP78.ini similarity index 100% rename from Data/User/GameConfig/SDBP78.ini rename to Data/Sys/GameConfig/SDBP78.ini diff --git a/Data/User/GameConfig/SDFE4Q.ini b/Data/Sys/GameConfig/SDFE4Q.ini similarity index 100% rename from Data/User/GameConfig/SDFE4Q.ini rename to Data/Sys/GameConfig/SDFE4Q.ini diff --git a/Data/User/GameConfig/SDNE41.ini b/Data/Sys/GameConfig/SDNE41.ini similarity index 100% rename from Data/User/GameConfig/SDNE41.ini rename to Data/Sys/GameConfig/SDNE41.ini diff --git a/Data/User/GameConfig/SDNP41.ini b/Data/Sys/GameConfig/SDNP41.ini similarity index 100% rename from Data/User/GameConfig/SDNP41.ini rename to Data/Sys/GameConfig/SDNP41.ini diff --git a/Data/User/GameConfig/SDWE18.ini b/Data/Sys/GameConfig/SDWE18.ini similarity index 100% rename from Data/User/GameConfig/SDWE18.ini rename to Data/Sys/GameConfig/SDWE18.ini diff --git a/Data/User/GameConfig/SDWJ18.ini b/Data/Sys/GameConfig/SDWJ18.ini similarity index 100% rename from Data/User/GameConfig/SDWJ18.ini rename to Data/Sys/GameConfig/SDWJ18.ini diff --git a/Data/User/GameConfig/SDWP18.ini b/Data/Sys/GameConfig/SDWP18.ini similarity index 100% rename from Data/User/GameConfig/SDWP18.ini rename to Data/Sys/GameConfig/SDWP18.ini diff --git a/Data/User/GameConfig/SE2P69.ini b/Data/Sys/GameConfig/SE2P69.ini similarity index 100% rename from Data/User/GameConfig/SE2P69.ini rename to Data/Sys/GameConfig/SE2P69.ini diff --git a/Data/User/GameConfig/SEAE69.ini b/Data/Sys/GameConfig/SEAE69.ini similarity index 100% rename from Data/User/GameConfig/SEAE69.ini rename to Data/Sys/GameConfig/SEAE69.ini diff --git a/Data/User/GameConfig/SEAJ13.ini b/Data/Sys/GameConfig/SEAJ13.ini similarity index 100% rename from Data/User/GameConfig/SEAJ13.ini rename to Data/Sys/GameConfig/SEAJ13.ini diff --git a/Data/User/GameConfig/SEAP69.ini b/Data/Sys/GameConfig/SEAP69.ini similarity index 100% rename from Data/User/GameConfig/SEAP69.ini rename to Data/Sys/GameConfig/SEAP69.ini diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/Sys/GameConfig/SEME4Q.ini similarity index 100% rename from Data/User/GameConfig/SEME4Q.ini rename to Data/Sys/GameConfig/SEME4Q.ini diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/Sys/GameConfig/SEMJ01.ini similarity index 100% rename from Data/User/GameConfig/SEMJ01.ini rename to Data/Sys/GameConfig/SEMJ01.ini diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/Sys/GameConfig/SEMP4Q.ini similarity index 100% rename from Data/User/GameConfig/SEMP4Q.ini rename to Data/Sys/GameConfig/SEMP4Q.ini diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/Sys/GameConfig/SEMX4Q.ini similarity index 100% rename from Data/User/GameConfig/SEMX4Q.ini rename to Data/Sys/GameConfig/SEMX4Q.ini diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/Sys/GameConfig/SEMY4Q.ini similarity index 100% rename from Data/User/GameConfig/SEMY4Q.ini rename to Data/Sys/GameConfig/SEMY4Q.ini diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/Sys/GameConfig/SEMZ4Q.ini similarity index 100% rename from Data/User/GameConfig/SEMZ4Q.ini rename to Data/Sys/GameConfig/SEMZ4Q.ini diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/Sys/GameConfig/SERE4Q.ini similarity index 100% rename from Data/User/GameConfig/SERE4Q.ini rename to Data/Sys/GameConfig/SERE4Q.ini diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/Sys/GameConfig/SERF4Q.ini similarity index 100% rename from Data/User/GameConfig/SERF4Q.ini rename to Data/Sys/GameConfig/SERF4Q.ini diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/Sys/GameConfig/SERP4Q.ini similarity index 100% rename from Data/User/GameConfig/SERP4Q.ini rename to Data/Sys/GameConfig/SERP4Q.ini diff --git a/Data/User/GameConfig/SF8E01.ini b/Data/Sys/GameConfig/SF8E01.ini similarity index 100% rename from Data/User/GameConfig/SF8E01.ini rename to Data/Sys/GameConfig/SF8E01.ini diff --git a/Data/User/GameConfig/SF8J01.ini b/Data/Sys/GameConfig/SF8J01.ini similarity index 100% rename from Data/User/GameConfig/SF8J01.ini rename to Data/Sys/GameConfig/SF8J01.ini diff --git a/Data/User/GameConfig/SF8P01.ini b/Data/Sys/GameConfig/SF8P01.ini similarity index 100% rename from Data/User/GameConfig/SF8P01.ini rename to Data/Sys/GameConfig/SF8P01.ini diff --git a/Data/User/GameConfig/SFIE01.ini b/Data/Sys/GameConfig/SFIE01.ini similarity index 100% rename from Data/User/GameConfig/SFIE01.ini rename to Data/Sys/GameConfig/SFIE01.ini diff --git a/Data/User/GameConfig/SFIP01.ini b/Data/Sys/GameConfig/SFIP01.ini similarity index 100% rename from Data/User/GameConfig/SFIP01.ini rename to Data/Sys/GameConfig/SFIP01.ini diff --git a/Data/User/GameConfig/SFWE69.ini b/Data/Sys/GameConfig/SFWE69.ini similarity index 100% rename from Data/User/GameConfig/SFWE69.ini rename to Data/Sys/GameConfig/SFWE69.ini diff --git a/Data/User/GameConfig/SFWP69.ini b/Data/Sys/GameConfig/SFWP69.ini similarity index 100% rename from Data/User/GameConfig/SFWP69.ini rename to Data/Sys/GameConfig/SFWP69.ini diff --git a/Data/User/GameConfig/SGAP8P.ini b/Data/Sys/GameConfig/SGAP8P.ini similarity index 100% rename from Data/User/GameConfig/SGAP8P.ini rename to Data/Sys/GameConfig/SGAP8P.ini diff --git a/Data/User/GameConfig/SH6E52.ini b/Data/Sys/GameConfig/SH6E52.ini similarity index 100% rename from Data/User/GameConfig/SH6E52.ini rename to Data/Sys/GameConfig/SH6E52.ini diff --git a/Data/User/GameConfig/SHDE52.ini b/Data/Sys/GameConfig/SHDE52.ini similarity index 100% rename from Data/User/GameConfig/SHDE52.ini rename to Data/Sys/GameConfig/SHDE52.ini diff --git a/Data/User/GameConfig/SHLPA4.ini b/Data/Sys/GameConfig/SHLPA4.ini similarity index 100% rename from Data/User/GameConfig/SHLPA4.ini rename to Data/Sys/GameConfig/SHLPA4.ini diff --git a/Data/User/GameConfig/SILE78.ini b/Data/Sys/GameConfig/SILE78.ini similarity index 100% rename from Data/User/GameConfig/SILE78.ini rename to Data/Sys/GameConfig/SILE78.ini diff --git a/Data/User/GameConfig/SILP78.ini b/Data/Sys/GameConfig/SILP78.ini similarity index 100% rename from Data/User/GameConfig/SILP78.ini rename to Data/Sys/GameConfig/SILP78.ini diff --git a/Data/User/GameConfig/SJBE52.ini b/Data/Sys/GameConfig/SJBE52.ini similarity index 100% rename from Data/User/GameConfig/SJBE52.ini rename to Data/Sys/GameConfig/SJBE52.ini diff --git a/Data/User/GameConfig/SJBP52.ini b/Data/Sys/GameConfig/SJBP52.ini similarity index 100% rename from Data/User/GameConfig/SJBP52.ini rename to Data/Sys/GameConfig/SJBP52.ini diff --git a/Data/User/GameConfig/SJDE41.ini b/Data/Sys/GameConfig/SJDE41.ini similarity index 100% rename from Data/User/GameConfig/SJDE41.ini rename to Data/Sys/GameConfig/SJDE41.ini diff --git a/Data/User/GameConfig/SJDP41.ini b/Data/Sys/GameConfig/SJDP41.ini similarity index 100% rename from Data/User/GameConfig/SJDP41.ini rename to Data/Sys/GameConfig/SJDP41.ini diff --git a/Data/User/GameConfig/SJDY41.ini b/Data/Sys/GameConfig/SJDY41.ini similarity index 100% rename from Data/User/GameConfig/SJDY41.ini rename to Data/Sys/GameConfig/SJDY41.ini diff --git a/Data/User/GameConfig/SJDZ41.ini b/Data/Sys/GameConfig/SJDZ41.ini similarity index 100% rename from Data/User/GameConfig/SJDZ41.ini rename to Data/Sys/GameConfig/SJDZ41.ini diff --git a/Data/User/GameConfig/SJXD41.ini b/Data/Sys/GameConfig/SJXD41.ini similarity index 100% rename from Data/User/GameConfig/SJXD41.ini rename to Data/Sys/GameConfig/SJXD41.ini diff --git a/Data/User/GameConfig/SJXE41.ini b/Data/Sys/GameConfig/SJXE41.ini similarity index 100% rename from Data/User/GameConfig/SJXE41.ini rename to Data/Sys/GameConfig/SJXE41.ini diff --git a/Data/User/GameConfig/SJXP41.ini b/Data/Sys/GameConfig/SJXP41.ini similarity index 100% rename from Data/User/GameConfig/SJXP41.ini rename to Data/Sys/GameConfig/SJXP41.ini diff --git a/Data/User/GameConfig/SK3EEB.ini b/Data/Sys/GameConfig/SK3EEB.ini similarity index 100% rename from Data/User/GameConfig/SK3EEB.ini rename to Data/Sys/GameConfig/SK3EEB.ini diff --git a/Data/User/GameConfig/SK4E52.ini b/Data/Sys/GameConfig/SK4E52.ini similarity index 100% rename from Data/User/GameConfig/SK4E52.ini rename to Data/Sys/GameConfig/SK4E52.ini diff --git a/Data/User/GameConfig/SKJE78.ini b/Data/Sys/GameConfig/SKJE78.ini similarity index 100% rename from Data/User/GameConfig/SKJE78.ini rename to Data/Sys/GameConfig/SKJE78.ini diff --git a/Data/User/GameConfig/SKVE20.ini b/Data/Sys/GameConfig/SKVE20.ini similarity index 100% rename from Data/User/GameConfig/SKVE20.ini rename to Data/Sys/GameConfig/SKVE20.ini diff --git a/Data/User/GameConfig/SLSEXJ.ini b/Data/Sys/GameConfig/SLSEXJ.ini similarity index 100% rename from Data/User/GameConfig/SLSEXJ.ini rename to Data/Sys/GameConfig/SLSEXJ.ini diff --git a/Data/User/GameConfig/SLSJ01.ini b/Data/Sys/GameConfig/SLSJ01.ini similarity index 100% rename from Data/User/GameConfig/SLSJ01.ini rename to Data/Sys/GameConfig/SLSJ01.ini diff --git a/Data/User/GameConfig/SLSP01.ini b/Data/Sys/GameConfig/SLSP01.ini similarity index 100% rename from Data/User/GameConfig/SLSP01.ini rename to Data/Sys/GameConfig/SLSP01.ini diff --git a/Data/User/GameConfig/SLWE41.ini b/Data/Sys/GameConfig/SLWE41.ini similarity index 100% rename from Data/User/GameConfig/SLWE41.ini rename to Data/Sys/GameConfig/SLWE41.ini diff --git a/Data/User/GameConfig/SMBE8P.ini b/Data/Sys/GameConfig/SMBE8P.ini similarity index 100% rename from Data/User/GameConfig/SMBE8P.ini rename to Data/Sys/GameConfig/SMBE8P.ini diff --git a/Data/User/GameConfig/SMBP8P.ini b/Data/Sys/GameConfig/SMBP8P.ini similarity index 100% rename from Data/User/GameConfig/SMBP8P.ini rename to Data/Sys/GameConfig/SMBP8P.ini diff --git a/Data/User/GameConfig/SMFE4Q.ini b/Data/Sys/GameConfig/SMFE4Q.ini similarity index 100% rename from Data/User/GameConfig/SMFE4Q.ini rename to Data/Sys/GameConfig/SMFE4Q.ini diff --git a/Data/User/GameConfig/SMFP4Q.ini b/Data/Sys/GameConfig/SMFP4Q.ini similarity index 100% rename from Data/User/GameConfig/SMFP4Q.ini rename to Data/Sys/GameConfig/SMFP4Q.ini diff --git a/Data/User/GameConfig/SMNE01.ini b/Data/Sys/GameConfig/SMNE01.ini similarity index 100% rename from Data/User/GameConfig/SMNE01.ini rename to Data/Sys/GameConfig/SMNE01.ini diff --git a/Data/User/GameConfig/SMNJ01.ini b/Data/Sys/GameConfig/SMNJ01.ini similarity index 100% rename from Data/User/GameConfig/SMNJ01.ini rename to Data/Sys/GameConfig/SMNJ01.ini diff --git a/Data/User/GameConfig/SMNK01.ini b/Data/Sys/GameConfig/SMNK01.ini similarity index 100% rename from Data/User/GameConfig/SMNK01.ini rename to Data/Sys/GameConfig/SMNK01.ini diff --git a/Data/User/GameConfig/SMNP01.ini b/Data/Sys/GameConfig/SMNP01.ini similarity index 100% rename from Data/User/GameConfig/SMNP01.ini rename to Data/Sys/GameConfig/SMNP01.ini diff --git a/Data/User/GameConfig/SMNW01.ini b/Data/Sys/GameConfig/SMNW01.ini similarity index 100% rename from Data/User/GameConfig/SMNW01.ini rename to Data/Sys/GameConfig/SMNW01.ini diff --git a/Data/User/GameConfig/SMOE41.ini b/Data/Sys/GameConfig/SMOE41.ini similarity index 100% rename from Data/User/GameConfig/SMOE41.ini rename to Data/Sys/GameConfig/SMOE41.ini diff --git a/Data/User/GameConfig/SMOP41.ini b/Data/Sys/GameConfig/SMOP41.ini similarity index 100% rename from Data/User/GameConfig/SMOP41.ini rename to Data/Sys/GameConfig/SMOP41.ini diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/Sys/GameConfig/SMOX41.ini similarity index 100% rename from Data/User/GameConfig/SMOX41.ini rename to Data/Sys/GameConfig/SMOX41.ini diff --git a/Data/User/GameConfig/SN4EDA.ini b/Data/Sys/GameConfig/SN4EDA.ini similarity index 100% rename from Data/User/GameConfig/SN4EDA.ini rename to Data/Sys/GameConfig/SN4EDA.ini diff --git a/Data/User/GameConfig/SN4JDA.ini b/Data/Sys/GameConfig/SN4JDA.ini similarity index 100% rename from Data/User/GameConfig/SN4JDA.ini rename to Data/Sys/GameConfig/SN4JDA.ini diff --git a/Data/User/GameConfig/SN4XGT.ini b/Data/Sys/GameConfig/SN4XGT.ini similarity index 100% rename from Data/User/GameConfig/SN4XGT.ini rename to Data/Sys/GameConfig/SN4XGT.ini diff --git a/Data/User/GameConfig/SNCE8P.ini b/Data/Sys/GameConfig/SNCE8P.ini similarity index 100% rename from Data/User/GameConfig/SNCE8P.ini rename to Data/Sys/GameConfig/SNCE8P.ini diff --git a/Data/User/GameConfig/SNCJ8P.ini b/Data/Sys/GameConfig/SNCJ8P.ini similarity index 100% rename from Data/User/GameConfig/SNCJ8P.ini rename to Data/Sys/GameConfig/SNCJ8P.ini diff --git a/Data/User/GameConfig/SNCP8P.ini b/Data/Sys/GameConfig/SNCP8P.ini similarity index 100% rename from Data/User/GameConfig/SNCP8P.ini rename to Data/Sys/GameConfig/SNCP8P.ini diff --git a/Data/User/GameConfig/SNDE20.ini b/Data/Sys/GameConfig/SNDE20.ini similarity index 100% rename from Data/User/GameConfig/SNDE20.ini rename to Data/Sys/GameConfig/SNDE20.ini diff --git a/Data/User/GameConfig/SNJE69.ini b/Data/Sys/GameConfig/SNJE69.ini similarity index 100% rename from Data/User/GameConfig/SNJE69.ini rename to Data/Sys/GameConfig/SNJE69.ini diff --git a/Data/User/GameConfig/SNJP69.ini b/Data/Sys/GameConfig/SNJP69.ini similarity index 100% rename from Data/User/GameConfig/SNJP69.ini rename to Data/Sys/GameConfig/SNJP69.ini diff --git a/Data/User/GameConfig/SO3EE9.ini b/Data/Sys/GameConfig/SO3EE9.ini similarity index 100% rename from Data/User/GameConfig/SO3EE9.ini rename to Data/Sys/GameConfig/SO3EE9.ini diff --git a/Data/User/GameConfig/SO3J99.ini b/Data/Sys/GameConfig/SO3J99.ini similarity index 100% rename from Data/User/GameConfig/SO3J99.ini rename to Data/Sys/GameConfig/SO3J99.ini diff --git a/Data/User/GameConfig/SOJE41.ini b/Data/Sys/GameConfig/SOJE41.ini similarity index 100% rename from Data/User/GameConfig/SOJE41.ini rename to Data/Sys/GameConfig/SOJE41.ini diff --git a/Data/User/GameConfig/SOJP41.ini b/Data/Sys/GameConfig/SOJP41.ini similarity index 100% rename from Data/User/GameConfig/SOJP41.ini rename to Data/Sys/GameConfig/SOJP41.ini diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/Sys/GameConfig/SOUE01.ini similarity index 100% rename from Data/User/GameConfig/SOUE01.ini rename to Data/Sys/GameConfig/SOUE01.ini diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/Sys/GameConfig/SOUJ01.ini similarity index 100% rename from Data/User/GameConfig/SOUJ01.ini rename to Data/Sys/GameConfig/SOUJ01.ini diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/Sys/GameConfig/SOUK01.ini similarity index 100% rename from Data/User/GameConfig/SOUK01.ini rename to Data/Sys/GameConfig/SOUK01.ini diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/Sys/GameConfig/SOUP01.ini similarity index 100% rename from Data/User/GameConfig/SOUP01.ini rename to Data/Sys/GameConfig/SOUP01.ini diff --git a/Data/User/GameConfig/SPDE52.ini b/Data/Sys/GameConfig/SPDE52.ini similarity index 100% rename from Data/User/GameConfig/SPDE52.ini rename to Data/Sys/GameConfig/SPDE52.ini diff --git a/Data/User/GameConfig/SPDP52.ini b/Data/Sys/GameConfig/SPDP52.ini similarity index 100% rename from Data/User/GameConfig/SPDP52.ini rename to Data/Sys/GameConfig/SPDP52.ini diff --git a/Data/User/GameConfig/SPPEFS.ini b/Data/Sys/GameConfig/SPPEFS.ini similarity index 100% rename from Data/User/GameConfig/SPPEFS.ini rename to Data/Sys/GameConfig/SPPEFS.ini diff --git a/Data/User/GameConfig/SPTJEB.ini b/Data/Sys/GameConfig/SPTJEB.ini similarity index 100% rename from Data/User/GameConfig/SPTJEB.ini rename to Data/Sys/GameConfig/SPTJEB.ini diff --git a/Data/User/GameConfig/SPVEA4.ini b/Data/Sys/GameConfig/SPVEA4.ini similarity index 100% rename from Data/User/GameConfig/SPVEA4.ini rename to Data/Sys/GameConfig/SPVEA4.ini diff --git a/Data/User/GameConfig/SPVPA4.ini b/Data/Sys/GameConfig/SPVPA4.ini similarity index 100% rename from Data/User/GameConfig/SPVPA4.ini rename to Data/Sys/GameConfig/SPVPA4.ini diff --git a/Data/User/GameConfig/SPVXA4.ini b/Data/Sys/GameConfig/SPVXA4.ini similarity index 100% rename from Data/User/GameConfig/SPVXA4.ini rename to Data/Sys/GameConfig/SPVXA4.ini diff --git a/Data/User/GameConfig/SPVYA4.ini b/Data/Sys/GameConfig/SPVYA4.ini similarity index 100% rename from Data/User/GameConfig/SPVYA4.ini rename to Data/Sys/GameConfig/SPVYA4.ini diff --git a/Data/User/GameConfig/SQME52.ini b/Data/Sys/GameConfig/SQME52.ini similarity index 100% rename from Data/User/GameConfig/SQME52.ini rename to Data/Sys/GameConfig/SQME52.ini diff --git a/Data/User/GameConfig/SQMP52.ini b/Data/Sys/GameConfig/SQMP52.ini similarity index 100% rename from Data/User/GameConfig/SQMP52.ini rename to Data/Sys/GameConfig/SQMP52.ini diff --git a/Data/User/GameConfig/SR5E41.ini b/Data/Sys/GameConfig/SR5E41.ini similarity index 100% rename from Data/User/GameConfig/SR5E41.ini rename to Data/Sys/GameConfig/SR5E41.ini diff --git a/Data/User/GameConfig/SRQE41.ini b/Data/Sys/GameConfig/SRQE41.ini similarity index 100% rename from Data/User/GameConfig/SRQE41.ini rename to Data/Sys/GameConfig/SRQE41.ini diff --git a/Data/User/GameConfig/SRQP41.ini b/Data/Sys/GameConfig/SRQP41.ini similarity index 100% rename from Data/User/GameConfig/SRQP41.ini rename to Data/Sys/GameConfig/SRQP41.ini diff --git a/Data/User/GameConfig/SS3EWR.ini b/Data/Sys/GameConfig/SS3EWR.ini similarity index 100% rename from Data/User/GameConfig/SS3EWR.ini rename to Data/Sys/GameConfig/SS3EWR.ini diff --git a/Data/User/GameConfig/SSQE01.ini b/Data/Sys/GameConfig/SSQE01.ini similarity index 100% rename from Data/User/GameConfig/SSQE01.ini rename to Data/Sys/GameConfig/SSQE01.ini diff --git a/Data/User/GameConfig/SSQJ01.ini b/Data/Sys/GameConfig/SSQJ01.ini similarity index 100% rename from Data/User/GameConfig/SSQJ01.ini rename to Data/Sys/GameConfig/SSQJ01.ini diff --git a/Data/User/GameConfig/SSQP01.ini b/Data/Sys/GameConfig/SSQP01.ini similarity index 100% rename from Data/User/GameConfig/SSQP01.ini rename to Data/Sys/GameConfig/SSQP01.ini diff --git a/Data/User/GameConfig/SSRE20.ini b/Data/Sys/GameConfig/SSRE20.ini similarity index 100% rename from Data/User/GameConfig/SSRE20.ini rename to Data/Sys/GameConfig/SSRE20.ini diff --git a/Data/User/GameConfig/SSRPXT.ini b/Data/Sys/GameConfig/SSRPXT.ini similarity index 100% rename from Data/User/GameConfig/SSRPXT.ini rename to Data/Sys/GameConfig/SSRPXT.ini diff --git a/Data/User/GameConfig/SSZE5G.ini b/Data/Sys/GameConfig/SSZE5G.ini similarity index 100% rename from Data/User/GameConfig/SSZE5G.ini rename to Data/Sys/GameConfig/SSZE5G.ini diff --git a/Data/User/GameConfig/STEETR.ini b/Data/Sys/GameConfig/STEETR.ini similarity index 100% rename from Data/User/GameConfig/STEETR.ini rename to Data/Sys/GameConfig/STEETR.ini diff --git a/Data/User/GameConfig/STHP8P.ini b/Data/Sys/GameConfig/STHP8P.ini similarity index 100% rename from Data/User/GameConfig/STHP8P.ini rename to Data/Sys/GameConfig/STHP8P.ini diff --git a/Data/User/GameConfig/STKE08.ini b/Data/Sys/GameConfig/STKE08.ini similarity index 100% rename from Data/User/GameConfig/STKE08.ini rename to Data/Sys/GameConfig/STKE08.ini diff --git a/Data/User/GameConfig/STKJ08.ini b/Data/Sys/GameConfig/STKJ08.ini similarity index 100% rename from Data/User/GameConfig/STKJ08.ini rename to Data/Sys/GameConfig/STKJ08.ini diff --git a/Data/User/GameConfig/STKP08.ini b/Data/Sys/GameConfig/STKP08.ini similarity index 100% rename from Data/User/GameConfig/STKP08.ini rename to Data/Sys/GameConfig/STKP08.ini diff --git a/Data/User/GameConfig/SUKE01.ini b/Data/Sys/GameConfig/SUKE01.ini similarity index 100% rename from Data/User/GameConfig/SUKE01.ini rename to Data/Sys/GameConfig/SUKE01.ini diff --git a/Data/User/GameConfig/SUKJ01.ini b/Data/Sys/GameConfig/SUKJ01.ini similarity index 100% rename from Data/User/GameConfig/SUKJ01.ini rename to Data/Sys/GameConfig/SUKJ01.ini diff --git a/Data/User/GameConfig/SUKP01.ini b/Data/Sys/GameConfig/SUKP01.ini similarity index 100% rename from Data/User/GameConfig/SUKP01.ini rename to Data/Sys/GameConfig/SUKP01.ini diff --git a/Data/User/GameConfig/SVBE52.ini b/Data/Sys/GameConfig/SVBE52.ini similarity index 100% rename from Data/User/GameConfig/SVBE52.ini rename to Data/Sys/GameConfig/SVBE52.ini diff --git a/Data/User/GameConfig/SVBP52.ini b/Data/Sys/GameConfig/SVBP52.ini similarity index 100% rename from Data/User/GameConfig/SVBP52.ini rename to Data/Sys/GameConfig/SVBP52.ini diff --git a/Data/User/GameConfig/SVME01.ini b/Data/Sys/GameConfig/SVME01.ini similarity index 100% rename from Data/User/GameConfig/SVME01.ini rename to Data/Sys/GameConfig/SVME01.ini diff --git a/Data/User/GameConfig/SVMJ01.ini b/Data/Sys/GameConfig/SVMJ01.ini similarity index 100% rename from Data/User/GameConfig/SVMJ01.ini rename to Data/Sys/GameConfig/SVMJ01.ini diff --git a/Data/User/GameConfig/SVMP01.ini b/Data/Sys/GameConfig/SVMP01.ini similarity index 100% rename from Data/User/GameConfig/SVMP01.ini rename to Data/Sys/GameConfig/SVMP01.ini diff --git a/Data/User/GameConfig/SWAE52.ini b/Data/Sys/GameConfig/SWAE52.ini similarity index 100% rename from Data/User/GameConfig/SWAE52.ini rename to Data/Sys/GameConfig/SWAE52.ini diff --git a/Data/User/GameConfig/SX3J01.ini b/Data/Sys/GameConfig/SX3J01.ini similarity index 100% rename from Data/User/GameConfig/SX3J01.ini rename to Data/Sys/GameConfig/SX3J01.ini diff --git a/Data/User/GameConfig/SX3P01.ini b/Data/Sys/GameConfig/SX3P01.ini similarity index 100% rename from Data/User/GameConfig/SX3P01.ini rename to Data/Sys/GameConfig/SX3P01.ini diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/Sys/GameConfig/SX4J01.ini similarity index 100% rename from Data/User/GameConfig/SX4J01.ini rename to Data/Sys/GameConfig/SX4J01.ini diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/Sys/GameConfig/SX4P01.ini similarity index 100% rename from Data/User/GameConfig/SX4P01.ini rename to Data/Sys/GameConfig/SX4P01.ini diff --git a/Data/User/GameConfig/SX8E52.ini b/Data/Sys/GameConfig/SX8E52.ini similarity index 100% rename from Data/User/GameConfig/SX8E52.ini rename to Data/Sys/GameConfig/SX8E52.ini diff --git a/Data/User/GameConfig/SXBP52.ini b/Data/Sys/GameConfig/SXBP52.ini similarity index 100% rename from Data/User/GameConfig/SXBP52.ini rename to Data/Sys/GameConfig/SXBP52.ini diff --git a/Data/User/GameConfig/SXCE52.ini b/Data/Sys/GameConfig/SXCE52.ini similarity index 100% rename from Data/User/GameConfig/SXCE52.ini rename to Data/Sys/GameConfig/SXCE52.ini diff --git a/Data/User/GameConfig/SXCP52.ini b/Data/Sys/GameConfig/SXCP52.ini similarity index 100% rename from Data/User/GameConfig/SXCP52.ini rename to Data/Sys/GameConfig/SXCP52.ini diff --git a/Data/User/GameConfig/SXDE52.ini b/Data/Sys/GameConfig/SXDE52.ini similarity index 100% rename from Data/User/GameConfig/SXDE52.ini rename to Data/Sys/GameConfig/SXDE52.ini diff --git a/Data/User/GameConfig/SXEE52.ini b/Data/Sys/GameConfig/SXEE52.ini similarity index 100% rename from Data/User/GameConfig/SXEE52.ini rename to Data/Sys/GameConfig/SXEE52.ini diff --git a/Data/User/GameConfig/SZAE69.ini b/Data/Sys/GameConfig/SZAE69.ini similarity index 100% rename from Data/User/GameConfig/SZAE69.ini rename to Data/Sys/GameConfig/SZAE69.ini diff --git a/Data/User/GameConfig/SZAP69.ini b/Data/Sys/GameConfig/SZAP69.ini similarity index 100% rename from Data/User/GameConfig/SZAP69.ini rename to Data/Sys/GameConfig/SZAP69.ini diff --git a/Data/User/GameConfig/SZBE69.ini b/Data/Sys/GameConfig/SZBE69.ini similarity index 100% rename from Data/User/GameConfig/SZBE69.ini rename to Data/Sys/GameConfig/SZBE69.ini diff --git a/Data/User/GameConfig/SZBP69.ini b/Data/Sys/GameConfig/SZBP69.ini similarity index 100% rename from Data/User/GameConfig/SZBP69.ini rename to Data/Sys/GameConfig/SZBP69.ini diff --git a/Data/User/GameConfig/UGPE01.ini b/Data/Sys/GameConfig/UGPE01.ini similarity index 100% rename from Data/User/GameConfig/UGPE01.ini rename to Data/Sys/GameConfig/UGPE01.ini diff --git a/Data/User/GameConfig/UGPP01.ini b/Data/Sys/GameConfig/UGPP01.ini similarity index 100% rename from Data/User/GameConfig/UGPP01.ini rename to Data/Sys/GameConfig/UGPP01.ini diff --git a/Data/User/GameConfig/W2GE08.ini b/Data/Sys/GameConfig/W2GE08.ini similarity index 100% rename from Data/User/GameConfig/W2GE08.ini rename to Data/Sys/GameConfig/W2GE08.ini diff --git a/Data/User/GameConfig/W2GP08.ini b/Data/Sys/GameConfig/W2GP08.ini similarity index 100% rename from Data/User/GameConfig/W2GP08.ini rename to Data/Sys/GameConfig/W2GP08.ini diff --git a/Data/User/GameConfig/W2MEBB.ini b/Data/Sys/GameConfig/W2MEBB.ini similarity index 100% rename from Data/User/GameConfig/W2MEBB.ini rename to Data/Sys/GameConfig/W2MEBB.ini diff --git a/Data/User/GameConfig/W3GE08.ini b/Data/Sys/GameConfig/W3GE08.ini similarity index 100% rename from Data/User/GameConfig/W3GE08.ini rename to Data/Sys/GameConfig/W3GE08.ini diff --git a/Data/User/GameConfig/W3GP08.ini b/Data/Sys/GameConfig/W3GP08.ini similarity index 100% rename from Data/User/GameConfig/W3GP08.ini rename to Data/Sys/GameConfig/W3GP08.ini diff --git a/Data/User/GameConfig/W8CEXS.ini b/Data/Sys/GameConfig/W8CEXS.ini similarity index 100% rename from Data/User/GameConfig/W8CEXS.ini rename to Data/Sys/GameConfig/W8CEXS.ini diff --git a/Data/User/GameConfig/W8CPXS.ini b/Data/Sys/GameConfig/W8CPXS.ini similarity index 100% rename from Data/User/GameConfig/W8CPXS.ini rename to Data/Sys/GameConfig/W8CPXS.ini diff --git a/Data/User/GameConfig/WA4P01.ini b/Data/Sys/GameConfig/WA4P01.ini similarity index 100% rename from Data/User/GameConfig/WA4P01.ini rename to Data/Sys/GameConfig/WA4P01.ini diff --git a/Data/User/GameConfig/WALE01.ini b/Data/Sys/GameConfig/WALE01.ini similarity index 100% rename from Data/User/GameConfig/WALE01.ini rename to Data/Sys/GameConfig/WALE01.ini diff --git a/Data/User/GameConfig/WAYETJ.ini b/Data/Sys/GameConfig/WAYETJ.ini similarity index 100% rename from Data/User/GameConfig/WAYETJ.ini rename to Data/Sys/GameConfig/WAYETJ.ini diff --git a/Data/User/GameConfig/WB2ETL.ini b/Data/Sys/GameConfig/WB2ETL.ini similarity index 100% rename from Data/User/GameConfig/WB2ETL.ini rename to Data/Sys/GameConfig/WB2ETL.ini diff --git a/Data/User/GameConfig/WB3ETL.ini b/Data/Sys/GameConfig/WB3ETL.ini similarity index 100% rename from Data/User/GameConfig/WB3ETL.ini rename to Data/Sys/GameConfig/WB3ETL.ini diff --git a/Data/User/GameConfig/WB6EGL.ini b/Data/Sys/GameConfig/WB6EGL.ini similarity index 100% rename from Data/User/GameConfig/WB6EGL.ini rename to Data/Sys/GameConfig/WB6EGL.ini diff --git a/Data/User/GameConfig/WBLPGD.ini b/Data/Sys/GameConfig/WBLPGD.ini similarity index 100% rename from Data/User/GameConfig/WBLPGD.ini rename to Data/Sys/GameConfig/WBLPGD.ini diff --git a/Data/User/GameConfig/WBME01.ini b/Data/Sys/GameConfig/WBME01.ini similarity index 100% rename from Data/User/GameConfig/WBME01.ini rename to Data/Sys/GameConfig/WBME01.ini diff --git a/Data/User/GameConfig/WBQE18.ini b/Data/Sys/GameConfig/WBQE18.ini similarity index 100% rename from Data/User/GameConfig/WBQE18.ini rename to Data/Sys/GameConfig/WBQE18.ini diff --git a/Data/User/GameConfig/WBXETL.ini b/Data/Sys/GameConfig/WBXETL.ini similarity index 100% rename from Data/User/GameConfig/WBXETL.ini rename to Data/Sys/GameConfig/WBXETL.ini diff --git a/Data/User/GameConfig/WBYETL.ini b/Data/Sys/GameConfig/WBYETL.ini similarity index 100% rename from Data/User/GameConfig/WBYETL.ini rename to Data/Sys/GameConfig/WBYETL.ini diff --git a/Data/User/GameConfig/WBZETL.ini b/Data/Sys/GameConfig/WBZETL.ini similarity index 100% rename from Data/User/GameConfig/WBZETL.ini rename to Data/Sys/GameConfig/WBZETL.ini diff --git a/Data/User/GameConfig/WC6EUP.ini b/Data/Sys/GameConfig/WC6EUP.ini similarity index 100% rename from Data/User/GameConfig/WC6EUP.ini rename to Data/Sys/GameConfig/WC6EUP.ini diff --git a/Data/User/GameConfig/WCHEJS.ini b/Data/Sys/GameConfig/WCHEJS.ini similarity index 100% rename from Data/User/GameConfig/WCHEJS.ini rename to Data/Sys/GameConfig/WCHEJS.ini diff --git a/Data/User/GameConfig/WCVENV.ini b/Data/Sys/GameConfig/WCVENV.ini similarity index 100% rename from Data/User/GameConfig/WCVENV.ini rename to Data/Sys/GameConfig/WCVENV.ini diff --git a/Data/User/GameConfig/WD9EA4.ini b/Data/Sys/GameConfig/WD9EA4.ini similarity index 100% rename from Data/User/GameConfig/WD9EA4.ini rename to Data/Sys/GameConfig/WD9EA4.ini diff --git a/Data/User/GameConfig/WDME01.ini b/Data/Sys/GameConfig/WDME01.ini similarity index 100% rename from Data/User/GameConfig/WDME01.ini rename to Data/Sys/GameConfig/WDME01.ini diff --git a/Data/User/GameConfig/WDMP01.ini b/Data/Sys/GameConfig/WDMP01.ini similarity index 100% rename from Data/User/GameConfig/WDMP01.ini rename to Data/Sys/GameConfig/WDMP01.ini diff --git a/Data/User/GameConfig/WERP18.ini b/Data/Sys/GameConfig/WERP18.ini similarity index 100% rename from Data/User/GameConfig/WERP18.ini rename to Data/Sys/GameConfig/WERP18.ini diff --git a/Data/User/GameConfig/WF4EGD.ini b/Data/Sys/GameConfig/WF4EGD.ini similarity index 100% rename from Data/User/GameConfig/WF4EGD.ini rename to Data/Sys/GameConfig/WF4EGD.ini diff --git a/Data/User/GameConfig/WFLE01.ini b/Data/Sys/GameConfig/WFLE01.ini similarity index 100% rename from Data/User/GameConfig/WFLE01.ini rename to Data/Sys/GameConfig/WFLE01.ini diff --git a/Data/User/GameConfig/WFUEQQ.ini b/Data/Sys/GameConfig/WFUEQQ.ini similarity index 100% rename from Data/User/GameConfig/WFUEQQ.ini rename to Data/Sys/GameConfig/WFUEQQ.ini diff --git a/Data/User/GameConfig/WGDEA4.ini b/Data/Sys/GameConfig/WGDEA4.ini similarity index 100% rename from Data/User/GameConfig/WGDEA4.ini rename to Data/Sys/GameConfig/WGDEA4.ini diff --git a/Data/User/GameConfig/WGDPA4.ini b/Data/Sys/GameConfig/WGDPA4.ini similarity index 100% rename from Data/User/GameConfig/WGDPA4.ini rename to Data/Sys/GameConfig/WGDPA4.ini diff --git a/Data/User/GameConfig/WGOEWG.ini b/Data/Sys/GameConfig/WGOEWG.ini similarity index 100% rename from Data/User/GameConfig/WGOEWG.ini rename to Data/Sys/GameConfig/WGOEWG.ini diff --git a/Data/User/GameConfig/WGOPWG.ini b/Data/Sys/GameConfig/WGOPWG.ini similarity index 100% rename from Data/User/GameConfig/WGOPWG.ini rename to Data/Sys/GameConfig/WGOPWG.ini diff --git a/Data/User/GameConfig/WGSE08.ini b/Data/Sys/GameConfig/WGSE08.ini similarity index 100% rename from Data/User/GameConfig/WGSE08.ini rename to Data/Sys/GameConfig/WGSE08.ini diff --git a/Data/User/GameConfig/WGSP08.ini b/Data/Sys/GameConfig/WGSP08.ini similarity index 100% rename from Data/User/GameConfig/WGSP08.ini rename to Data/Sys/GameConfig/WGSP08.ini diff --git a/Data/User/GameConfig/WGYEHN.ini b/Data/Sys/GameConfig/WGYEHN.ini similarity index 100% rename from Data/User/GameConfig/WGYEHN.ini rename to Data/Sys/GameConfig/WGYEHN.ini diff --git a/Data/User/GameConfig/WHFETY.ini b/Data/Sys/GameConfig/WHFETY.ini similarity index 100% rename from Data/User/GameConfig/WHFETY.ini rename to Data/Sys/GameConfig/WHFETY.ini diff --git a/Data/User/GameConfig/WHWEFJ.ini b/Data/Sys/GameConfig/WHWEFJ.ini similarity index 100% rename from Data/User/GameConfig/WHWEFJ.ini rename to Data/Sys/GameConfig/WHWEFJ.ini diff --git a/Data/User/GameConfig/WHWPFJ.ini b/Data/Sys/GameConfig/WHWPFJ.ini similarity index 100% rename from Data/User/GameConfig/WHWPFJ.ini rename to Data/Sys/GameConfig/WHWPFJ.ini diff --git a/Data/User/GameConfig/WICPKQ.ini b/Data/Sys/GameConfig/WICPKQ.ini similarity index 100% rename from Data/User/GameConfig/WICPKQ.ini rename to Data/Sys/GameConfig/WICPKQ.ini diff --git a/Data/User/GameConfig/WIDEUN.ini b/Data/Sys/GameConfig/WIDEUN.ini similarity index 100% rename from Data/User/GameConfig/WIDEUN.ini rename to Data/Sys/GameConfig/WIDEUN.ini diff --git a/Data/User/GameConfig/WILETL.ini b/Data/Sys/GameConfig/WILETL.ini similarity index 100% rename from Data/User/GameConfig/WILETL.ini rename to Data/Sys/GameConfig/WILETL.ini diff --git a/Data/User/GameConfig/WIYETL.ini b/Data/Sys/GameConfig/WIYETL.ini similarity index 100% rename from Data/User/GameConfig/WIYETL.ini rename to Data/Sys/GameConfig/WIYETL.ini diff --git a/Data/User/GameConfig/WJEEJX.ini b/Data/Sys/GameConfig/WJEEJX.ini similarity index 100% rename from Data/User/GameConfig/WJEEJX.ini rename to Data/Sys/GameConfig/WJEEJX.ini diff --git a/Data/User/GameConfig/WKTJA4.ini b/Data/Sys/GameConfig/WKTJA4.ini similarity index 100% rename from Data/User/GameConfig/WKTJA4.ini rename to Data/Sys/GameConfig/WKTJA4.ini diff --git a/Data/User/GameConfig/WKTPA4.ini b/Data/Sys/GameConfig/WKTPA4.ini similarity index 100% rename from Data/User/GameConfig/WKTPA4.ini rename to Data/Sys/GameConfig/WKTPA4.ini diff --git a/Data/User/GameConfig/WLOEHL.ini b/Data/Sys/GameConfig/WLOEHL.ini similarity index 100% rename from Data/User/GameConfig/WLOEHL.ini rename to Data/Sys/GameConfig/WLOEHL.ini diff --git a/Data/User/GameConfig/WLWEHL.ini b/Data/Sys/GameConfig/WLWEHL.ini similarity index 100% rename from Data/User/GameConfig/WLWEHL.ini rename to Data/Sys/GameConfig/WLWEHL.ini diff --git a/Data/User/GameConfig/WM8E18.ini b/Data/Sys/GameConfig/WM8E18.ini similarity index 100% rename from Data/User/GameConfig/WM8E18.ini rename to Data/Sys/GameConfig/WM8E18.ini diff --git a/Data/User/GameConfig/WMBP01.ini b/Data/Sys/GameConfig/WMBP01.ini similarity index 100% rename from Data/User/GameConfig/WMBP01.ini rename to Data/Sys/GameConfig/WMBP01.ini diff --git a/Data/User/GameConfig/WMMEAF.ini b/Data/Sys/GameConfig/WMMEAF.ini similarity index 100% rename from Data/User/GameConfig/WMMEAF.ini rename to Data/Sys/GameConfig/WMMEAF.ini diff --git a/Data/User/GameConfig/WOTEM0.ini b/Data/Sys/GameConfig/WOTEM0.ini similarity index 100% rename from Data/User/GameConfig/WOTEM0.ini rename to Data/Sys/GameConfig/WOTEM0.ini diff --git a/Data/User/GameConfig/WPCE01.ini b/Data/Sys/GameConfig/WPCE01.ini similarity index 100% rename from Data/User/GameConfig/WPCE01.ini rename to Data/Sys/GameConfig/WPCE01.ini diff --git a/Data/User/GameConfig/WPJEJW.ini b/Data/Sys/GameConfig/WPJEJW.ini similarity index 100% rename from Data/User/GameConfig/WPJEJW.ini rename to Data/Sys/GameConfig/WPJEJW.ini diff --git a/Data/User/GameConfig/WPPEXS.ini b/Data/Sys/GameConfig/WPPEXS.ini similarity index 100% rename from Data/User/GameConfig/WPPEXS.ini rename to Data/Sys/GameConfig/WPPEXS.ini diff --git a/Data/User/GameConfig/WPPJJF.ini b/Data/Sys/GameConfig/WPPJJF.ini similarity index 100% rename from Data/User/GameConfig/WPPJJF.ini rename to Data/Sys/GameConfig/WPPJJF.ini diff --git a/Data/User/GameConfig/WPSE01.ini b/Data/Sys/GameConfig/WPSE01.ini similarity index 100% rename from Data/User/GameConfig/WPSE01.ini rename to Data/Sys/GameConfig/WPSE01.ini diff --git a/Data/User/GameConfig/WPUEGD.ini b/Data/Sys/GameConfig/WPUEGD.ini similarity index 100% rename from Data/User/GameConfig/WPUEGD.ini rename to Data/Sys/GameConfig/WPUEGD.ini diff --git a/Data/User/GameConfig/WPYPPY.ini b/Data/Sys/GameConfig/WPYPPY.ini similarity index 100% rename from Data/User/GameConfig/WPYPPY.ini rename to Data/Sys/GameConfig/WPYPPY.ini diff --git a/Data/User/GameConfig/WR9E08.ini b/Data/Sys/GameConfig/WR9E08.ini similarity index 100% rename from Data/User/GameConfig/WR9E08.ini rename to Data/Sys/GameConfig/WR9E08.ini diff --git a/Data/User/GameConfig/WR9P08.ini b/Data/Sys/GameConfig/WR9P08.ini similarity index 100% rename from Data/User/GameConfig/WR9P08.ini rename to Data/Sys/GameConfig/WR9P08.ini diff --git a/Data/User/GameConfig/WRGEHU.ini b/Data/Sys/GameConfig/WRGEHU.ini similarity index 100% rename from Data/User/GameConfig/WRGEHU.ini rename to Data/Sys/GameConfig/WRGEHU.ini diff --git a/Data/User/GameConfig/WRIPGD.ini b/Data/Sys/GameConfig/WRIPGD.ini similarity index 100% rename from Data/User/GameConfig/WRIPGD.ini rename to Data/Sys/GameConfig/WRIPGD.ini diff --git a/Data/User/GameConfig/WRUPXS.ini b/Data/Sys/GameConfig/WRUPXS.ini similarity index 100% rename from Data/User/GameConfig/WRUPXS.ini rename to Data/Sys/GameConfig/WRUPXS.ini diff --git a/Data/User/GameConfig/WRXE08.ini b/Data/Sys/GameConfig/WRXE08.ini similarity index 100% rename from Data/User/GameConfig/WRXE08.ini rename to Data/Sys/GameConfig/WRXE08.ini diff --git a/Data/User/GameConfig/WSNE8P.ini b/Data/Sys/GameConfig/WSNE8P.ini similarity index 100% rename from Data/User/GameConfig/WSNE8P.ini rename to Data/Sys/GameConfig/WSNE8P.ini diff --git a/Data/User/GameConfig/WTEELU.ini b/Data/Sys/GameConfig/WTEELU.ini similarity index 100% rename from Data/User/GameConfig/WTEELU.ini rename to Data/Sys/GameConfig/WTEELU.ini diff --git a/Data/User/GameConfig/WTKEGL.ini b/Data/Sys/GameConfig/WTKEGL.ini similarity index 100% rename from Data/User/GameConfig/WTKEGL.ini rename to Data/Sys/GameConfig/WTKEGL.ini diff --git a/Data/User/GameConfig/WTRPXS.ini b/Data/Sys/GameConfig/WTRPXS.ini similarity index 100% rename from Data/User/GameConfig/WTRPXS.ini rename to Data/Sys/GameConfig/WTRPXS.ini diff --git a/Data/User/GameConfig/WTTPTW.ini b/Data/Sys/GameConfig/WTTPTW.ini similarity index 100% rename from Data/User/GameConfig/WTTPTW.ini rename to Data/Sys/GameConfig/WTTPTW.ini diff --git a/Data/User/GameConfig/WTXPJS.ini b/Data/Sys/GameConfig/WTXPJS.ini similarity index 100% rename from Data/User/GameConfig/WTXPJS.ini rename to Data/Sys/GameConfig/WTXPJS.ini diff --git a/Data/User/GameConfig/WWRE01.ini b/Data/Sys/GameConfig/WWRE01.ini similarity index 100% rename from Data/User/GameConfig/WWRE01.ini rename to Data/Sys/GameConfig/WWRE01.ini diff --git a/Data/User/GameConfig/WZIPTW.ini b/Data/Sys/GameConfig/WZIPTW.ini similarity index 100% rename from Data/User/GameConfig/WZIPTW.ini rename to Data/Sys/GameConfig/WZIPTW.ini diff --git a/Data/User/GameConfig/WZPPRZ.ini b/Data/Sys/GameConfig/WZPPRZ.ini similarity index 100% rename from Data/User/GameConfig/WZPPRZ.ini rename to Data/Sys/GameConfig/WZPPRZ.ini diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index fd5ca2b238..1077aadd81 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -38,21 +38,15 @@ // Shared data dirs (Sys and shared User for linux) #ifdef _WIN32 #define SYSDATA_DIR "Sys" - #define SHARED_USER_DIR File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP #elif defined __APPLE__ #define SYSDATA_DIR "Contents/Resources/Sys" - #define SHARED_USER_DIR File::GetBundleDirectory() + \ - DIR_SEP USERDATA_DIR DIR_SEP #elif defined ANDROID #define SYSDATA_DIR "/sdcard/dolphin-emu" - #define SHARED_USER_DIR SYSDATA_DIR #else #ifdef DATA_DIR #define SYSDATA_DIR DATA_DIR "sys" - #define SHARED_USER_DIR DATA_DIR USERDATA_DIR DIR_SEP #else #define SYSDATA_DIR "sys" - #define SHARED_USER_DIR ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP #endif #endif diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 5a5a836b65..9c7f2af3de 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -244,14 +244,14 @@ else() # Copy data files into application bundle. file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake " - file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User + file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys DESTINATION ${BUNDLE_PATH}/Contents/Resources ) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle \"\") ") add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake - DEPENDS ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User + DEPENDS ${CMAKE_SOURCE_DIR}/Data/Sys VERBATIM ) add_custom_target(CopyDataIntoBundle ALL @@ -288,7 +288,7 @@ else() add_custom_command(OUTPUT ${BUNDLE_PATH}/Contents/Resources/en.lproj COMMAND ${CMAKE_COMMAND} -P copy_translations_into_bundle.cmake DEPENDS ${GMO_FILES} - ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User + ${CMAKE_SOURCE_DIR}/Data/Sys VERBATIM ) add_custom_target(CopyTranslationsIntoBundle ALL diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index c354b640e3..998f2bd1ed 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -254,8 +254,8 @@ bool DolphinApp::OnInit() File::GetUserPath(D_WIIUSER_IDX)); // TODO: replace these with overlays - File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP), - File::GetUserPath(D_GAMECONFIG_IDX)); + File::CopyDir(std::string(File::GetSysDirectory() + GAMECONFIG_DIR DIR_SEP), + File::GetUserPath(D_GAMECONFIG_IDX)); File::CreateFullPath(File::GetUserPath(D_USER_IDX)); File::CreateFullPath(File::GetUserPath(D_CACHE_IDX)); From d1e96c7282cdc77961f6ef4f5591bb8955ced761 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 4 Sep 2013 23:21:45 +0200 Subject: [PATCH 166/267] Display warning OSD messages when a game ini is overriding any settings. --- Source/Core/VideoCommon/Src/VideoConfig.cpp | 99 ++++++++++++--------- 1 file changed, 58 insertions(+), 41 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 707aec734c..9220ec9661 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -122,28 +122,42 @@ void VideoConfig::Load(const char *ini_file) void VideoConfig::GameIniLoad(const char *ini_file) { + bool gfx_override_exists = false; + + // XXX: Again, bad place to put OSD messages at (see delroth's comment above) + // XXX: This will add an OSD message for each projection hack value... meh +#define CHECK_SETTING(section, key, var) { \ + decltype(var) temp = var; \ + if (iniFile.GetIfExists(section, key, &var) && var != temp) { \ + char buf[256]; \ + snprintf(buf, sizeof(buf), "Note: Option \"%s\" is overridden by game ini.", key); \ + OSD::AddMessage(buf, 7500); \ + gfx_override_exists = true; \ + } \ + } + IniFile iniFile; iniFile.Load(ini_file); - iniFile.GetIfExists("Video_Hardware", "VSync", &bVSync); + CHECK_SETTING("Video_Hardware", "VSync", bVSync); - iniFile.GetIfExists("Video_Settings", "wideScreenHack", &bWidescreenHack); - iniFile.GetIfExists("Video_Settings", "AspectRatio", &iAspectRatio); - iniFile.GetIfExists("Video_Settings", "Crop", &bCrop); - iniFile.GetIfExists("Video_Settings", "UseXFB", &bUseXFB); - iniFile.GetIfExists("Video_Settings", "UseRealXFB", &bUseRealXFB); - iniFile.GetIfExists("Video_Settings", "SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples); - iniFile.GetIfExists("Video_Settings", "DLOptimize", &iCompileDLsLevel); - iniFile.GetIfExists("Video_Settings", "HiresTextures", &bHiresTextures); - iniFile.GetIfExists("Video_Settings", "AnaglyphStereo", &bAnaglyphStereo); - iniFile.GetIfExists("Video_Settings", "AnaglyphStereoSeparation", &iAnaglyphStereoSeparation); - iniFile.GetIfExists("Video_Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle); - iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting); - iniFile.GetIfExists("Video_Settings", "HackedBufferUpload", &bHackedBufferUpload); - iniFile.GetIfExists("Video_Settings", "FastDepthCalc", &bFastDepthCalc); - iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode); + CHECK_SETTING("Video_Settings", "wideScreenHack", bWidescreenHack); + CHECK_SETTING("Video_Settings", "AspectRatio", iAspectRatio); + CHECK_SETTING("Video_Settings", "Crop", bCrop); + CHECK_SETTING("Video_Settings", "UseXFB", bUseXFB); + CHECK_SETTING("Video_Settings", "UseRealXFB", bUseRealXFB); + CHECK_SETTING("Video_Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples); + CHECK_SETTING("Video_Settings", "DLOptimize", iCompileDLsLevel); + CHECK_SETTING("Video_Settings", "HiresTextures", bHiresTextures); + CHECK_SETTING("Video_Settings", "AnaglyphStereo", bAnaglyphStereo); + CHECK_SETTING("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation); + CHECK_SETTING("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle); + CHECK_SETTING("Video_Settings", "EnablePixelLighting", bEnablePixelLighting); + CHECK_SETTING("Video_Settings", "HackedBufferUpload", bHackedBufferUpload); + CHECK_SETTING("Video_Settings", "FastDepthCalc", bFastDepthCalc); + CHECK_SETTING("Video_Settings", "MSAA", iMultisampleMode); int tmp = -9000; - iniFile.GetIfExists("Video_Settings", "EFBScale", &tmp); // integral + CHECK_SETTING("Video_Settings", "EFBScale", tmp); // integral if (tmp != -9000) { if (tmp != SCALE_FORCE_INTEGRAL) @@ -169,33 +183,36 @@ void VideoConfig::GameIniLoad(const char *ini_file) } } - iniFile.GetIfExists("Video_Settings", "DstAlphaPass", &bDstAlphaPass); - iniFile.GetIfExists("Video_Settings", "DisableFog", &bDisableFog); - iniFile.GetIfExists("Video_Settings", "EnableOpenCL", &bEnableOpenCL); - iniFile.GetIfExists("Video_Settings", "OMPDecoder", &bOMPDecoder); + CHECK_SETTING("Video_Settings", "DstAlphaPass", bDstAlphaPass); + CHECK_SETTING("Video_Settings", "DisableFog", bDisableFog); + CHECK_SETTING("Video_Settings", "EnableOpenCL", bEnableOpenCL); + CHECK_SETTING("Video_Settings", "OMPDecoder", bOMPDecoder); - iniFile.GetIfExists("Video_Enhancements", "ForceFiltering", &bForceFiltering); - iniFile.GetIfExists("Video_Enhancements", "MaxAnisotropy", &iMaxAnisotropy); // NOTE - this is x in (1 << x) - iniFile.GetIfExists("Video_Enhancements", "PostProcessingShader", &sPostProcessingShader); - iniFile.GetIfExists("Video_Enhancements", "Enable3dVision", &b3DVision); + CHECK_SETTING("Video_Enhancements", "ForceFiltering", bForceFiltering); + CHECK_SETTING("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy); // NOTE - this is x in (1 << x) + CHECK_SETTING("Video_Enhancements", "PostProcessingShader", sPostProcessingShader); + CHECK_SETTING("Video_Enhancements", "Enable3dVision", b3DVision); - iniFile.GetIfExists("Video_Hacks", "EFBAccessEnable", &bEFBAccessEnable); - iniFile.GetIfExists("Video_Hacks", "DlistCachingEnable", &bDlistCachingEnable); - iniFile.GetIfExists("Video_Hacks", "EFBCopyEnable", &bEFBCopyEnable); - iniFile.GetIfExists("Video_Hacks", "EFBToTextureEnable", &bCopyEFBToTexture); - iniFile.GetIfExists("Video_Hacks", "EFBScaledCopy", &bCopyEFBScaled); - iniFile.GetIfExists("Video_Hacks", "EFBCopyCacheEnable", &bEFBCopyCacheEnable); - iniFile.GetIfExists("Video_Hacks", "EFBEmulateFormatChanges", &bEFBEmulateFormatChanges); + CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable); + CHECK_SETTING("Video_Hacks", "DlistCachingEnable", bDlistCachingEnable); + CHECK_SETTING("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable); + CHECK_SETTING("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture); + CHECK_SETTING("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled); + CHECK_SETTING("Video_Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable); + CHECK_SETTING("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges); - iniFile.GetIfExists("Video", "ProjectionHack", &iPhackvalue[0]); - iniFile.GetIfExists("Video", "PH_SZNear", &iPhackvalue[1]); - iniFile.GetIfExists("Video", "PH_SZFar", &iPhackvalue[2]); - iniFile.GetIfExists("Video", "PH_ExtraParam", &iPhackvalue[3]); - iniFile.GetIfExists("Video", "PH_ZNear", &sPhackvalue[0]); - iniFile.GetIfExists("Video", "PH_ZFar", &sPhackvalue[1]); - iniFile.GetIfExists("Video", "ZTPSpeedupHack", &bZTPSpeedHack); - iniFile.GetIfExists("Video", "UseBBox", &bUseBBox); - iniFile.GetIfExists("Video", "PerfQueriesEnable", &bPerfQueriesEnable); + CHECK_SETTING("Video", "ProjectionHack", iPhackvalue[0]); + CHECK_SETTING("Video", "PH_SZNear", iPhackvalue[1]); + CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]); + CHECK_SETTING("Video", "PH_ExtraParam", iPhackvalue[3]); + CHECK_SETTING("Video", "PH_ZNear", sPhackvalue[0]); + CHECK_SETTING("Video", "PH_ZFar", sPhackvalue[1]); + CHECK_SETTING("Video", "ZTPSpeedupHack", bZTPSpeedHack); + CHECK_SETTING("Video", "UseBBox", bUseBBox); + CHECK_SETTING("Video", "PerfQueriesEnable", bPerfQueriesEnable); + + if (gfx_override_exists) + OSD::AddMessage("Warning: Opening the graphics configuration will reset settings and might cause issues!", 10000); } void VideoConfig::VerifyValidity() From cf4c39d2be7d91abb5d2078d6c6e6a6fa0760c82 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 6 Sep 2013 19:56:19 +0200 Subject: [PATCH 167/267] IniFile: Support extending the list of loaded keys and sections with data from other ini files. Changes a lot of parsing code which previously was not aware of the notion of key/value, and operated only with raw lines. Now key/value is the default and lines are handled as raw only if they do not contain =, or they start with $ or + (for Gecko/AR compatibility). --- Source/Core/Common/Src/IniFile.cpp | 167 +++++++++++++---------------- Source/Core/Common/Src/IniFile.h | 29 ++++- 2 files changed, 97 insertions(+), 99 deletions(-) diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp index 2eca8df929..1c45a8095e 100644 --- a/Source/Core/Common/Src/IniFile.cpp +++ b/Source/Core/Common/Src/IniFile.cpp @@ -20,7 +20,7 @@ namespace { -static void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut) +void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut) { if (line[0] == '#') return; @@ -37,32 +37,15 @@ static void ParseLine(const std::string& line, std::string* keyOut, std::string* } -std::string* IniFile::Section::GetLine(const char* key, std::string* valueOut) -{ - for (std::vector::iterator iter = lines.begin(); iter != lines.end(); ++iter) - { - std::string& line = *iter; - std::string lineKey; - ParseLine(line, &lineKey, valueOut); - if (!strcasecmp(lineKey.c_str(), key)) - return &line; - } - return 0; -} - void IniFile::Section::Set(const char* key, const char* newValue) { - std::string value; - std::string* line = GetLine(key, &value); - if (line) - { - // Change the value - keep the key and comment - *line = StripSpaces(key) + " = " + newValue; - } + auto it = values.find(key); + if (it != values.end()) + it->second = newValue; else { - // The key did not already exist in this section - let's add it. - lines.push_back(std::string(key) + " = " + newValue); + values[key] = newValue; + keys_order.push_back(key); } } @@ -74,20 +57,6 @@ void IniFile::Section::Set(const char* key, const std::string& newValue, const s Delete(key); } -bool IniFile::Section::Get(const char* key, std::string* value, const char* defaultValue) -{ - std::string* line = GetLine(key, value); - if (!line) - { - if (defaultValue) - { - *value = defaultValue; - } - return false; - } - return true; -} - void IniFile::Section::Set(const char* key, const float newValue, const float defaultValue) { if (newValue != defaultValue) @@ -126,7 +95,24 @@ void IniFile::Section::Set(const char* key, const std::vector& newV Set(key, temp.c_str()); } -bool IniFile::Section::Get(const char* key, std::vector& values) +bool IniFile::Section::Get(const char* key, std::string* value, const char* defaultValue) +{ + auto it = values.find(key); + if (it != values.end()) + { + *value = it->second; + return true; + } + else if (defaultValue) + { + *value = defaultValue; + return true; + } + else + return false; +} + +bool IniFile::Section::Get(const char* key, std::vector& out) { std::string temp; bool retval = Get(key, &temp, 0); @@ -145,7 +131,7 @@ bool IniFile::Section::Get(const char* key, std::vector& values) subEnd = temp.find_first_of(",", subStart); if (subStart != subEnd) // take from first char until next , - values.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart))); + out.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart))); // Find the next non , char subStart = temp.find_first_not_of(",", subEnd); @@ -206,28 +192,18 @@ bool IniFile::Section::Get(const char* key, double* value, double defaultValue) bool IniFile::Section::Exists(const char *key) const { - for (std::vector::const_iterator iter = lines.begin(); iter != lines.end(); ++iter) - { - std::string lineKey; - ParseLine(*iter, &lineKey, NULL); - if (!strcasecmp(lineKey.c_str(), key)) - return true; - } - return false; + return values.find(key) != values.end(); } bool IniFile::Section::Delete(const char *key) { - std::string* line = GetLine(key, 0); - for (std::vector::iterator liter = lines.begin(); liter != lines.end(); ++liter) - { - if (line == &*liter) - { - lines.erase(liter); - return true; - } - } - return false; + auto it = values.find(key); + if (it == values.end()) + return false; + + values.erase(it); + keys_order.erase(std::find(keys_order.begin(), keys_order.end(), key)); + return true; } // IniFile @@ -286,11 +262,7 @@ bool IniFile::Exists(const char* sectionName, const char* key) const void IniFile::SetLines(const char* sectionName, const std::vector &lines) { Section* section = GetOrCreateSection(sectionName); - section->lines.clear(); - for (std::vector::const_iterator iter = lines.begin(); iter != lines.end(); ++iter) - { - section->lines.push_back(*iter); - } + section->lines = lines; } bool IniFile::DeleteKey(const char* sectionName, const char* key) @@ -298,16 +270,7 @@ bool IniFile::DeleteKey(const char* sectionName, const char* key) Section* section = GetSection(sectionName); if (!section) return false; - std::string* line = section->GetLine(key, 0); - for (std::vector::iterator liter = section->lines.begin(); liter != section->lines.end(); ++liter) - { - if (line == &(*liter)) - { - section->lines.erase(liter); - return true; - } - } - return false; //shouldn't happen + return section->Delete(key); } // Return a list of all keys in a section @@ -316,13 +279,7 @@ bool IniFile::GetKeys(const char* sectionName, std::vector& keys) c const Section* section = GetSection(sectionName); if (!section) return false; - keys.clear(); - for (std::vector::const_iterator liter = section->lines.begin(); liter != section->lines.end(); ++liter) - { - std::string key; - ParseLine(*liter, &key, 0); - keys.push_back(key); - } + keys = section->keys_order; return true; } @@ -364,13 +321,13 @@ void IniFile::SortSections() std::sort(sections.begin(), sections.end()); } -bool IniFile::Load(const char* filename) +bool IniFile::Load(const char* filename, bool keep_current_data) { // Maximum number of letters in a line static const int MAX_BYTES = 1024*32; - sections.clear(); - sections.push_back(Section("")); + if (!keep_current_data) + sections.clear(); // first section consists of the comments before the first real section // Open file @@ -379,12 +336,13 @@ bool IniFile::Load(const char* filename) if (in.fail()) return false; + Section* current_section = NULL; while (!in.eof()) { char templine[MAX_BYTES]; in.getline(templine, MAX_BYTES); std::string line = templine; - + #ifndef _WIN32 // Check for CRLF eol and convert it to LF if (!line.empty() && line.at(line.size()-1) == '\r') @@ -405,12 +363,25 @@ bool IniFile::Load(const char* filename) { // New section! std::string sub = line.substr(1, endpos - 1); - sections.push_back(Section(sub)); + current_section = GetOrCreateSection(sub.c_str()); } } else { - sections[sections.size() - 1].lines.push_back(line); + if (current_section) + { + std::string key, value; + ParseLine(line, &key, &value); + + // Lines starting with '$' or '+' are kept verbatim. Kind + // of a hack, but the support for raw lines inside an INI + // is a hack anyway. + if ((key == "" && value == "") + || (line.size() >= 1 && (line[0] == '$' || line[0] == '+'))) + current_section->lines.push_back(line.c_str()); + else + current_section->Set(key, value.c_str()); + } } } } @@ -429,27 +400,33 @@ bool IniFile::Save(const char* filename) return false; } - // Currently testing if dolphin community can handle the requirements of C++11 compilation - // If you get a compiler error on this line, your compiler is probably old. - // Update to g++ 4.4 or a recent version of clang (XCode 4.2 on OS X). - // If you don't want to update, complain in a google code issue, the dolphin forums or #dolphin-emu. for (auto iter = sections.begin(); iter != sections.end(); ++iter) { const Section& section = *iter; - if (section.name != "") - { + if (section.keys_order.size() != 0 || section.lines.size() != 0) out << "[" << section.name << "]" << std::endl; - } - for (std::vector::const_iterator liter = section.lines.begin(); liter != section.lines.end(); ++liter) + if (section.keys_order.size() == 0) { - std::string s = *liter; - out << s << std::endl; + for (auto liter = section.lines.begin(); liter != section.lines.end(); ++liter) + { + std::string s = *liter; + out << s << std::endl; + } + } + else + { + for (auto kvit = section.keys_order.begin(); kvit != section.keys_order.end(); ++kvit) + { + auto pair = section.values.find(*kvit); + out << pair->first << " = " << pair->second << std::endl; + } } } out.close(); + return true; } diff --git a/Source/Core/Common/Src/IniFile.h b/Source/Core/Common/Src/IniFile.h index bad26ca090..0cf4ab902b 100644 --- a/Source/Core/Common/Src/IniFile.h +++ b/Source/Core/Common/Src/IniFile.h @@ -6,11 +6,21 @@ #ifndef _INIFILE_H_ #define _INIFILE_H_ +#include #include +#include #include #include "StringUtil.h" +struct CaseInsensitiveStringCompare +{ + bool operator() (const std::string& a, const std::string& b) const + { + return strcasecmp(a.c_str(), b.c_str()) < 0; + } +}; + class IniFile { public: @@ -25,7 +35,6 @@ public: bool Exists(const char *key) const; bool Delete(const char *key); - std::string* GetLine(const char* key, std::string* valueOut); void Set(const char* key, const char* newValue); void Set(const char* key, const std::string& newValue, const std::string& defaultValue); @@ -68,12 +77,24 @@ public: } protected: - std::vector lines; std::string name; + + std::vector keys_order; + std::map values; + + std::vector lines; }; - bool Load(const char* filename); - bool Load(const std::string &filename) { return Load(filename.c_str()); } + /** + * Loads sections and keys. + * @param filename filename of the ini file which should be loaded + * @param keep_current_data If true, "extends" the currently loaded list of sections and keys with the loaded data (and replaces existing entries). If false, existing data will be erased. + * @warning Using any other operations than "Get*" and "Exists" is untested and will behave unexpectedly + * @todo This really is just a hack to support having two levels of gameinis (defaults and user-specified) and should eventually be replaced with a less stupid system. + */ + bool Load(const char* filename, bool keep_current_data = false); + bool Load(const std::string &filename, bool keep_current_data = false) { return Load(filename.c_str(), keep_current_data); } + bool Save(const char* filename); bool Save(const std::string &filename) { return Save(filename.c_str()); } From ef2ea31eacefcaa02aeda653f3ff3da4fa7e46e4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 04:12:57 +0000 Subject: [PATCH 168/267] [ARM] ps_madds0 and ps_madds1 implementations. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 2 + .../Src/PowerPC/JitArm32/JitArm_Paired.cpp | 68 ++++++++++++++++++- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 4 +- 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 75136ec155..143f21b5ee 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -210,6 +210,8 @@ public: void ps_sum0(UGeckoInstruction _inst); void ps_sum1(UGeckoInstruction _inst); void ps_madd(UGeckoInstruction _inst); + void ps_madds0(UGeckoInstruction _inst); + void ps_madds1(UGeckoInstruction _inst); void ps_sub(UGeckoInstruction _inst); void ps_mul(UGeckoInstruction _inst); void ps_muls0(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 019e0563e6..9f8c90b7df 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -47,7 +47,6 @@ void JitArm::ps_add(UGeckoInstruction inst) VADD(vD1, vA1, vB1); } -// Wrong, THP videos like SMS and Ikaruga show artifacts void JitArm::ps_madd(UGeckoInstruction inst) { INSTRUCTION_START @@ -83,6 +82,73 @@ void JitArm::ps_madd(UGeckoInstruction inst) fpr.Unlock(V1); } +void JitArm::ps_madds0(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + if (inst.Rc) { + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + + VMOV(V0, vB0); + VMOV(V1, vB1); + + VMLA(V0, vA0, vC0); + VMLA(V1, vA1, vC0); + + VMOV(vD0, V0); + VMOV(vD1, V1); + + fpr.Unlock(V0); + fpr.Unlock(V1); +} + +void JitArm::ps_madds1(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + if (inst.Rc) { + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vC1 = fpr.R1(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + + VMOV(V0, vB0); + VMOV(V1, vB1); + + VMLA(V0, vA0, vC1); + VMLA(V1, vA1, vC1); + + VMOV(vD0, V0); + VMOV(vD1, V1); + + fpr.Unlock(V0); + fpr.Unlock(V1); +} void JitArm::ps_sum0(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index da6d6b9dc8..4569eb54c4 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -147,8 +147,8 @@ static GekkoOPTemplate table4_2[] = {11, &JitArm::ps_sum1}, //"ps_sum1", OPTYPE_PS, 0}}, {12, &JitArm::ps_muls0}, //"ps_muls0", OPTYPE_PS, 0}}, {13, &JitArm::ps_muls1}, //"ps_muls1", OPTYPE_PS, 0}}, - {14, &JitArm::Default}, //"ps_madds0", OPTYPE_PS, 0}}, - {15, &JitArm::Default}, //"ps_madds1", OPTYPE_PS, 0}}, + {14, &JitArm::ps_madds0}, //"ps_madds0", OPTYPE_PS, 0}}, + {15, &JitArm::ps_madds1}, //"ps_madds1", OPTYPE_PS, 0}}, {18, &JitArm::Default}, //"ps_div", OPTYPE_PS, 0, 16}}, {20, &JitArm::ps_sub}, //"ps_sub", OPTYPE_PS, 0}}, {21, &JitArm::ps_add}, //"ps_add", OPTYPE_PS, 0}}, From 6fe86f1fd1fedf55ba58d52bd2e7252717334de7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 04:29:37 +0000 Subject: [PATCH 169/267] [ARM] cntlzwx implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp | 16 ++++++++++++++++ .../Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 143f21b5ee..cb2dbbd508 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -157,6 +157,7 @@ public: void arith(UGeckoInstruction _inst); void addex(UGeckoInstruction _inst); + void cntlzwx(UGeckoInstruction _inst); void cmp (UGeckoInstruction _inst); void cmpi(UGeckoInstruction _inst); void cmpl(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index 9873c0d479..67004ecfb5 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -529,6 +529,22 @@ void JitArm::addex(UGeckoInstruction inst) gpr.Unlock(rA); } +void JitArm::cntlzwx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITIntegerOff) + u32 a = inst.RA, s = inst.RS; + + ARMReg RA = gpr.R(a); + ARMReg RS = gpr.R(s); + CLZ(RA, RS); + if (inst.Rc) + { + CMP(RA, 0); + ComputeRC(); + } +} + void JitArm::mulhwux(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 4569eb54c4..9728bc270c 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -204,7 +204,7 @@ static GekkoOPTemplate table31[] = {284, &JitArm::arith}, //"eqvx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, {0, &JitArm::cmp}, //"cmp", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, {32, &JitArm::cmpl}, //"cmpl", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, - {26, &JitArm::Default}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {26, &JitArm::cntlzwx}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, {922, &JitArm::extshx}, //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, {954, &JitArm::extsbx}, //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, {536, &JitArm::Default}, //"srwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, From c211d06ad22fe3a4564367e0d2daaf011aab8bbc Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 05:09:46 +0000 Subject: [PATCH 170/267] [ARM] stfd and stfdu implementations. --- Source/Core/Core/Src/HW/Memmap.h | 4 +- Source/Core/Core/Src/HW/MemmapFunctions.cpp | 10 +++ Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 2 + .../JitArm32/JitArm_LoadStoreFloating.cpp | 63 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 4 +- 5 files changed, 80 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h index fe05539ae2..689e5a57dd 100644 --- a/Source/Core/Core/Src/HW/Memmap.h +++ b/Source/Core/Core/Src/HW/Memmap.h @@ -140,7 +140,6 @@ u64 Read_U64(const u32 _Address); float Read_F32(const u32 _Address); double Read_F64(const u32 _Address); - // used by JIT. Return zero-extended 32bit values u32 Read_U8_ZX(const u32 _Address); u32 Read_U16_ZX(const u32 _Address); @@ -157,6 +156,9 @@ void Write_U16_Swap(const u16 _Data, const u32 _Address); void Write_U32_Swap(const u32 _Data, const u32 _Address); void Write_U64_Swap(const u64 _Data, const u32 _Address); +// Useful helper functions, used by ARM JIT +void Write_F64(const double _Data, const u32 _Address); + void WriteHW_U32(const u32 _Data, const u32 _Address); void GetString(std::string& _string, const u32 _Address); diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp index a5557d55b1..47872e3cd0 100644 --- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp @@ -507,6 +507,16 @@ void Write_U64_Swap(const u64 _Data, const u32 _Address) { Write_U64(Common::swap64(_Data), _Address); } +void Write_F64(const double _Data, const u32 _Address) +{ + union + { + u64 i; + double d; + } cvt; + cvt.d = _Data; + Write_U64(cvt.i, _Address); +} u8 ReadUnchecked_U8(const u32 _Address) { u8 _var = 0; diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index cb2dbbd508..bbaddb650f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -205,6 +205,8 @@ public: void lfdu(UGeckoInstruction _inst); void stfs(UGeckoInstruction _inst); void stfsu(UGeckoInstruction _inst); + void stfd(UGeckoInstruction _inst); + void stfdu(UGeckoInstruction _inst); // Paired Singles void ps_add(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index 6bc9392978..7b607adeb0 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -286,3 +286,66 @@ void JitArm::stfsu(UGeckoInstruction inst) gpr.Unlock(rA, rB); } +void JitArm::stfd(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStoreFloatingOff) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg v0 = fpr.R0(inst.FS); + + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + + MOVI2R(rA, (u32)&Memory::Write_F64); + PUSH(4, R0, R1, R2, R3); + VMOV(D0, v0); + MOV(R0, rB); + + BL(rA); + + POP(4, R0, R1, R2, R3); + + gpr.Unlock(rA, rB); +} + +void JitArm::stfdu(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStoreFloatingOff) + + ARMReg RA = gpr.R(inst.RA); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg v0 = fpr.R0(inst.FS); + + MOVI2R(rB, inst.SIMM_16); + ADD(rB, rB, RA); + + LDR(rA, R9, PPCSTATE_OFF(Exceptions)); + CMP(rA, EXCEPTION_DSI); + + SetCC(CC_NEQ); + MOV(RA, rB); + SetCC(); + + MOVI2R(rA, (u32)&Memory::Write_F64); + PUSH(4, R0, R1, R2, R3); + VMOV(D0, v0); + MOV(R0, rB); + + BL(rA); + + POP(4, R0, R1, R2, R3); + + gpr.Unlock(rA, rB); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 9728bc270c..7480e983ce 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -104,8 +104,8 @@ static GekkoOPTemplate primarytable[] = {52, &JitArm::stfs}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, {53, &JitArm::stfsu}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, - {54, &JitArm::Default}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, - {55, &JitArm::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + {54, &JitArm::stfd}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, + {55, &JitArm::stfdu}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, {56, &JitArm::psq_l}, //"psq_l", OPTYPE_PS, FL_IN_A}}, {57, &JitArm::psq_l}, //"psq_lu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, From be4277e8a111f660adb20091f1ab661aa32de619 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 05:16:18 +0000 Subject: [PATCH 171/267] [ARM] stmw implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 28 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index bbaddb650f..af1e1a4656 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -181,6 +181,7 @@ public: void stX(UGeckoInstruction _inst); void lXX(UGeckoInstruction _inst); void lmw(UGeckoInstruction _inst); + void stmw(UGeckoInstruction _inst); void icbi(UGeckoInstruction _inst); void dcbst(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index aa265fcfb8..9bb3e9be37 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -493,6 +493,34 @@ void JitArm::lmw(UGeckoInstruction inst) gpr.Unlock(rA, rB); } +void JitArm::stmw(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITLoadStoreOff) + if (!Core::g_CoreStartupParameter.bFastmem){ + Default(inst); return; + } + + u32 a = inst.RA; + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg rC = gpr.GetReg(); + MOVI2R(rA, inst.SIMM_16); + if (a) + ADD(rA, rA, gpr.R(a)); + Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK) + BIC(rA, rA, mask); // 3 + MOVI2R(rB, (u32)Memory::base, false); // 4-5 + ADD(rA, rA, rB); // 6 + + for (int i = inst.RD; i < 32; i++) + { + ARMReg RX = gpr.R(i); + REV(rC, RX); + STR(rC, rA, (i - inst.RD) * 4); + } + gpr.Unlock(rA, rB, rC); +} void JitArm::dcbst(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 7480e983ce..89a8b9fb3f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -95,7 +95,7 @@ static GekkoOPTemplate primarytable[] = {39, &JitArm::stX}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, {46, &JitArm::lmw}, //"lmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, - {47, &JitArm::Default}, //"stmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, + {47, &JitArm::stmw}, //"stmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, {48, &JitArm::lfs}, //"lfs", OPTYPE_LOADFP, FL_IN_A}}, {49, &JitArm::lfsu}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, From 53498dafebb4b6cba3456b255869617b89566000 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 05:52:09 +0000 Subject: [PATCH 172/267] [ARM] fmaddsx and fmaddx implementations. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 3 ++ .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 51 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 4 +- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index af1e1a4656..c5df10f697 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -197,6 +197,9 @@ public: void fmulsx(UGeckoInstruction _inst); void fmulx(UGeckoInstruction _inst); void fmrx(UGeckoInstruction _inst); + void fmaddsx(UGeckoInstruction _inst); + void fmaddx(UGeckoInstruction _inst); + // Floating point loadStore void lfs(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index e1877b608c..d89e6f6e33 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -173,3 +173,54 @@ void JitArm::fmrx(UGeckoInstruction inst) if (inst.Rc) Helper_UpdateCR1(vD); } +void JitArm::fmaddsx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITFloatingPointOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + ARMReg vA0 = fpr.R0(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + + ARMReg V0 = fpr.GetReg(); + + VMOV(V0, vB0); + + VMLA(V0, vA0, vC0); + + VMOV(vD0, V0); + VMOV(vD1, V0); + + fpr.Unlock(V0); + + if (inst.Rc) Helper_UpdateCR1(vD0); +} + +void JitArm::fmaddx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITFloatingPointOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + ARMReg vA0 = fpr.R0(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vD0 = fpr.R0(d, false); + + ARMReg V0 = fpr.GetReg(); + + VMOV(V0, vB0); + + VMLA(V0, vA0, vC0); + + VMOV(vD0, V0); + + fpr.Unlock(V0); + + if (inst.Rc) Helper_UpdateCR1(vD0); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 89a8b9fb3f..4b91fd097c 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -339,7 +339,7 @@ static GekkoOPTemplate table59[] = {24, &JitArm::Default}, //"fresx", OPTYPE_FPU, FL_RC_BIT_F}}, {25, &JitArm::fmulsx}, //"fmulsx", OPTYPE_FPU, FL_RC_BIT_F}}, {28, &JitArm::Default}, //"fmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, - {29, &JitArm::Default}, //"fmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {29, &JitArm::fmaddsx}, //"fmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, {30, &JitArm::Default}, //"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, {31, &JitArm::Default}, //"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, }; @@ -374,7 +374,7 @@ static GekkoOPTemplate table63_2[] = {25, &JitArm::fmulx}, //"fmulx", OPTYPE_FPU, FL_RC_BIT_F}}, {26, &JitArm::Default}, //"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F}}, {28, &JitArm::Default}, //"fmsubx", OPTYPE_FPU, FL_RC_BIT_F}}, - {29, &JitArm::Default}, //"fmaddx", OPTYPE_FPU, FL_RC_BIT_F}}, + {29, &JitArm::fmaddx}, //"fmaddx", OPTYPE_FPU, FL_RC_BIT_F}}, {30, &JitArm::Default}, //"fnmsubx", OPTYPE_FPU, FL_RC_BIT_F}}, {31, &JitArm::Default}, //"fnmaddx", OPTYPE_FPU, FL_RC_BIT_F}}, }; From 81d79862020ee92e42cd8bd12a5f27216e60a9c5 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 09:06:49 +0000 Subject: [PATCH 173/267] [ARM] Add LSRS emitters, and ASR{S} register emitters. Fixes encoding in LSR emitter. --- Source/Core/Common/Src/ArmEmitter.cpp | 8 +++++++- Source/Core/Common/Src/ArmEmitter.h | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index 70a165d114..a5a45545de 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -612,9 +612,15 @@ void ARMXEmitter::LSL (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedData void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(0, true, dest, src, op2);} void ARMXEmitter::LSL (ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(1, false, dest, src, op2);} void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(1, true, dest, src, op2);} -void ARMXEmitter::LSR (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(3, false, dest, src, op2);} +void ARMXEmitter::LSR (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(2, false, dest, src, op2);} +void ARMXEmitter::LSRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(2, true, dest, src, op2);} +void ARMXEmitter::LSR (ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(3, false, dest, src, op2);} +void ARMXEmitter::LSRS(ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(3, true, dest, src, op2);} void ARMXEmitter::ASR (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, false, dest, src, op2);} void ARMXEmitter::ASRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, true, dest, src, op2);} +void ARMXEmitter::ASR (ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(5, false, dest, src, op2);} +void ARMXEmitter::ASRS(ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(5, true, dest, src, op2);} + void ARMXEmitter::MUL (ARMReg dest, ARMReg src, ARMReg op2) { Write32(condition | (dest << 16) | (src << 8) | (9 << 4) | op2); diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h index 138780e836..3e70c3c04c 100644 --- a/Source/Core/Common/Src/ArmEmitter.h +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -448,8 +448,13 @@ public: void LSLS(ARMReg dest, ARMReg src, Operand2 op2); void LSLS(ARMReg dest, ARMReg src, ARMReg op2); void LSR (ARMReg dest, ARMReg src, Operand2 op2); + void LSRS(ARMReg dest, ARMReg src, Operand2 op2); + void LSR (ARMReg dest, ARMReg src, ARMReg op2); + void LSRS(ARMReg dest, ARMReg src, ARMReg op2); void ASR (ARMReg dest, ARMReg src, Operand2 op2); void ASRS(ARMReg dest, ARMReg src, Operand2 op2); + void ASR (ARMReg dest, ARMReg src, ARMReg op2); + void ASRS(ARMReg dest, ARMReg src, ARMReg op2); void SBC (ARMReg dest, ARMReg src, Operand2 op2); void SBCS(ARMReg dest, ARMReg src, Operand2 op2); void RBIT(ARMReg dest, ARMReg src); From e56071f2be777e0fb9b362c0c3e73144eca4191e Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2013 09:07:34 +0000 Subject: [PATCH 174/267] [ARM] slwx/srwx/srawx implementations. --- .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 35 ++++++++++++++++++- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 6 ++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index 67004ecfb5..a5a6b1b274 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -219,6 +219,7 @@ void JitArm::arith(UGeckoInstruction inst) case 31: // addcx, addx, subfx switch(inst.SUBOP10) { + case 24: // slwx case 28: // andx case 60: // andcx case 124: // norx @@ -227,6 +228,8 @@ void JitArm::arith(UGeckoInstruction inst) case 412: // orcx case 444: // orx case 476: // nandx + case 536: // srwx + case 792: // srawx if (gpr.IsImm(s)) { isImm[0] = true; @@ -239,6 +242,7 @@ void JitArm::arith(UGeckoInstruction inst) } Rc = inst.Rc; break; + case 10: // addcx carry = true; case 40: // subfx @@ -302,6 +306,10 @@ void JitArm::arith(UGeckoInstruction inst) case 31: // addcx, addx, subfx switch(inst.SUBOP10) { + case 24: + gpr.SetImmediate(a, Imm[0] << Imm[1]); + dest = a; + break; case 28: gpr.SetImmediate(a, And(Imm[0], Imm[1])); dest = a; @@ -340,6 +348,14 @@ void JitArm::arith(UGeckoInstruction inst) gpr.SetImmediate(a, ~And(Imm[1], Imm[0])); dest = a; break; + case 536: + gpr.SetImmediate(a, Imm[0] >> Imm[1]); + dest = a; + break; + case 792: + gpr.SetImmediate(a, ((s32)Imm[0]) >> Imm[1]); + dest = a; + break; case 10: // addcx case 266: case 778: // both addx @@ -428,6 +444,12 @@ void JitArm::arith(UGeckoInstruction inst) case 31: switch(inst.SUBOP10) { + case 24: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + LSLS(RA, RS, RB); + break; case 28: RA = gpr.R(a); RS = gpr.R(s); @@ -496,7 +518,18 @@ void JitArm::arith(UGeckoInstruction inst) AND(RA, RS, RB); MVNS(RA, RA); break; - + case 536: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + LSRS(RA, RS, RB); + break; + case 792: + RA = gpr.R(a); + RS = gpr.R(s); + RB = gpr.R(b); + ASRS(RA, RS, RB); + break; case 10: // addcx case 266: case 778: // both addx diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 4b91fd097c..12e1deb0ab 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -207,10 +207,10 @@ static GekkoOPTemplate table31[] = {26, &JitArm::cntlzwx}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, {922, &JitArm::extshx}, //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, {954, &JitArm::extsbx}, //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, - {536, &JitArm::Default}, //"srwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, - {792, &JitArm::Default}, //"srawx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {536, &JitArm::arith}, //"srwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {792, &JitArm::arith}, //"srawx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, {824, &JitArm::srawix}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, - {24, &JitArm::Default}, //"slwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {24, &JitArm::arith}, //"slwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, {54, &JitArm::dcbst}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, {86, &JitArm::Default}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, From 501eafb4075e4b335807824753385835f1954bac Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 7 Sep 2013 23:02:49 +0200 Subject: [PATCH 175/267] Overlay local gameinis over global gameinis instead of copying. Huge megacommit because a lot of things needed to be modified to make this possible. --- .../{GameConfig => GameSettings}/D43E01.ini | 0 .../{GameConfig => GameSettings}/D43J01.ini | 2 +- .../{GameConfig => GameSettings}/D43P01.ini | 0 .../{GameConfig => GameSettings}/D43U01.ini | 0 .../{GameConfig => GameSettings}/DTLX01.ini | 0 .../{GameConfig => GameSettings}/DVDXDV.ini | 0 .../{GameConfig => GameSettings}/FABP01.ini | 0 .../{GameConfig => GameSettings}/FBYE01.ini | 0 .../{GameConfig => GameSettings}/G2BE5G.ini | 0 .../{GameConfig => GameSettings}/G2BP7D.ini | 0 .../{GameConfig => GameSettings}/G2CE52.ini | 0 .../{GameConfig => GameSettings}/G2FE78.ini | 0 .../{GameConfig => GameSettings}/G2GJB2.ini | 0 .../{GameConfig => GameSettings}/G2ME01.ini | 0 .../{GameConfig => GameSettings}/G2MP01.ini | 0 .../{GameConfig => GameSettings}/G2OE41.ini | 0 .../{GameConfig => GameSettings}/G2OP41.ini | 0 .../{GameConfig => GameSettings}/G2RE52.ini | 0 .../{GameConfig => GameSettings}/G2TE52.ini | 0 .../{GameConfig => GameSettings}/G2VE08.ini | 0 .../{GameConfig => GameSettings}/G2VP08.ini | 0 .../{GameConfig => GameSettings}/G2XE8P.ini | 0 .../{GameConfig => GameSettings}/G2XP8P.ini | 0 .../{GameConfig => GameSettings}/G3AD69.ini | 0 .../{GameConfig => GameSettings}/G3AE69.ini | 0 .../{GameConfig => GameSettings}/G3AF69.ini | 0 .../{GameConfig => GameSettings}/G3AP69.ini | 0 .../{GameConfig => GameSettings}/G3DE6L.ini | 0 .../{GameConfig => GameSettings}/G3EE51.ini | 0 .../{GameConfig => GameSettings}/G3FE69.ini | 0 .../{GameConfig => GameSettings}/G3FF69.ini | 0 .../{GameConfig => GameSettings}/G3FP69.ini | 0 .../{GameConfig => GameSettings}/G3JEAF.ini | 0 .../{GameConfig => GameSettings}/G3LE8P.ini | 0 .../{GameConfig => GameSettings}/G3NJDA.ini | 0 .../{GameConfig => GameSettings}/G3QEA4.ini | 0 .../{GameConfig => GameSettings}/G3RD52.ini | 0 .../{GameConfig => GameSettings}/G3RE52.ini | 0 .../{GameConfig => GameSettings}/G3RF52.ini | 0 .../{GameConfig => GameSettings}/G3RP52.ini | 0 .../{GameConfig => GameSettings}/G3SE41.ini | 0 .../{GameConfig => GameSettings}/G3VE69.ini | 0 .../{GameConfig => GameSettings}/G3XE52.ini | 0 .../{GameConfig => GameSettings}/G3XP52.ini | 0 .../{GameConfig => GameSettings}/G4AEE9.ini | 0 .../{GameConfig => GameSettings}/G4BE08.ini | 0 .../{GameConfig => GameSettings}/G4BP08.ini | 0 .../{GameConfig => GameSettings}/G4CE54.ini | 0 .../{GameConfig => GameSettings}/G4FD69.ini | 0 .../{GameConfig => GameSettings}/G4FE69.ini | 0 .../{GameConfig => GameSettings}/G4FF69.ini | 0 .../{GameConfig => GameSettings}/G4FP69.ini | 0 .../{GameConfig => GameSettings}/G4GEE9.ini | 0 .../{GameConfig => GameSettings}/G4ME69.ini | 0 .../{GameConfig => GameSettings}/G4MP69.ini | 0 .../{GameConfig => GameSettings}/G4NJDA.ini | 0 .../{GameConfig => GameSettings}/G4QE01.ini | 0 .../{GameConfig => GameSettings}/G4QP01.ini | 0 .../{GameConfig => GameSettings}/G4SE01.ini | 0 .../{GameConfig => GameSettings}/G4SP01.ini | 0 .../{GameConfig => GameSettings}/G4ZE69.ini | 0 .../{GameConfig => GameSettings}/G5DE78.ini | 0 .../{GameConfig => GameSettings}/G5DP78.ini | 0 .../{GameConfig => GameSettings}/G5SE7D.ini | 0 .../{GameConfig => GameSettings}/G5SP7D.ini | 0 .../{GameConfig => GameSettings}/G63E41.ini | 0 .../{GameConfig => GameSettings}/G63P41.ini | 0 .../{GameConfig => GameSettings}/G6FE69.ini | 0 .../{GameConfig => GameSettings}/G6NE69.ini | 0 .../{GameConfig => GameSettings}/G6NP69.ini | 0 .../{GameConfig => GameSettings}/G6QE08.ini | 0 .../{GameConfig => GameSettings}/G6TE5G.ini | 0 .../{GameConfig => GameSettings}/G6TP5G.ini | 0 .../{GameConfig => GameSettings}/G89EAF.ini | 0 .../{GameConfig => GameSettings}/G8FE8P.ini | 0 .../{GameConfig => GameSettings}/G8ME01.ini | 0 .../{GameConfig => GameSettings}/G8MJ01.ini | 0 .../{GameConfig => GameSettings}/G8MP01.ini | 0 .../{GameConfig => GameSettings}/G8OJ18.ini | 0 .../{GameConfig => GameSettings}/G8SJAF.ini | 0 .../{GameConfig => GameSettings}/G8WE01.ini | 0 .../{GameConfig => GameSettings}/G8WP01.ini | 0 .../{GameConfig => GameSettings}/G9BEE9.ini | 0 .../{GameConfig => GameSettings}/G9RE7D.ini | 0 .../{GameConfig => GameSettings}/G9SE8P.ini | 0 .../{GameConfig => GameSettings}/G9SJ8P.ini | 0 .../{GameConfig => GameSettings}/G9SP8P.ini | 0 .../{GameConfig => GameSettings}/G9TD52.ini | 0 .../{GameConfig => GameSettings}/G9TE52.ini | 0 .../{GameConfig => GameSettings}/G9TF52.ini | 0 .../{GameConfig => GameSettings}/G9TI52.ini | 0 .../{GameConfig => GameSettings}/G9TP52.ini | 0 .../{GameConfig => GameSettings}/GA2E51.ini | 0 .../{GameConfig => GameSettings}/GA3E51.ini | 0 .../{GameConfig => GameSettings}/GA4E51.ini | 0 .../{GameConfig => GameSettings}/GA7E70.ini | 0 .../{GameConfig => GameSettings}/GABEAF.ini | 0 .../{GameConfig => GameSettings}/GACE5H.ini | 0 .../{GameConfig => GameSettings}/GAFE01.ini | 0 .../{GameConfig => GameSettings}/GAFJ01.ini | 0 .../{GameConfig => GameSettings}/GAFP01.ini | 0 .../{GameConfig => GameSettings}/GAFU01.ini | 0 .../{GameConfig => GameSettings}/GAGP70.ini | 0 .../{GameConfig => GameSettings}/GAHEGG.ini | 0 .../{GameConfig => GameSettings}/GALE01.ini | 0 .../{GameConfig => GameSettings}/GALJ01.ini | 0 .../{GameConfig => GameSettings}/GALP01.ini | 0 .../{GameConfig => GameSettings}/GAME5H.ini | 0 .../{GameConfig => GameSettings}/GANE7U.ini | 0 .../{GameConfig => GameSettings}/GAPE52.ini | 0 .../{GameConfig => GameSettings}/GAQE6S.ini | 0 .../{GameConfig => GameSettings}/GARE5H.ini | 0 .../{GameConfig => GameSettings}/GATE51.ini | 0 .../{GameConfig => GameSettings}/GATP51.ini | 0 .../{GameConfig => GameSettings}/GAUE08.ini | 0 .../{GameConfig => GameSettings}/GAUJ08.ini | 0 .../{GameConfig => GameSettings}/GAVE78.ini | 0 .../{GameConfig => GameSettings}/GAVP78.ini | 0 .../{GameConfig => GameSettings}/GAVY78.ini | 0 .../{GameConfig => GameSettings}/GAXE5D.ini | 0 .../{GameConfig => GameSettings}/GAZD69.ini | 0 .../{GameConfig => GameSettings}/GAZE69.ini | 0 .../{GameConfig => GameSettings}/GAZF69.ini | 0 .../{GameConfig => GameSettings}/GAZH69.ini | 0 .../{GameConfig => GameSettings}/GAZI69.ini | 0 .../{GameConfig => GameSettings}/GAZJ69.ini | 0 .../{GameConfig => GameSettings}/GAZM69.ini | 0 .../{GameConfig => GameSettings}/GAZP69.ini | 0 .../{GameConfig => GameSettings}/GAZS69.ini | 0 .../{GameConfig => GameSettings}/GB3E51.ini | 0 .../{GameConfig => GameSettings}/GB4E51.ini | 0 .../{GameConfig => GameSettings}/GB4P51.ini | 0 .../{GameConfig => GameSettings}/GBDE5G.ini | 0 .../{GameConfig => GameSettings}/GBDS7D.ini | 0 .../{GameConfig => GameSettings}/GBFE70.ini | 0 .../{GameConfig => GameSettings}/GBGE5G.ini | 0 .../{GameConfig => GameSettings}/GBGP7D.ini | 0 .../{GameConfig => GameSettings}/GBHDC8.ini | 0 .../{GameConfig => GameSettings}/GBHEC8.ini | 0 .../{GameConfig => GameSettings}/GBHFC8.ini | 0 .../{GameConfig => GameSettings}/GBHPC8.ini | 0 .../{GameConfig => GameSettings}/GBIE08.ini | 0 .../{GameConfig => GameSettings}/GBIP08.ini | 0 .../{GameConfig => GameSettings}/GBKE70.ini | 0 .../{GameConfig => GameSettings}/GBLE52.ini | 0 .../{GameConfig => GameSettings}/GBLP52.ini | 0 .../{GameConfig => GameSettings}/GBLPGL.ini | 0 .../{GameConfig => GameSettings}/GBME7F.ini | 0 .../{GameConfig => GameSettings}/GBMP7F.ini | 0 .../{GameConfig => GameSettings}/GBOP51.ini | 0 .../{GameConfig => GameSettings}/GBQE78.ini | 0 .../{GameConfig => GameSettings}/GBSE8P.ini | 0 .../{GameConfig => GameSettings}/GBSP8P.ini | 0 .../{GameConfig => GameSettings}/GBTE70.ini | 0 .../{GameConfig => GameSettings}/GBVE41.ini | 0 .../{GameConfig => GameSettings}/GBVP41.ini | 0 .../{GameConfig => GameSettings}/GBWD64.ini | 0 .../{GameConfig => GameSettings}/GBWE64.ini | 0 .../{GameConfig => GameSettings}/GBWF64.ini | 0 .../{GameConfig => GameSettings}/GBWP64.ini | 0 .../{GameConfig => GameSettings}/GBXE51.ini | 0 .../{GameConfig => GameSettings}/GBYE0A.ini | 0 .../{GameConfig => GameSettings}/GBZE08.ini | 0 .../{GameConfig => GameSettings}/GBZP08.ini | 0 .../{GameConfig => GameSettings}/GC2E9G.ini | 0 .../{GameConfig => GameSettings}/GC3D78.ini | 0 .../{GameConfig => GameSettings}/GC3E78.ini | 0 .../{GameConfig => GameSettings}/GC3F78.ini | 0 .../{GameConfig => GameSettings}/GC3P78.ini | 0 .../{GameConfig => GameSettings}/GC4JBN.ini | 0 .../{GameConfig => GameSettings}/GC5PNK.ini | 0 .../{GameConfig => GameSettings}/GC6E01.ini | 0 .../{GameConfig => GameSettings}/GC6P01.ini | 0 .../{GameConfig => GameSettings}/GC7PNK.ini | 0 .../{GameConfig => GameSettings}/GC9P6S.ini | 0 .../{GameConfig => GameSettings}/GCAE5H.ini | 0 .../{GameConfig => GameSettings}/GCBE7D.ini | 0 .../{GameConfig => GameSettings}/GCBP7D.ini | 0 .../{GameConfig => GameSettings}/GCCE01.ini | 0 .../{GameConfig => GameSettings}/GCCP01.ini | 0 .../{GameConfig => GameSettings}/GCDE08.ini | 0 .../{GameConfig => GameSettings}/GCDP08.ini | 0 .../{GameConfig => GameSettings}/GCEE41.ini | 1 - .../{GameConfig => GameSettings}/GCEP41.ini | 1 - .../{GameConfig => GameSettings}/GCFE9G.ini | 0 .../{GameConfig => GameSettings}/GCGE41.ini | 0 .../{GameConfig => GameSettings}/GCHE78.ini | 0 .../{GameConfig => GameSettings}/GCJE41.ini | 0 .../{GameConfig => GameSettings}/GCJP41.ini | 0 .../{GameConfig => GameSettings}/GCLP69.ini | 0 .../{GameConfig => GameSettings}/GCNE7D.ini | 0 .../{GameConfig => GameSettings}/GCNP7D.ini | 0 .../{GameConfig => GameSettings}/GCOE52.ini | 0 .../{GameConfig => GameSettings}/GCOPDV.ini | 0 .../{GameConfig => GameSettings}/GCPE6S.ini | 0 .../{GameConfig => GameSettings}/GCPP6S.ini | 0 .../{GameConfig => GameSettings}/GCQE7D.ini | 0 .../{GameConfig => GameSettings}/GCQP7D.ini | 0 .../{GameConfig => GameSettings}/GCSEAF.ini | 0 .../{GameConfig => GameSettings}/GCTE51.ini | 0 .../{GameConfig => GameSettings}/GCTP51.ini | 0 .../{GameConfig => GameSettings}/GCVEEB.ini | 0 .../{GameConfig => GameSettings}/GCZE69.ini | 0 .../{GameConfig => GameSettings}/GCZP69.ini | 0 .../{GameConfig => GameSettings}/GD4E6S.ini | 0 .../{GameConfig => GameSettings}/GD6EB2.ini | 0 .../{GameConfig => GameSettings}/GD6P70.ini | 0 .../{GameConfig => GameSettings}/GD7PB2.ini | 0 .../{GameConfig => GameSettings}/GD9E69.ini | 0 .../{GameConfig => GameSettings}/GD9P69.ini | 0 .../{GameConfig => GameSettings}/GDDE41.ini | 0 .../{GameConfig => GameSettings}/GDEE71.ini | 0 .../{GameConfig => GameSettings}/GDFE5D.ini | 0 .../{GameConfig => GameSettings}/GDFP5D.ini | 0 .../{GameConfig => GameSettings}/GDGE7H.ini | 0 .../{GameConfig => GameSettings}/GDGP78.ini | 0 .../{GameConfig => GameSettings}/GDIE7D.ini | 0 .../{GameConfig => GameSettings}/GDIP7D.ini | 0 .../{GameConfig => GameSettings}/GDJEB2.ini | 0 .../{GameConfig => GameSettings}/GDKEA4.ini | 0 .../{GameConfig => GameSettings}/GDLEA4.ini | 0 .../{GameConfig => GameSettings}/GDME01.ini | 0 .../{GameConfig => GameSettings}/GDQP6S.ini | 0 .../{GameConfig => GameSettings}/GDREAF.ini | 0 .../{GameConfig => GameSettings}/GDSE78.ini | 0 .../{GameConfig => GameSettings}/GDSP78.ini | 0 .../{GameConfig => GameSettings}/GDTE69.ini | 0 .../{GameConfig => GameSettings}/GDVE6L.ini | 0 .../{GameConfig => GameSettings}/GDVP6L.ini | 0 .../{GameConfig => GameSettings}/GDWEA4.ini | 0 .../{GameConfig => GameSettings}/GE4E7D.ini | 0 .../{GameConfig => GameSettings}/GE5EA4.ini | 0 .../{GameConfig => GameSettings}/GE9E5D.ini | 0 .../{GameConfig => GameSettings}/GEAE8P.ini | 0 .../{GameConfig => GameSettings}/GEAP8P.ini | 0 .../{GameConfig => GameSettings}/GEBEA4.ini | 0 .../{GameConfig => GameSettings}/GEDE01.ini | 0 .../{GameConfig => GameSettings}/GEDP01.ini | 0 .../{GameConfig => GameSettings}/GEME7F.ini | 0 .../{GameConfig => GameSettings}/GEND69.ini | 0 .../{GameConfig => GameSettings}/GENE69.ini | 0 .../{GameConfig => GameSettings}/GENP69.ini | 0 .../{GameConfig => GameSettings}/GENS69.ini | 0 .../{GameConfig => GameSettings}/GEOE08.ini | 0 .../{GameConfig => GameSettings}/GEOP08.ini | 0 .../{GameConfig => GameSettings}/GESEA4.ini | 0 .../{GameConfig => GameSettings}/GEWE41.ini | 0 .../{GameConfig => GameSettings}/GEXE52.ini | 0 .../{GameConfig => GameSettings}/GEYE69.ini | 0 .../{GameConfig => GameSettings}/GEZE8P.ini | 0 .../{GameConfig => GameSettings}/GEZP8P.ini | 0 .../{GameConfig => GameSettings}/GF2E69.ini | 0 .../{GameConfig => GameSettings}/GF4E52.ini | 0 .../{GameConfig => GameSettings}/GF4F52.ini | 0 .../{GameConfig => GameSettings}/GF4P52.ini | 0 .../{GameConfig => GameSettings}/GF5E69.ini | 0 .../{GameConfig => GameSettings}/GF6E69.ini | 0 .../{GameConfig => GameSettings}/GF6F69.ini | 0 .../{GameConfig => GameSettings}/GF7E01.ini | 0 .../{GameConfig => GameSettings}/GF7P01.ini | 0 .../{GameConfig => GameSettings}/GF8E69.ini | 0 .../{GameConfig => GameSettings}/GF8P69.ini | 0 .../{GameConfig => GameSettings}/GFAD69.ini | 0 .../{GameConfig => GameSettings}/GFAE69.ini | 0 .../{GameConfig => GameSettings}/GFAP69.ini | 0 .../{GameConfig => GameSettings}/GFAS69.ini | 0 .../{GameConfig => GameSettings}/GFBE5D.ini | 0 .../{GameConfig => GameSettings}/GFCP69.ini | 0 .../{GameConfig => GameSettings}/GFDD69.ini | 0 .../{GameConfig => GameSettings}/GFDE69.ini | 0 .../{GameConfig => GameSettings}/GFEE01.ini | 0 .../{GameConfig => GameSettings}/GFEJ01.ini | 0 .../{GameConfig => GameSettings}/GFEP01.ini | 0 .../{GameConfig => GameSettings}/GFFE5D.ini | 0 .../{GameConfig => GameSettings}/GFGEA4.ini | 0 .../{GameConfig => GameSettings}/GFHP6V.ini | 0 .../{GameConfig => GameSettings}/GFKE69.ini | 0 .../{GameConfig => GameSettings}/GFPEA4.ini | 0 .../{GameConfig => GameSettings}/GFQEA4.ini | 0 .../{GameConfig => GameSettings}/GFTE01.ini | 0 .../{GameConfig => GameSettings}/GFTP01.ini | 0 .../{GameConfig => GameSettings}/GFUE4Z.ini | 0 .../{GameConfig => GameSettings}/GFYE69.ini | 0 .../{GameConfig => GameSettings}/GFYP69.ini | 0 .../{GameConfig => GameSettings}/GFZE01.ini | 0 .../{GameConfig => GameSettings}/GFZJ01.ini | 0 .../{GameConfig => GameSettings}/GFZP01.ini | 0 .../{GameConfig => GameSettings}/GG4E08.ini | 0 .../{GameConfig => GameSettings}/GG4P08.ini | 0 .../{GameConfig => GameSettings}/GG5E52.ini | 0 .../{GameConfig => GameSettings}/GGAJB2.ini | 0 .../{GameConfig => GameSettings}/GGCE0A.ini | 0 .../{GameConfig => GameSettings}/GGCOSD.ini | 0 .../{GameConfig => GameSettings}/GGEE41.ini | 0 .../{GameConfig => GameSettings}/GGEP41.ini | 0 .../{GameConfig => GameSettings}/GGEY41.ini | 0 .../{GameConfig => GameSettings}/GGME00.ini | 0 .../{GameConfig => GameSettings}/GGPJB2.ini | 0 .../{GameConfig => GameSettings}/GGRE41.ini | 0 .../{GameConfig => GameSettings}/GGSEA4.ini | 0 .../{GameConfig => GameSettings}/GGSJA4.ini | 0 .../{GameConfig => GameSettings}/GGSPA4.ini | 0 .../{GameConfig => GameSettings}/GGTE01.ini | 0 .../{GameConfig => GameSettings}/GGTP01.ini | 0 .../{GameConfig => GameSettings}/GGYE41.ini | 0 .../{GameConfig => GameSettings}/GGYP41.ini | 0 .../{GameConfig => GameSettings}/GGZE52.ini | 0 .../{GameConfig => GameSettings}/GGZX52.ini | 0 .../{GameConfig => GameSettings}/GH2E69.ini | 0 .../{GameConfig => GameSettings}/GH2P69.ini | 0 .../{GameConfig => GameSettings}/GH4D69.ini | 0 .../{GameConfig => GameSettings}/GH4E69.ini | 0 .../{GameConfig => GameSettings}/GH4F69.ini | 0 .../{GameConfig => GameSettings}/GH4H69.ini | 0 .../{GameConfig => GameSettings}/GH4I69.ini | 0 .../{GameConfig => GameSettings}/GH4J69.ini | 0 .../{GameConfig => GameSettings}/GH4M69.ini | 0 .../{GameConfig => GameSettings}/GH4P69.ini | 0 .../{GameConfig => GameSettings}/GH4S69.ini | 0 .../{GameConfig => GameSettings}/GH5D52.ini | 0 .../{GameConfig => GameSettings}/GH5E52.ini | 0 .../{GameConfig => GameSettings}/GH5F52.ini | 0 .../{GameConfig => GameSettings}/GH5P52.ini | 0 .../{GameConfig => GameSettings}/GH6EAF.ini | 0 .../{GameConfig => GameSettings}/GH7E5D.ini | 0 .../{GameConfig => GameSettings}/GHAE08.ini | 0 .../{GameConfig => GameSettings}/GHAP08.ini | 0 .../{GameConfig => GameSettings}/GHBE7D.ini | 0 .../{GameConfig => GameSettings}/GHBP7D.ini | 0 .../{GameConfig => GameSettings}/GHCE4Q.ini | 0 .../{GameConfig => GameSettings}/GHCF4Q.ini | 0 .../{GameConfig => GameSettings}/GHGEEB.ini | 0 .../{GameConfig => GameSettings}/GHKE7D.ini | 0 .../{GameConfig => GameSettings}/GHLE69.ini | 0 .../{GameConfig => GameSettings}/GHLJ69.ini | 0 .../{GameConfig => GameSettings}/GHLP69.ini | 0 .../{GameConfig => GameSettings}/GHLX69.ini | 0 .../{GameConfig => GameSettings}/GHLY69.ini | 0 .../{GameConfig => GameSettings}/GHLZ69.ini | 0 .../{GameConfig => GameSettings}/GHMD4F.ini | 0 .../{GameConfig => GameSettings}/GHME4F.ini | 0 .../{GameConfig => GameSettings}/GHMF4F.ini | 0 .../{GameConfig => GameSettings}/GHMP4F.ini | 0 .../{GameConfig => GameSettings}/GHNE71.ini | 0 .../{GameConfig => GameSettings}/GHQE7D.ini | 0 .../{GameConfig => GameSettings}/GHQP7D.ini | 0 .../{GameConfig => GameSettings}/GHRE78.ini | 0 .../{GameConfig => GameSettings}/GHSE69.ini | 0 .../{GameConfig => GameSettings}/GHSJ69.ini | 0 .../{GameConfig => GameSettings}/GHSP69.ini | 0 .../{GameConfig => GameSettings}/GHSX69.ini | 0 .../{GameConfig => GameSettings}/GHSY69.ini | 0 .../{GameConfig => GameSettings}/GHUE7D.ini | 0 .../{GameConfig => GameSettings}/GHVE08.ini | 0 .../{GameConfig => GameSettings}/GHWE78.ini | 0 .../{GameConfig => GameSettings}/GHYE6S.ini | 0 .../{GameConfig => GameSettings}/GIAE7D.ini | 0 .../{GameConfig => GameSettings}/GIBE4F.ini | 0 .../{GameConfig => GameSettings}/GICE78.ini | 0 .../{GameConfig => GameSettings}/GIGJ8P.ini | 0 .../{GameConfig => GameSettings}/GIKE70.ini | 0 .../{GameConfig => GameSettings}/GIKP70.ini | 0 .../{GameConfig => GameSettings}/GILE51.ini | 0 .../{GameConfig => GameSettings}/GILP51.ini | 0 .../{GameConfig => GameSettings}/GINE69.ini | 0 .../{GameConfig => GameSettings}/GINX69.ini | 0 .../{GameConfig => GameSettings}/GIPEAF.ini | 0 .../{GameConfig => GameSettings}/GIQE78.ini | 0 .../{GameConfig => GameSettings}/GISE36.ini | 0 .../{GameConfig => GameSettings}/GISP36.ini | 0 .../{GameConfig => GameSettings}/GITE01.ini | 0 .../{GameConfig => GameSettings}/GITP01.ini | 0 .../{GameConfig => GameSettings}/GIVE4Z.ini | 0 .../{GameConfig => GameSettings}/GIZE52.ini | 0 .../{GameConfig => GameSettings}/GJ3PA4.ini | 0 .../{GameConfig => GameSettings}/GJBE5G.ini | 0 .../{GameConfig => GameSettings}/GJCE8P.ini | 0 .../{GameConfig => GameSettings}/GJDE5S.ini | 0 .../{GameConfig => GameSettings}/GJKE52.ini | 0 .../{GameConfig => GameSettings}/GJNE78.ini | 0 .../{GameConfig => GameSettings}/GJSJ18.ini | 0 .../{GameConfig => GameSettings}/GJUD78.ini | 0 .../{GameConfig => GameSettings}/GJUE78.ini | 0 .../{GameConfig => GameSettings}/GJUF78.ini | 0 .../{GameConfig => GameSettings}/GJWE78.ini | 0 .../{GameConfig => GameSettings}/GJXE51.ini | 0 .../{GameConfig => GameSettings}/GJXP51.ini | 0 .../{GameConfig => GameSettings}/GJZE52.ini | 0 .../{GameConfig => GameSettings}/GK2D52.ini | 0 .../{GameConfig => GameSettings}/GK2E52.ini | 0 .../{GameConfig => GameSettings}/GK2F52.ini | 0 .../{GameConfig => GameSettings}/GK2I52.ini | 0 .../{GameConfig => GameSettings}/GK2P52.ini | 0 .../{GameConfig => GameSettings}/GK4E01.ini | 0 .../{GameConfig => GameSettings}/GK5E78.ini | 0 .../{GameConfig => GameSettings}/GK5X78.ini | 0 .../{GameConfig => GameSettings}/GK6JA4.ini | 0 .../{GameConfig => GameSettings}/GK7E08.ini | 0 .../{GameConfig => GameSettings}/GK7P08.ini | 0 .../{GameConfig => GameSettings}/GK9EA4.ini | 0 .../{GameConfig => GameSettings}/GKAE8P.ini | 0 .../{GameConfig => GameSettings}/GKBEAF.ini | 0 .../{GameConfig => GameSettings}/GKBPAF.ini | 0 .../{GameConfig => GameSettings}/GKDP01.ini | 0 .../{GameConfig => GameSettings}/GKFEGG.ini | 0 .../{GameConfig => GameSettings}/GKGE01.ini | 0 .../{GameConfig => GameSettings}/GKHEA4.ini | 0 .../{GameConfig => GameSettings}/GKHPA4.ini | 0 .../{GameConfig => GameSettings}/GKJE78.ini | 0 .../{GameConfig => GameSettings}/GKKE69.ini | 0 .../{GameConfig => GameSettings}/GKLD69.ini | 0 .../{GameConfig => GameSettings}/GKLE69.ini | 0 .../{GameConfig => GameSettings}/GKLF69.ini | 0 .../{GameConfig => GameSettings}/GKLI69.ini | 0 .../{GameConfig => GameSettings}/GKLJ69.ini | 0 .../{GameConfig => GameSettings}/GKLP69.ini | 0 .../{GameConfig => GameSettings}/GKLS69.ini | 0 .../{GameConfig => GameSettings}/GKME41.ini | 0 .../{GameConfig => GameSettings}/GKMP41.ini | 0 .../{GameConfig => GameSettings}/GKNEB2.ini | 0 .../{GameConfig => GameSettings}/GKOE70.ini | 0 .../{GameConfig => GameSettings}/GKOP6V.ini | 0 .../{GameConfig => GameSettings}/GKOP70.ini | 0 .../{GameConfig => GameSettings}/GKQJ01.ini | 0 .../{GameConfig => GameSettings}/GKSE52.ini | 0 .../{GameConfig => GameSettings}/GKTJA4.ini | 0 .../{GameConfig => GameSettings}/GKUE9G.ini | 0 .../{GameConfig => GameSettings}/GKYE01.ini | 0 .../{GameConfig => GameSettings}/GKYJ01.ini | 0 .../{GameConfig => GameSettings}/GKYP01.ini | 0 .../{GameConfig => GameSettings}/GKZE9G.ini | 0 .../{GameConfig => GameSettings}/GL5E4F.ini | 0 .../{GameConfig => GameSettings}/GL7E64.ini | 0 .../{GameConfig => GameSettings}/GL7P64.ini | 0 .../{GameConfig => GameSettings}/GL8E4F.ini | 0 .../{GameConfig => GameSettings}/GL8F4F.ini | 0 .../{GameConfig => GameSettings}/GLBE8P.ini | 0 .../{GameConfig => GameSettings}/GLCE52.ini | 0 .../{GameConfig => GameSettings}/GLCF52.ini | 0 .../{GameConfig => GameSettings}/GLEE08.ini | 0 .../{GameConfig => GameSettings}/GLEP08.ini | 0 .../{GameConfig => GameSettings}/GLLE78.ini | 0 .../{GameConfig => GameSettings}/GLME01.ini | 0 .../{GameConfig => GameSettings}/GLMP01.ini | 0 .../{GameConfig => GameSettings}/GLNE69.ini | 0 .../{GameConfig => GameSettings}/GLNP69.ini | 0 .../{GameConfig => GameSettings}/GLOE69.ini | 0 .../{GameConfig => GameSettings}/GLOP69.ini | 0 .../{GameConfig => GameSettings}/GLQE41.ini | 0 .../{GameConfig => GameSettings}/GLRE64.ini | 0 .../{GameConfig => GameSettings}/GLSD64.ini | 0 .../{GameConfig => GameSettings}/GLSE64.ini | 0 .../{GameConfig => GameSettings}/GLSF64.ini | 0 .../{GameConfig => GameSettings}/GLSP64.ini | 0 .../{GameConfig => GameSettings}/GLUE7U.ini | 0 .../{GameConfig => GameSettings}/GLWE51.ini | 0 .../{GameConfig => GameSettings}/GLYE69.ini | 0 .../{GameConfig => GameSettings}/GLYP69.ini | 0 .../{GameConfig => GameSettings}/GLZE69.ini | 0 .../{GameConfig => GameSettings}/GLZF69.ini | 0 .../{GameConfig => GameSettings}/GM2E8P.ini | 0 .../{GameConfig => GameSettings}/GM2P8P.ini | 0 .../{GameConfig => GameSettings}/GM3E69.ini | 0 .../{GameConfig => GameSettings}/GM4E01.ini | 0 .../{GameConfig => GameSettings}/GM4J01.ini | 0 .../{GameConfig => GameSettings}/GM4P01.ini | 0 .../{GameConfig => GameSettings}/GM5E7D.ini | 0 .../{GameConfig => GameSettings}/GM5F7D.ini | 0 .../{GameConfig => GameSettings}/GM5P7D.ini | 0 .../{GameConfig => GameSettings}/GM6EE9.ini | 0 .../{GameConfig => GameSettings}/GM6PE9.ini | 0 .../{GameConfig => GameSettings}/GM8E01.ini | 0 .../{GameConfig => GameSettings}/GM8J01.ini | 0 .../{GameConfig => GameSettings}/GM8P01.ini | 0 .../{GameConfig => GameSettings}/GMBE8P.ini | 0 .../{GameConfig => GameSettings}/GMBP8P.ini | 0 .../{GameConfig => GameSettings}/GMFS69.ini | 0 .../{GameConfig => GameSettings}/GMHE52.ini | 0 .../{GameConfig => GameSettings}/GMHF52.ini | 0 .../{GameConfig => GameSettings}/GMHP52.ini | 0 .../{GameConfig => GameSettings}/GMIE70.ini | 0 .../{GameConfig => GameSettings}/GMIP70.ini | 0 .../{GameConfig => GameSettings}/GMKD5D.ini | 0 .../{GameConfig => GameSettings}/GMLEA4.ini | 0 .../{GameConfig => GameSettings}/GMNE78.ini | 0 .../{GameConfig => GameSettings}/GMPE01.ini | 0 .../{GameConfig => GameSettings}/GMPP01.ini | 0 .../{GameConfig => GameSettings}/GMSE01.ini | 0 .../{GameConfig => GameSettings}/GMSJ01.ini | 0 .../{GameConfig => GameSettings}/GMSP01.ini | 0 .../{GameConfig => GameSettings}/GMTP69.ini | 0 .../{GameConfig => GameSettings}/GMUE5D.ini | 0 .../{GameConfig => GameSettings}/GMXE70.ini | 0 .../{GameConfig => GameSettings}/GN6E69.ini | 0 .../{GameConfig => GameSettings}/GN8E69.ini | 0 .../{GameConfig => GameSettings}/GN8P69.ini | 0 .../{GameConfig => GameSettings}/GNDE69.ini | 0 .../{GameConfig => GameSettings}/GNHE5d.ini | 2 +- .../{GameConfig => GameSettings}/GNJEAF.ini | 0 .../{GameConfig => GameSettings}/GNLE69.ini | 0 .../{GameConfig => GameSettings}/GNNE69.ini | 0 .../{GameConfig => GameSettings}/GNOE78.ini | 0 .../{GameConfig => GameSettings}/GNQE69.ini | 0 .../{GameConfig => GameSettings}/GNRJDA.ini | 0 .../{GameConfig => GameSettings}/GNUEDA.ini | 0 .../{GameConfig => GameSettings}/GNWE69.ini | 0 .../{GameConfig => GameSettings}/GNWP69.ini | 0 .../{GameConfig => GameSettings}/GO2E4F.ini | 0 .../{GameConfig => GameSettings}/GO7E69.ini | 0 .../{GameConfig => GameSettings}/GO7F69.ini | 0 .../{GameConfig => GameSettings}/GO7P69.ini | 0 .../{GameConfig => GameSettings}/GOAE52.ini | 0 .../{GameConfig => GameSettings}/GOBE4Z.ini | 0 .../{GameConfig => GameSettings}/GOCE5D.ini | 0 .../{GameConfig => GameSettings}/GOGJB2.ini | 0 .../{GameConfig => GameSettings}/GOME01.ini | 0 .../{GameConfig => GameSettings}/GOMP01.ini | 0 .../{GameConfig => GameSettings}/GONE69.ini | 0 .../{GameConfig => GameSettings}/GOOE01.ini | 0 .../{GameConfig => GameSettings}/GOPEB2.ini | 0 .../{GameConfig => GameSettings}/GOPJB2.ini | 0 .../{GameConfig => GameSettings}/GOQEAF.ini | 0 .../{GameConfig => GameSettings}/GOSE41.ini | 0 .../{GameConfig => GameSettings}/GOSP41.ini | 0 .../{GameConfig => GameSettings}/GOSX41.ini | 0 .../{GameConfig => GameSettings}/GOWD69.ini | 0 .../{GameConfig => GameSettings}/GOWE69.ini | 0 .../{GameConfig => GameSettings}/GOWF69.ini | 0 .../{GameConfig => GameSettings}/GOWJ69.ini | 0 .../{GameConfig => GameSettings}/GOWP69.ini | 0 .../{GameConfig => GameSettings}/GOYD69.ini | 0 .../{GameConfig => GameSettings}/GOYE69.ini | 0 .../{GameConfig => GameSettings}/GOYF69.ini | 0 .../{GameConfig => GameSettings}/GOYP69.ini | 0 .../{GameConfig => GameSettings}/GOYS69.ini | 0 .../{GameConfig => GameSettings}/GP2E82.ini | 0 .../{GameConfig => GameSettings}/GP2EAF.ini | 0 .../{GameConfig => GameSettings}/GP4J18.ini | 0 .../{GameConfig => GameSettings}/GP5E01.ini | 0 .../{GameConfig => GameSettings}/GP5J01.ini | 0 .../{GameConfig => GameSettings}/GP5P01.ini | 0 .../{GameConfig => GameSettings}/GP6E01.ini | 0 .../{GameConfig => GameSettings}/GP6J01.ini | 0 .../{GameConfig => GameSettings}/GP6P01.ini | 0 .../{GameConfig => GameSettings}/GP7E01.ini | 0 .../{GameConfig => GameSettings}/GP7J01.ini | 0 .../{GameConfig => GameSettings}/GP7P01.ini | 0 .../{GameConfig => GameSettings}/GP8EAF.ini | 0 .../{GameConfig => GameSettings}/GPAE01.ini | 0 .../{GameConfig => GameSettings}/GPAJ01.ini | 0 .../{GameConfig => GameSettings}/GPAP01.ini | 0 .../{GameConfig => GameSettings}/GPAU01.ini | 0 .../{GameConfig => GameSettings}/GPDE51.ini | 0 .../{GameConfig => GameSettings}/GPEJ2Q.ini | 0 .../{GameConfig => GameSettings}/GPHD52.ini | 0 .../{GameConfig => GameSettings}/GPHE52.ini | 0 .../{GameConfig => GameSettings}/GPHP52.ini | 0 .../{GameConfig => GameSettings}/GPIE01.ini | 0 .../{GameConfig => GameSettings}/GPIP01.ini | 0 .../{GameConfig => GameSettings}/GPKE41.ini | 0 .../{GameConfig => GameSettings}/GPNE08.ini | 0 .../{GameConfig => GameSettings}/GPNP08.ini | 0 .../{GameConfig => GameSettings}/GPOE8P.ini | 0 .../{GameConfig => GameSettings}/GPOP8P.ini | 0 .../{GameConfig => GameSettings}/GPSE8P.ini | 0 .../{GameConfig => GameSettings}/GPSP8P.ini | 0 .../{GameConfig => GameSettings}/GPTE41.ini | 0 .../{GameConfig => GameSettings}/GPTP41.ini | 0 .../{GameConfig => GameSettings}/GPVE01.ini | 0 .../{GameConfig => GameSettings}/GPVP01.ini | 0 .../{GameConfig => GameSettings}/GPXP01.ini | 0 .../{GameConfig => GameSettings}/GPZJ01.ini | 0 .../{GameConfig => GameSettings}/GQ8E69.ini | 0 .../{GameConfig => GameSettings}/GQCD52.ini | 1 - .../{GameConfig => GameSettings}/GQCE52.ini | 1 - .../{GameConfig => GameSettings}/GQCF52.ini | 1 - .../{GameConfig => GameSettings}/GQCI52.ini | 0 .../{GameConfig => GameSettings}/GQCP52.ini | 1 - .../{GameConfig => GameSettings}/GQCS52.ini | 1 - .../{GameConfig => GameSettings}/GQLE9G.ini | 0 .../{GameConfig => GameSettings}/GQNE5D.ini | 0 .../{GameConfig => GameSettings}/GQSDAF.ini | 0 .../{GameConfig => GameSettings}/GQSEAF.ini | 0 .../{GameConfig => GameSettings}/GQSFAF.ini | 0 .../{GameConfig => GameSettings}/GQSPAF.ini | 0 .../{GameConfig => GameSettings}/GQTE4Q.ini | 0 .../{GameConfig => GameSettings}/GQWE69.ini | 0 .../{GameConfig => GameSettings}/GQWJ69.ini | 0 .../{GameConfig => GameSettings}/GQWP69.ini | 0 .../{GameConfig => GameSettings}/GQWX69.ini | 0 .../{GameConfig => GameSettings}/GQXE69.ini | 0 .../{GameConfig => GameSettings}/GR2E52.ini | 0 .../{GameConfig => GameSettings}/GR6E78.ini | 0 .../{GameConfig => GameSettings}/GR8D69.ini | 1 - .../{GameConfig => GameSettings}/GR8E69.ini | 1 - .../{GameConfig => GameSettings}/GR8F69.ini | 1 - .../{GameConfig => GameSettings}/GR8J69.ini | 1 - .../{GameConfig => GameSettings}/GR8P69.ini | 1 - .../{GameConfig => GameSettings}/GRAE5Z.ini | 0 .../{GameConfig => GameSettings}/GRBE6S.ini | 0 .../{GameConfig => GameSettings}/GRBP6S.ini | 0 .../{GameConfig => GameSettings}/GREE08.ini | 0 .../{GameConfig => GameSettings}/GREP08.ini | 0 .../{GameConfig => GameSettings}/GRFE78.ini | 0 .../{GameConfig => GameSettings}/GRHE41.ini | 0 .../{GameConfig => GameSettings}/GRHP41.ini | 0 .../{GameConfig => GameSettings}/GRJEAF.ini | 0 .../{GameConfig => GameSettings}/GRKE41.ini | 0 .../{GameConfig => GameSettings}/GRKP7G.ini | 0 .../{GameConfig => GameSettings}/GRLE41.ini | 0 .../{GameConfig => GameSettings}/GRNE52.ini | 0 .../{GameConfig => GameSettings}/GROP7J.ini | 0 .../{GameConfig => GameSettings}/GRQE41.ini | 0 .../{GameConfig => GameSettings}/GRSEAF.ini | 0 .../{GameConfig => GameSettings}/GRSPAF.ini | 0 .../{GameConfig => GameSettings}/GRUE78.ini | 0 .../{GameConfig => GameSettings}/GRVEA4.ini | 0 .../{GameConfig => GameSettings}/GRYE41.ini | 0 .../{GameConfig => GameSettings}/GS2D78.ini | 0 .../{GameConfig => GameSettings}/GS2E78.ini | 0 .../{GameConfig => GameSettings}/GS2F78.ini | 0 .../{GameConfig => GameSettings}/GS2P78.ini | 0 .../{GameConfig => GameSettings}/GS8P7D.ini | 0 .../{GameConfig => GameSettings}/GSAE01.ini | 0 .../{GameConfig => GameSettings}/GSAP01.ini | 0 .../{GameConfig => GameSettings}/GSCE51.ini | 0 .../{GameConfig => GameSettings}/GSEJB2.ini | 0 .../{GameConfig => GameSettings}/GSMP52.ini | 0 .../{GameConfig => GameSettings}/GSNE8P.ini | 0 .../{GameConfig => GameSettings}/GSNP8P.ini | 0 .../{GameConfig => GameSettings}/GSOE8P.ini | 0 .../{GameConfig => GameSettings}/GSOP8P.ini | 0 .../{GameConfig => GameSettings}/GSPE69.ini | 0 .../{GameConfig => GameSettings}/GSSE8P.ini | 0 .../{GameConfig => GameSettings}/GSSJ8P.ini | 0 .../{GameConfig => GameSettings}/GSSP70.ini | 0 .../{GameConfig => GameSettings}/GSSP8P.ini | 0 .../{GameConfig => GameSettings}/GSTE69.ini | 0 .../{GameConfig => GameSettings}/GSTP69.ini | 0 .../{GameConfig => GameSettings}/GSWE64.ini | 0 .../{GameConfig => GameSettings}/GSWP64.ini | 0 .../{GameConfig => GameSettings}/GSWS64.ini | 0 .../{GameConfig => GameSettings}/GSZP41.ini | 0 .../{GameConfig => GameSettings}/GT3D52.ini | 0 .../{GameConfig => GameSettings}/GT3E52.ini | 0 .../{GameConfig => GameSettings}/GT3F52.ini | 0 .../{GameConfig => GameSettings}/GT3P52.ini | 0 .../{GameConfig => GameSettings}/GT6E70.ini | 0 .../{GameConfig => GameSettings}/GT7E41.ini | 0 .../{GameConfig => GameSettings}/GT7P41.ini | 0 .../{GameConfig => GameSettings}/GT7X41.ini | 0 .../{GameConfig => GameSettings}/GT8E78.ini | 0 .../{GameConfig => GameSettings}/GTCJBL.ini | 0 .../{GameConfig => GameSettings}/GTEE01.ini | 0 .../{GameConfig => GameSettings}/GTEP01.ini | 0 .../{GameConfig => GameSettings}/GTFEA4.ini | 0 .../{GameConfig => GameSettings}/GTKE51.ini | 0 .../{GameConfig => GameSettings}/GTKP51.ini | 0 .../{GameConfig => GameSettings}/GTLE52.ini | 0 .../{GameConfig => GameSettings}/GTLP52.ini | 0 .../{GameConfig => GameSettings}/GTLX52.ini | 0 .../{GameConfig => GameSettings}/GTSE4F.ini | 0 .../{GameConfig => GameSettings}/GTSP4F.ini | 0 .../{GameConfig => GameSettings}/GTUE8G.ini | 0 .../{GameConfig => GameSettings}/GTWE70.ini | 0 .../{GameConfig => GameSettings}/GTWP70.ini | 0 .../{GameConfig => GameSettings}/GTYE69.ini | 0 .../{GameConfig => GameSettings}/GTYP69.ini | 0 .../{GameConfig => GameSettings}/GTZE41.ini | 0 .../{GameConfig => GameSettings}/GTZP41.ini | 0 .../{GameConfig => GameSettings}/GUBE69.ini | 0 .../{GameConfig => GameSettings}/GUBP69.ini | 0 .../{GameConfig => GameSettings}/GUCP69.ini | 0 .../{GameConfig => GameSettings}/GUFE4Z.ini | 0 .../{GameConfig => GameSettings}/GUGE69.ini | 0 .../{GameConfig => GameSettings}/GUME52.ini | 0 .../{GameConfig => GameSettings}/GUMP52.ini | 0 .../{GameConfig => GameSettings}/GUNE5D.ini | 0 .../{GameConfig => GameSettings}/GUPE8P.ini | 0 .../{GameConfig => GameSettings}/GUPP8P.ini | 0 .../{GameConfig => GameSettings}/GUTE52.ini | 0 .../{GameConfig => GameSettings}/GUVE51.ini | 0 .../{GameConfig => GameSettings}/GUZE41.ini | 0 .../{GameConfig => GameSettings}/GUZP41.ini | 0 .../{GameConfig => GameSettings}/GV3E70.ini | 0 .../{GameConfig => GameSettings}/GV3P70.ini | 0 .../{GameConfig => GameSettings}/GVCE08.ini | 0 .../{GameConfig => GameSettings}/GVCP08.ini | 0 .../{GameConfig => GameSettings}/GVDE78.ini | 0 .../{GameConfig => GameSettings}/GVHE4F.ini | 0 .../{GameConfig => GameSettings}/GVJE08.ini | 0 .../{GameConfig => GameSettings}/GVJJ08.ini | 0 .../{GameConfig => GameSettings}/GVJP08.ini | 0 .../{GameConfig => GameSettings}/GVKE52.ini | 0 .../{GameConfig => GameSettings}/GVLD69.ini | 0 .../{GameConfig => GameSettings}/GVLE69.ini | 0 .../{GameConfig => GameSettings}/GVLF69.ini | 0 .../{GameConfig => GameSettings}/GVLP69.ini | 0 .../{GameConfig => GameSettings}/GVRE7H.ini | 0 .../{GameConfig => GameSettings}/GVSE8P.ini | 0 .../{GameConfig => GameSettings}/GVSP8P.ini | 0 .../{GameConfig => GameSettings}/GW2E78.ini | 0 .../{GameConfig => GameSettings}/GW2P78.ini | 0 .../{GameConfig => GameSettings}/GW3E78.ini | 0 .../{GameConfig => GameSettings}/GW3P78.ini | 0 .../{GameConfig => GameSettings}/GW5E69.ini | 0 .../{GameConfig => GameSettings}/GW7E69.ini | 0 .../{GameConfig => GameSettings}/GW7P69.ini | 0 .../{GameConfig => GameSettings}/GW8E52.ini | 0 .../{GameConfig => GameSettings}/GW9E78.ini | 0 .../{GameConfig => GameSettings}/GWAE8P.ini | 0 .../{GameConfig => GameSettings}/GWAF8P.ini | 0 .../{GameConfig => GameSettings}/GWAP8P.ini | 0 .../{GameConfig => GameSettings}/GWBP41.ini | 0 .../{GameConfig => GameSettings}/GWEE51.ini | 0 .../{GameConfig => GameSettings}/GWEJB0.ini | 0 .../{GameConfig => GameSettings}/GWEP8P.ini | 0 .../{GameConfig => GameSettings}/GWGP4F.ini | 0 .../{GameConfig => GameSettings}/GWJE52.ini | 1 - .../{GameConfig => GameSettings}/GWKE41.ini | 0 .../{GameConfig => GameSettings}/GWKP41.ini | 0 .../{GameConfig => GameSettings}/GWLE6L.ini | 2 +- .../{GameConfig => GameSettings}/GWLX6L.ini | 2 +- .../{GameConfig => GameSettings}/GWME51.ini | 0 .../{GameConfig => GameSettings}/GWOE5G.ini | 0 .../{GameConfig => GameSettings}/GWPE78.ini | 0 .../{GameConfig => GameSettings}/GWPJG2.ini | 0 .../{GameConfig => GameSettings}/GWPP78.ini | 0 .../{GameConfig => GameSettings}/GWQE52.ini | 0 .../{GameConfig => GameSettings}/GWRE01.ini | 0 .../{GameConfig => GameSettings}/GWRP01.ini | 0 .../{GameConfig => GameSettings}/GWSEA4.ini | 0 .../{GameConfig => GameSettings}/GWTEA4.ini | 0 .../{GameConfig => GameSettings}/GWVE52.ini | 0 .../{GameConfig => GameSettings}/GWWE01.ini | 0 .../{GameConfig => GameSettings}/GWWP01.ini | 0 .../{GameConfig => GameSettings}/GWYE41.ini | 0 .../{GameConfig => GameSettings}/GWYX41.ini | 0 .../{GameConfig => GameSettings}/GWZE01.ini | 0 .../{GameConfig => GameSettings}/GWZP01.ini | 0 .../{GameConfig => GameSettings}/GX2E52.ini | 0 .../{GameConfig => GameSettings}/GX2P52.ini | 0 .../{GameConfig => GameSettings}/GX3E41.ini | 0 .../{GameConfig => GameSettings}/GX3P41.ini | 0 .../{GameConfig => GameSettings}/GX3X41.ini | 0 .../{GameConfig => GameSettings}/GXBE69.ini | 0 .../{GameConfig => GameSettings}/GXBP69.ini | 0 .../{GameConfig => GameSettings}/GXCE01.ini | 0 .../{GameConfig => GameSettings}/GXEE8P.ini | 0 .../{GameConfig => GameSettings}/GXEP8P.ini | 0 .../{GameConfig => GameSettings}/GXFE69.ini | 0 .../{GameConfig => GameSettings}/GXFF69.ini | 0 .../{GameConfig => GameSettings}/GXFP69.ini | 0 .../{GameConfig => GameSettings}/GXGE08.ini | 1 - .../{GameConfig => GameSettings}/GXLE52.ini | 0 .../{GameConfig => GameSettings}/GXLP52.ini | 0 .../{GameConfig => GameSettings}/GXME52.ini | 0 .../{GameConfig => GameSettings}/GXNE5D.ini | 0 .../{GameConfig => GameSettings}/GXOE69.ini | 0 .../{GameConfig => GameSettings}/GXOX69.ini | 0 .../{GameConfig => GameSettings}/GXRE08.ini | 0 .../{GameConfig => GameSettings}/GXSE8P.ini | 0 .../{GameConfig => GameSettings}/GXSP8P.ini | 0 .../{GameConfig => GameSettings}/GXXE01.ini | 0 .../{GameConfig => GameSettings}/GXXP01.ini | 0 .../{GameConfig => GameSettings}/GY2E01.ini | 0 .../{GameConfig => GameSettings}/GYAE78.ini | 0 .../{GameConfig => GameSettings}/GYBP01.ini | 0 .../{GameConfig => GameSettings}/GYFEA4.ini | 0 .../{GameConfig => GameSettings}/GYKEB2.ini | 0 .../{GameConfig => GameSettings}/GYQP01.ini | 0 .../{GameConfig => GameSettings}/GYRE41.ini | 0 .../{GameConfig => GameSettings}/GYWD41.ini | 0 .../{GameConfig => GameSettings}/GYWEE9.ini | 0 .../{GameConfig => GameSettings}/GYWP41.ini | 0 .../{GameConfig => GameSettings}/GZ2E01.ini | 0 .../{GameConfig => GameSettings}/GZ2J01.ini | 0 .../{GameConfig => GameSettings}/GZ2P01.ini | 0 .../{GameConfig => GameSettings}/GZ3E70.ini | 0 .../{GameConfig => GameSettings}/GZ3PB2.ini | 0 .../{GameConfig => GameSettings}/GZEE70.ini | 0 .../{GameConfig => GameSettings}/GZLE01.ini | 0 .../{GameConfig => GameSettings}/GZLJ01.ini | 0 .../{GameConfig => GameSettings}/GZLP01.ini | 0 .../{GameConfig => GameSettings}/GZMP7D.ini | 0 .../{GameConfig => GameSettings}/GZPE70.ini | 0 .../{GameConfig => GameSettings}/GZPP70.ini | 0 .../{GameConfig => GameSettings}/GZSE70.ini | 0 .../{GameConfig => GameSettings}/GZWE01.ini | 0 .../{GameConfig => GameSettings}/GZWP01.ini | 0 .../{GameConfig => GameSettings}/HAAA01.ini | 0 .../{GameConfig => GameSettings}/HACA01.ini | 0 .../{GameConfig => GameSettings}/HADE01.ini | 0 .../{GameConfig => GameSettings}/HAXXHB.ini | 0 .../{GameConfig => GameSettings}/HAYA01.ini | 0 .../{GameConfig => GameSettings}/HCFE01.ini | 0 .../{GameConfig => GameSettings}/JAAE01.ini | 0 .../{GameConfig => GameSettings}/JACP01.ini | 0 .../{GameConfig => GameSettings}/JADE01.ini | 0 .../{GameConfig => GameSettings}/JAEE01.ini | 1 - .../{GameConfig => GameSettings}/JBKE01.ini | 1 - .../{GameConfig => GameSettings}/JBKP01.ini | 0 .../{GameConfig => GameSettings}/JCBE01.ini | 1 - .../{GameConfig => GameSettings}/JCWE01.ini | 1 - .../{GameConfig => GameSettings}/JODIHB.ini | 0 .../{GameConfig => GameSettings}/NAAE01.ini | 0 .../{GameConfig => GameSettings}/NAAP01.ini | 0 .../{GameConfig => GameSettings}/NABE01.ini | 1 - .../{GameConfig => GameSettings}/NACE01.ini | 0 .../{GameConfig => GameSettings}/NAEE01.ini | 0 .../{GameConfig => GameSettings}/NAFP01.ini | 0 .../{GameConfig => GameSettings}/NAHE01.ini | 1 - .../{GameConfig => GameSettings}/NAKE01.ini | 1 - .../{GameConfig => GameSettings}/NAKP01.ini | 0 .../{GameConfig => GameSettings}/NANE01.ini | 0 .../{GameConfig => GameSettings}/NARP01.ini | 0 .../{GameConfig => GameSettings}/PC6E01.ini | 0 .../PH_PRESETS.ini | 0 .../{GameConfig => GameSettings}/PM4E01.ini | 0 .../{GameConfig => GameSettings}/PRJE01.ini | 0 .../{GameConfig => GameSettings}/PZLE01.ini | 0 .../{GameConfig => GameSettings}/PZLJ01.ini | 0 .../{GameConfig => GameSettings}/PZLP01.ini | 0 .../{GameConfig => GameSettings}/R22E01.ini | 0 .../{GameConfig => GameSettings}/R22J01.ini | 0 .../{GameConfig => GameSettings}/R22P01.ini | 0 .../{GameConfig => GameSettings}/R29P52.ini | 0 .../{GameConfig => GameSettings}/R2GEXJ.ini | 0 .../{GameConfig => GameSettings}/R2GJAF.ini | 0 .../{GameConfig => GameSettings}/R2GP99.ini | 0 .../{GameConfig => GameSettings}/R2JJAF.ini | 0 .../{GameConfig => GameSettings}/R2KP54.ini | 0 .../{GameConfig => GameSettings}/R2TE41.ini | 0 .../{GameConfig => GameSettings}/R2UE8P.ini | 0 .../{GameConfig => GameSettings}/R2VJ01.ini | 0 .../{GameConfig => GameSettings}/R2VP01.ini | 0 .../{GameConfig => GameSettings}/R3BE8P.ini | 0 .../{GameConfig => GameSettings}/R3BJ8P.ini | 0 .../{GameConfig => GameSettings}/R3BP8P.ini | 0 .../{GameConfig => GameSettings}/R3CE20.ini | 0 .../{GameConfig => GameSettings}/R3DES5.ini | 0 .../{GameConfig => GameSettings}/R3DPS5.ini | 0 .../{GameConfig => GameSettings}/R3GXUG.ini | 0 .../{GameConfig => GameSettings}/R3ME01.ini | 0 .../{GameConfig => GameSettings}/R3MP01.ini | 0 .../{GameConfig => GameSettings}/R3NEXS.ini | 0 .../{GameConfig => GameSettings}/R3NPH3.ini | 0 .../{GameConfig => GameSettings}/R3OE01.ini | 0 .../{GameConfig => GameSettings}/R3OJ01.ini | 0 .../{GameConfig => GameSettings}/R3OP01.ini | 0 .../{GameConfig => GameSettings}/R3RE8P.ini | 1 - .../{GameConfig => GameSettings}/R3RP8P.ini | 1 - .../{GameConfig => GameSettings}/R3SP52.ini | 0 .../{GameConfig => GameSettings}/R3TP54.ini | 0 .../{GameConfig => GameSettings}/R46ENS.ini | 0 .../{GameConfig => GameSettings}/R49P01.ini | 0 .../{GameConfig => GameSettings}/R4BPGT.ini | 0 .../{GameConfig => GameSettings}/R4EE01.ini | 0 .../{GameConfig => GameSettings}/R4EJ01.ini | 0 .../{GameConfig => GameSettings}/R4EP01.ini | 0 .../{GameConfig => GameSettings}/R4QE01.ini | 0 .../{GameConfig => GameSettings}/R4QJ01.ini | 0 .../{GameConfig => GameSettings}/R4QK01.ini | 0 .../{GameConfig => GameSettings}/R4QP01.ini | 0 .../{GameConfig => GameSettings}/R4RP69.ini | 0 .../{GameConfig => GameSettings}/R4ZJ01.ini | 0 .../{GameConfig => GameSettings}/R5DE5G.ini | 0 .../{GameConfig => GameSettings}/R5IE4Q.ini | 0 .../{GameConfig => GameSettings}/R5IP4Q.ini | 0 .../{GameConfig => GameSettings}/R5IX4Q.ini | 0 .../{GameConfig => GameSettings}/R5VE41.ini | 0 .../{GameConfig => GameSettings}/R5VP41.ini | 0 .../{GameConfig => GameSettings}/R5VX41.ini | 0 .../{GameConfig => GameSettings}/R5WEA4.ini | 0 .../{GameConfig => GameSettings}/R5WJA4.ini | 0 .../{GameConfig => GameSettings}/R64E01.ini | 0 .../{GameConfig => GameSettings}/R64J01.ini | 0 .../{GameConfig => GameSettings}/R64K01.ini | 0 .../{GameConfig => GameSettings}/R64P01.ini | 0 .../{GameConfig => GameSettings}/R69E36.ini | 0 .../{GameConfig => GameSettings}/R6BE78.ini | 0 .../{GameConfig => GameSettings}/R6BJ78.ini | 0 .../{GameConfig => GameSettings}/R6BK78.ini | 0 .../{GameConfig => GameSettings}/R6BP78.ini | 0 .../{GameConfig => GameSettings}/R6BX78.ini | 0 .../{GameConfig => GameSettings}/R6NY41.ini | 0 .../{GameConfig => GameSettings}/R6TEA4.ini | 0 .../{GameConfig => GameSettings}/R6YEXS.ini | 0 .../{GameConfig => GameSettings}/R6YPH3.ini | 0 .../{GameConfig => GameSettings}/R7EE8P.ini | 0 .../{GameConfig => GameSettings}/R7EJ8P.ini | 0 .../{GameConfig => GameSettings}/R7EP8P.ini | 0 .../{GameConfig => GameSettings}/R7FEGD.ini | 0 .../{GameConfig => GameSettings}/R7FJGD.ini | 0 .../{GameConfig => GameSettings}/R7FPGD.ini | 0 .../{GameConfig => GameSettings}/R7GEAF.ini | 0 .../{GameConfig => GameSettings}/R7GJAF.ini | 0 .../{GameConfig => GameSettings}/R7GPAF.ini | 0 .../{GameConfig => GameSettings}/R7PE01.ini | 2 +- .../{GameConfig => GameSettings}/R7PP01.ini | 2 +- .../{GameConfig => GameSettings}/R7XE69.ini | 0 .../{GameConfig => GameSettings}/R7XJ13.ini | 0 .../{GameConfig => GameSettings}/R7XP69.ini | 0 .../{GameConfig => GameSettings}/R84EE9.ini | 0 .../{GameConfig => GameSettings}/R84J99.ini | 0 .../{GameConfig => GameSettings}/R84P99.ini | 0 .../{GameConfig => GameSettings}/R8AE01.ini | 0 .../{GameConfig => GameSettings}/R8AJ01.ini | 0 .../{GameConfig => GameSettings}/R8AP01.ini | 0 .../{GameConfig => GameSettings}/R8DEA4.ini | 0 .../{GameConfig => GameSettings}/R8DJA4.ini | 0 .../{GameConfig => GameSettings}/R8DPA4.ini | 0 .../{GameConfig => GameSettings}/R8JEWR.ini | 0 .../{GameConfig => GameSettings}/R8JPWR.ini | 0 .../{GameConfig => GameSettings}/R8LE20.ini | 0 .../{GameConfig => GameSettings}/R8LP7J.ini | 0 .../{GameConfig => GameSettings}/R8PE01.ini | 0 .../{GameConfig => GameSettings}/R8PJ01.ini | 0 .../{GameConfig => GameSettings}/R8PK01.ini | 0 .../{GameConfig => GameSettings}/R8PP01.ini | 0 .../{GameConfig => GameSettings}/R8XE52.ini | 0 .../{GameConfig => GameSettings}/R96EAF.ini | 0 .../{GameConfig => GameSettings}/R9FP36.ini | 0 .../{GameConfig => GameSettings}/R9IE01.ini | 0 .../{GameConfig => GameSettings}/RB4E08.ini | 0 .../{GameConfig => GameSettings}/RB4P08.ini | 0 .../{GameConfig => GameSettings}/RBBE18.ini | 0 .../{GameConfig => GameSettings}/RBBJ18.ini | 0 .../{GameConfig => GameSettings}/RBBP99.ini | 0 .../{GameConfig => GameSettings}/RBHE08.ini | 0 .../{GameConfig => GameSettings}/RBHJ08.ini | 0 .../{GameConfig => GameSettings}/RBHP08.ini | 0 .../{GameConfig => GameSettings}/RBIEE9.ini | 0 .../{GameConfig => GameSettings}/RBIJ99.ini | 0 .../{GameConfig => GameSettings}/RBIP99.ini | 0 .../{GameConfig => GameSettings}/RBKE69.ini | 0 .../{GameConfig => GameSettings}/RBME5G.ini | 0 .../{GameConfig => GameSettings}/RBQPUG.ini | 0 .../{GameConfig => GameSettings}/RBTP8P.ini | 0 .../{GameConfig => GameSettings}/RBUE08.ini | 0 .../{GameConfig => GameSettings}/RBUP08.ini | 0 .../{GameConfig => GameSettings}/RBWE01.ini | 0 .../{GameConfig => GameSettings}/RBWJ01.ini | 0 .../{GameConfig => GameSettings}/RBWP01.ini | 0 .../{GameConfig => GameSettings}/RBXJ8P.ini | 0 .../{GameConfig => GameSettings}/RBZXUG.ini | 0 .../{GameConfig => GameSettings}/RCJE8P.ini | 0 .../{GameConfig => GameSettings}/RCJP8P.ini | 0 .../{GameConfig => GameSettings}/RCKPGN.ini | 0 .../{GameConfig => GameSettings}/RCPE18.ini | 0 .../{GameConfig => GameSettings}/RD2E41.ini | 0 .../{GameConfig => GameSettings}/RD2J41.ini | 0 .../{GameConfig => GameSettings}/RD2K41.ini | 0 .../{GameConfig => GameSettings}/RD2P41.ini | 0 .../{GameConfig => GameSettings}/RD2X41.ini | 0 .../{GameConfig => GameSettings}/RDBPAF.ini | 0 .../{GameConfig => GameSettings}/RDFP41.ini | 0 .../{GameConfig => GameSettings}/RDGPA4.ini | 0 .../{GameConfig => GameSettings}/RDHP78.ini | 0 .../{GameConfig => GameSettings}/RDIE41.ini | 0 .../{GameConfig => GameSettings}/RDKE01.ini | 0 .../{GameConfig => GameSettings}/RDQEGD.ini | 0 .../{GameConfig => GameSettings}/RDSE70.ini | 0 .../{GameConfig => GameSettings}/RDSJAF.ini | 0 .../{GameConfig => GameSettings}/RDSPAF.ini | 0 .../{GameConfig => GameSettings}/RDVE41.ini | 0 .../{GameConfig => GameSettings}/RDXP18.ini | 0 .../{GameConfig => GameSettings}/RDZJ01.ini | 0 .../{GameConfig => GameSettings}/RDZP01.ini | 0 .../{GameConfig => GameSettings}/RE4E08.ini | 0 .../{GameConfig => GameSettings}/RE4J08.ini | 0 .../{GameConfig => GameSettings}/RE4P08.ini | 0 .../{GameConfig => GameSettings}/REDE41.ini | 0 .../{GameConfig => GameSettings}/REDJ41.ini | 0 .../{GameConfig => GameSettings}/REDP41.ini | 0 .../{GameConfig => GameSettings}/RELJAB.ini | 2 +- .../{GameConfig => GameSettings}/RELS01.ini | 2 +- .../{GameConfig => GameSettings}/RENE8P.ini | 0 .../{GameConfig => GameSettings}/RENJ8P.ini | 0 .../{GameConfig => GameSettings}/RENP8P.ini | 0 .../{GameConfig => GameSettings}/REXP01.ini | 0 .../{GameConfig => GameSettings}/RF4P6M.ini | 0 .../{GameConfig => GameSettings}/RF7J08.ini | 0 .../{GameConfig => GameSettings}/RFBE01.ini | 0 .../{GameConfig => GameSettings}/RFBJ01.ini | 0 .../{GameConfig => GameSettings}/RFBP01.ini | 0 .../{GameConfig => GameSettings}/RFCEGD.ini | 0 .../{GameConfig => GameSettings}/RFCJGD.ini | 0 .../{GameConfig => GameSettings}/RFCPGD.ini | 0 .../{GameConfig => GameSettings}/RFEE01.ini | 0 .../{GameConfig => GameSettings}/RFEJ01.ini | 0 .../{GameConfig => GameSettings}/RFEP01.ini | 0 .../{GameConfig => GameSettings}/RFFEGD.ini | 0 .../{GameConfig => GameSettings}/RFFJGD.ini | 0 .../{GameConfig => GameSettings}/RFFPGD.ini | 0 .../{GameConfig => GameSettings}/RFQP69.ini | 0 .../{GameConfig => GameSettings}/RFSEEB.ini | 0 .../{GameConfig => GameSettings}/RFSJ8P.ini | 0 .../{GameConfig => GameSettings}/RG5PWR.ini | 0 .../{GameConfig => GameSettings}/RGAE8P.ini | 0 .../{GameConfig => GameSettings}/RGHE52.ini | 0 .../{GameConfig => GameSettings}/RGLE7D.ini | 0 .../{GameConfig => GameSettings}/RGQE70.ini | 2 +- .../{GameConfig => GameSettings}/RGVP52.ini | 0 .../{GameConfig => GameSettings}/RH2P41.ini | 0 .../{GameConfig => GameSettings}/RH8E4F.ini | 0 .../{GameConfig => GameSettings}/RH8JEL.ini | 0 .../{GameConfig => GameSettings}/RH8P4F.ini | 0 .../{GameConfig => GameSettings}/RH8X4F.ini | 0 .../{GameConfig => GameSettings}/RHAE01.ini | 0 .../{GameConfig => GameSettings}/RHAJ01.ini | 0 .../{GameConfig => GameSettings}/RHAK01.ini | 0 .../{GameConfig => GameSettings}/RHAP01.ini | 0 .../{GameConfig => GameSettings}/RHAW01.ini | 0 .../{GameConfig => GameSettings}/RHDE8P.ini | 0 .../{GameConfig => GameSettings}/RHDJ8P.ini | 0 .../{GameConfig => GameSettings}/RHDP8P.ini | 0 .../{GameConfig => GameSettings}/RHMEE9.ini | 0 .../{GameConfig => GameSettings}/RHMP99.ini | 0 .../{GameConfig => GameSettings}/RHOE8P.ini | 0 .../{GameConfig => GameSettings}/RHOJ8P.ini | 0 .../{GameConfig => GameSettings}/RHOP8P.ini | 0 .../{GameConfig => GameSettings}/RHTP54.ini | 0 .../{GameConfig => GameSettings}/RHUP7J.ini | 0 .../{GameConfig => GameSettings}/RIBPKM.ini | 0 .../{GameConfig => GameSettings}/RIHP8P.ini | 0 .../{GameConfig => GameSettings}/RIJE69.ini | 0 .../{GameConfig => GameSettings}/RINE08.ini | 0 .../{GameConfig => GameSettings}/RINP08.ini | 0 .../{GameConfig => GameSettings}/RIPEAF.ini | 0 .../{GameConfig => GameSettings}/RIPJAF.ini | 0 .../{GameConfig => GameSettings}/RIPPAF.ini | 0 .../{GameConfig => GameSettings}/RIUJAF.ini | 0 .../{GameConfig => GameSettings}/RIUPAF.ini | 0 .../{GameConfig => GameSettings}/RIVEXJ.ini | 0 .../{GameConfig => GameSettings}/RJ3P7J.ini | 0 .../{GameConfig => GameSettings}/RJAP52.ini | 0 .../{GameConfig => GameSettings}/RJCP52.ini | 0 .../{GameConfig => GameSettings}/RJSXUG.ini | 0 .../{GameConfig => GameSettings}/RK2EEB.ini | 0 .../{GameConfig => GameSettings}/RK2JEB.ini | 0 .../{GameConfig => GameSettings}/RK2P01.ini | 0 .../{GameConfig => GameSettings}/RK5E01.ini | 0 .../{GameConfig => GameSettings}/RKDEEB.ini | 0 .../{GameConfig => GameSettings}/RKDJEB.ini | 0 .../{GameConfig => GameSettings}/RKDP01.ini | 0 .../{GameConfig => GameSettings}/RKDPEB.ini | 0 .../{GameConfig => GameSettings}/RKIPUG.ini | 0 .../{GameConfig => GameSettings}/RKMP5D.ini | 0 .../{GameConfig => GameSettings}/RKSPUG.ini | 0 .../{GameConfig => GameSettings}/RLBEWR.ini | 0 .../{GameConfig => GameSettings}/RLEEFS.ini | 0 .../{GameConfig => GameSettings}/RLGE64.ini | 0 .../{GameConfig => GameSettings}/RLGJ52.ini | 0 .../{GameConfig => GameSettings}/RLGP64.ini | 0 .../{GameConfig => GameSettings}/RLJPKM.ini | 0 .../{GameConfig => GameSettings}/RLXEMJ.ini | 0 .../{GameConfig => GameSettings}/RM2E69.ini | 0 .../{GameConfig => GameSettings}/RM3E01.ini | 0 .../{GameConfig => GameSettings}/RM3J01.ini | 0 .../{GameConfig => GameSettings}/RM3P01.ini | 0 .../{GameConfig => GameSettings}/RM6EEB.ini | 0 .../{GameConfig => GameSettings}/RM8E01.ini | 0 .../{GameConfig => GameSettings}/RM8J01.ini | 0 .../{GameConfig => GameSettings}/RM8K01.ini | 0 .../{GameConfig => GameSettings}/RM8P01.ini | 0 .../{GameConfig => GameSettings}/RMAE01.ini | 0 .../{GameConfig => GameSettings}/RMAP01.ini | 0 .../{GameConfig => GameSettings}/RMCE01.ini | 0 .../{GameConfig => GameSettings}/RMCJ01.ini | 0 .../{GameConfig => GameSettings}/RMCK01.ini | 0 .../{GameConfig => GameSettings}/RMCP01.ini | 0 .../{GameConfig => GameSettings}/RMGE01.ini | 0 .../{GameConfig => GameSettings}/RMGJ01.ini | 0 .../{GameConfig => GameSettings}/RMGK01.ini | 0 .../{GameConfig => GameSettings}/RMGP01.ini | 0 .../{GameConfig => GameSettings}/RMHE08.ini | 2 +- .../{GameConfig => GameSettings}/RMHJ08.ini | 0 .../{GameConfig => GameSettings}/RMHP08.ini | 0 .../{GameConfig => GameSettings}/RMKE01.ini | 0 .../{GameConfig => GameSettings}/RMKJ01.ini | 0 .../{GameConfig => GameSettings}/RMKP01.ini | 0 .../{GameConfig => GameSettings}/RMLEH4.ini | 0 .../{GameConfig => GameSettings}/RMLJH4.ini | 0 .../{GameConfig => GameSettings}/RMLK52.ini | 0 .../{GameConfig => GameSettings}/RMLP7U.ini | 0 .../{GameConfig => GameSettings}/RMLPH4.ini | 0 .../{GameConfig => GameSettings}/RMSE52.ini | 0 .../{GameConfig => GameSettings}/RNEEDA.ini | 0 .../{GameConfig => GameSettings}/RNEJDA.ini | 0 .../{GameConfig => GameSettings}/RNEPDA.ini | 0 .../{GameConfig => GameSettings}/RNHE41.ini | 0 .../{GameConfig => GameSettings}/RNMXUG.ini | 0 .../{GameConfig => GameSettings}/RNOJ01.ini | 0 .../{GameConfig => GameSettings}/RNOP01.ini | 0 .../{GameConfig => GameSettings}/RO2P7N.ini | 2 +- .../{GameConfig => GameSettings}/RO3EXJ.ini | 0 .../{GameConfig => GameSettings}/RO3J99.ini | 0 .../{GameConfig => GameSettings}/RO3P99.ini | 0 .../{GameConfig => GameSettings}/RO7P7D.ini | 0 .../{GameConfig => GameSettings}/RO8E7D.ini | 0 .../{GameConfig => GameSettings}/RO9EFS.ini | 0 .../{GameConfig => GameSettings}/RO9PNK.ini | 0 .../{GameConfig => GameSettings}/ROAE36.ini | 0 .../{GameConfig => GameSettings}/ROAP36.ini | 0 .../{GameConfig => GameSettings}/ROCPNK.ini | 0 .../{GameConfig => GameSettings}/RODE01.ini | 0 .../{GameConfig => GameSettings}/RODJ01.ini | 0 .../{GameConfig => GameSettings}/RODK01.ini | 0 .../{GameConfig => GameSettings}/RODP01.ini | 0 .../{GameConfig => GameSettings}/ROLE8P.ini | 0 .../{GameConfig => GameSettings}/ROLJ01.ini | 0 .../{GameConfig => GameSettings}/ROLK01.ini | 0 .../{GameConfig => GameSettings}/ROLP8P.ini | 0 .../{GameConfig => GameSettings}/RONEG9.ini | 0 .../{GameConfig => GameSettings}/RONJG9.ini | 0 .../{GameConfig => GameSettings}/RONPG9.ini | 0 .../{GameConfig => GameSettings}/ROUJAF.ini | 0 .../{GameConfig => GameSettings}/ROUPAF.ini | 0 .../{GameConfig => GameSettings}/ROWE08.ini | 0 .../{GameConfig => GameSettings}/ROWJ08.ini | 0 .../{GameConfig => GameSettings}/ROWP08.ini | 0 .../{GameConfig => GameSettings}/RP7P52.ini | 0 .../{GameConfig => GameSettings}/RPBE01.ini | 0 .../{GameConfig => GameSettings}/RPBJ01.ini | 0 .../{GameConfig => GameSettings}/RPBP01.ini | 0 .../{GameConfig => GameSettings}/RPDPGN.ini | 0 .../{GameConfig => GameSettings}/RPJE7U.ini | 0 .../{GameConfig => GameSettings}/RPJJ99.ini | 0 .../{GameConfig => GameSettings}/RPPE41.ini | 0 .../{GameConfig => GameSettings}/RPWZ41.ini | 0 .../{GameConfig => GameSettings}/RPYP9B.ini | 0 .../{GameConfig => GameSettings}/RQ6EJJ.ini | 0 .../{GameConfig => GameSettings}/RQ6PKM.ini | 0 .../{GameConfig => GameSettings}/RQ6XKM.ini | 0 .../{GameConfig => GameSettings}/RQBENR.ini | 0 .../{GameConfig => GameSettings}/RQLE64.ini | 0 .../{GameConfig => GameSettings}/RQOP69.ini | 0 .../{GameConfig => GameSettings}/RQREXJ.ini | 0 .../{GameConfig => GameSettings}/RQRJAF.ini | 0 .../{GameConfig => GameSettings}/RQRPAF.ini | 0 .../{GameConfig => GameSettings}/RR2PUG.ini | 0 .../{GameConfig => GameSettings}/RR5P70.ini | 0 .../{GameConfig => GameSettings}/RRAXUG.ini | 0 .../{GameConfig => GameSettings}/RRBE41.ini | 0 .../{GameConfig => GameSettings}/RRBJ41.ini | 0 .../{GameConfig => GameSettings}/RRBP41.ini | 0 .../{GameConfig => GameSettings}/RRKE70.ini | 0 .../{GameConfig => GameSettings}/RRKP70.ini | 0 .../{GameConfig => GameSettings}/RRMX69.ini | 0 .../{GameConfig => GameSettings}/RRXXUG.ini | 0 .../{GameConfig => GameSettings}/RRYPHY.ini | 0 .../{GameConfig => GameSettings}/RRZEGY.ini | 0 .../{GameConfig => GameSettings}/RRZPGY.ini | 0 .../{GameConfig => GameSettings}/RS5EC8.ini | 0 .../{GameConfig => GameSettings}/RS5JC8.ini | 0 .../{GameConfig => GameSettings}/RS5PC8.ini | 0 .../{GameConfig => GameSettings}/RS8J8N.ini | 0 .../{GameConfig => GameSettings}/RS9E8P.ini | 0 .../{GameConfig => GameSettings}/RS9P8P.ini | 0 .../{GameConfig => GameSettings}/RSBE01.ini | 0 .../{GameConfig => GameSettings}/RSBJ01.ini | 0 .../{GameConfig => GameSettings}/RSBP01.ini | 0 .../{GameConfig => GameSettings}/RSFE7U.ini | 0 .../{GameConfig => GameSettings}/RSFJ99.ini | 0 .../{GameConfig => GameSettings}/RSFP99.ini | 0 .../{GameConfig => GameSettings}/RSIE69.ini | 0 .../{GameConfig => GameSettings}/RSIJ13.ini | 0 .../{GameConfig => GameSettings}/RSIP69.ini | 0 .../{GameConfig => GameSettings}/RSLEAF.ini | 0 .../{GameConfig => GameSettings}/RSLJAF.ini | 0 .../{GameConfig => GameSettings}/RSLKAF.ini | 0 .../{GameConfig => GameSettings}/RSLPAF.ini | 0 .../{GameConfig => GameSettings}/RSME8P.ini | 0 .../{GameConfig => GameSettings}/RSMP8P.ini | 0 .../{GameConfig => GameSettings}/RSPE01.ini | 0 .../{GameConfig => GameSettings}/RSPP01.ini | 0 .../{GameConfig => GameSettings}/RSRE8P.ini | 0 .../{GameConfig => GameSettings}/RSRP8P.ini | 0 .../{GameConfig => GameSettings}/RSTP64.ini | 0 .../{GameConfig => GameSettings}/RSUP41.ini | 0 .../{GameConfig => GameSettings}/RSVE8P.ini | 0 .../{GameConfig => GameSettings}/RSVJ8P.ini | 0 .../{GameConfig => GameSettings}/RSVP8P.ini | 0 .../{GameConfig => GameSettings}/RSWP08.ini | 0 .../{GameConfig => GameSettings}/RSXE69.ini | 0 .../{GameConfig => GameSettings}/RSXJ13.ini | 0 .../{GameConfig => GameSettings}/RSXK69.ini | 0 .../{GameConfig => GameSettings}/RSXP69.ini | 0 .../{GameConfig => GameSettings}/RSZPGT.ini | 0 .../{GameConfig => GameSettings}/RT3E54.ini | 1 - .../{GameConfig => GameSettings}/RT3JEL.ini | 1 - .../{GameConfig => GameSettings}/RT3P54.ini | 1 - .../{GameConfig => GameSettings}/RT4EAF.ini | 0 .../{GameConfig => GameSettings}/RT4JAF.ini | 0 .../{GameConfig => GameSettings}/RT4PAF.ini | 0 .../{GameConfig => GameSettings}/RT5E8P.ini | 0 .../{GameConfig => GameSettings}/RT5P8P.ini | 0 .../{GameConfig => GameSettings}/RT9E52.ini | 0 .../{GameConfig => GameSettings}/RTBP52.ini | 0 .../{GameConfig => GameSettings}/RTCP41.ini | 0 .../{GameConfig => GameSettings}/RTHE52.ini | 0 .../{GameConfig => GameSettings}/RTME41.ini | 0 .../{GameConfig => GameSettings}/RTMP41.ini | 0 .../{GameConfig => GameSettings}/RTNE41.ini | 0 .../{GameConfig => GameSettings}/RTNJCQ.ini | 0 .../{GameConfig => GameSettings}/RTNP41.ini | 0 .../{GameConfig => GameSettings}/RTZE08.ini | 0 .../{GameConfig => GameSettings}/RTZJ08.ini | 0 .../{GameConfig => GameSettings}/RTZK08.ini | 0 .../{GameConfig => GameSettings}/RTZP08.ini | 0 .../{GameConfig => GameSettings}/RUCXRT.ini | 0 .../{GameConfig => GameSettings}/RUUE01.ini | 1 - .../{GameConfig => GameSettings}/RUUJ01.ini | 1 - .../{GameConfig => GameSettings}/RUUK01.ini | 1 - .../{GameConfig => GameSettings}/RUUP01.ini | 1 - .../{GameConfig => GameSettings}/RUYE41.ini | 0 .../{GameConfig => GameSettings}/RVKEXJ.ini | 0 .../{GameConfig => GameSettings}/RVKP99.ini | 0 .../{GameConfig => GameSettings}/RVOPPL.ini | 0 .../{GameConfig => GameSettings}/RVQP41.ini | 0 .../{GameConfig => GameSettings}/RVSE69.ini | 0 .../{GameConfig => GameSettings}/RVSP69.ini | 0 .../{GameConfig => GameSettings}/RVUP8P.ini | 0 .../{GameConfig => GameSettings}/RVVP78.ini | 0 .../{GameConfig => GameSettings}/RVZP52.ini | 0 .../{GameConfig => GameSettings}/RW9X78.ini | 0 .../{GameConfig => GameSettings}/RWBXUG.ini | 0 .../{GameConfig => GameSettings}/RWEPA4.ini | 0 .../{GameConfig => GameSettings}/RWLE01.ini | 0 .../{GameConfig => GameSettings}/RWRE4F.ini | 0 .../{GameConfig => GameSettings}/RWRP4F.ini | 0 .../{GameConfig => GameSettings}/RWSE8P.ini | 0 .../{GameConfig => GameSettings}/RWSJ01.ini | 0 .../{GameConfig => GameSettings}/RWSK01.ini | 0 .../{GameConfig => GameSettings}/RWSP8P.ini | 0 .../{GameConfig => GameSettings}/RWUX52.ini | 0 .../{GameConfig => GameSettings}/RX3E01.ini | 0 .../{GameConfig => GameSettings}/RX9P69.ini | 0 .../{GameConfig => GameSettings}/RX9Y69.ini | 0 .../{GameConfig => GameSettings}/RXXE4Q.ini | 0 .../{GameConfig => GameSettings}/RXXJ4Q.ini | 0 .../{GameConfig => GameSettings}/RXXP4Q.ini | 0 .../{GameConfig => GameSettings}/RYBE69.ini | 0 .../{GameConfig => GameSettings}/RYOEA4.ini | 0 .../{GameConfig => GameSettings}/RYQP69.ini | 0 .../{GameConfig => GameSettings}/RYXP7J.ini | 0 .../{GameConfig => GameSettings}/RZ9PG9.ini | 0 .../{GameConfig => GameSettings}/RZDE01.ini | 0 .../{GameConfig => GameSettings}/RZDJ01.ini | 0 .../{GameConfig => GameSettings}/RZDK01.ini | 0 .../{GameConfig => GameSettings}/RZDP01.ini | 0 .../{GameConfig => GameSettings}/RZJD69.ini | 0 .../{GameConfig => GameSettings}/RZJE69.ini | 0 .../{GameConfig => GameSettings}/RZJJ13.ini | 0 .../{GameConfig => GameSettings}/RZJP69.ini | 0 .../{GameConfig => GameSettings}/RZPE01.ini | 0 .../{GameConfig => GameSettings}/RZTE01.ini | 1 - .../{GameConfig => GameSettings}/RZTJ01.ini | 1 - .../{GameConfig => GameSettings}/RZTK01.ini | 1 - .../{GameConfig => GameSettings}/RZTP01.ini | 1 - .../{GameConfig => GameSettings}/RZTW01.ini | 1 - .../{GameConfig => GameSettings}/RZZE8P.ini | 0 .../{GameConfig => GameSettings}/RZZJEL.ini | 0 .../{GameConfig => GameSettings}/RZZP8P.ini | 0 .../{GameConfig => GameSettings}/S2IP8P.ini | 0 .../{GameConfig => GameSettings}/S2LE01.ini | 0 .../{GameConfig => GameSettings}/S2LJ01.ini | 0 .../{GameConfig => GameSettings}/S2LP01.ini | 0 .../{GameConfig => GameSettings}/S2TJAF.ini | 0 .../{GameConfig => GameSettings}/S2WE78.ini | 0 .../{GameConfig => GameSettings}/S2WP78.ini | 0 .../{GameConfig => GameSettings}/S3BEWR.ini | 0 .../{GameConfig => GameSettings}/S3BPWR.ini | 0 .../{GameConfig => GameSettings}/S59E01.ini | 0 .../{GameConfig => GameSettings}/S59JC8.ini | 0 .../{GameConfig => GameSettings}/S59P01.ini | 0 .../{GameConfig => GameSettings}/S72E01.ini | 0 .../{GameConfig => GameSettings}/S72J01.ini | 0 .../{GameConfig => GameSettings}/S75E69.ini | 0 .../{GameConfig => GameSettings}/S75P69.ini | 0 .../{GameConfig => GameSettings}/SAKENS.ini | 0 .../{GameConfig => GameSettings}/SAKPNS.ini | 0 .../{GameConfig => GameSettings}/SB3E08.ini | 0 .../{GameConfig => GameSettings}/SB3J08.ini | 0 .../{GameConfig => GameSettings}/SB3P08.ini | 0 .../{GameConfig => GameSettings}/SB4E01.ini | 0 .../{GameConfig => GameSettings}/SB4J01.ini | 0 .../{GameConfig => GameSettings}/SB4P01.ini | 0 .../{GameConfig => GameSettings}/SBDE08.ini | 0 .../{GameConfig => GameSettings}/SBDJ08.ini | 0 .../{GameConfig => GameSettings}/SBDK08.ini | 0 .../{GameConfig => GameSettings}/SBDP08.ini | 0 .../{GameConfig => GameSettings}/SBLE5G.ini | 0 .../{GameConfig => GameSettings}/SBNEG9.ini | 0 .../{GameConfig => GameSettings}/SBVE78.ini | 0 .../{GameConfig => GameSettings}/SC2E8P.ini | 0 .../{GameConfig => GameSettings}/SC2P8P.ini | 0 .../{GameConfig => GameSettings}/SC4E64.ini | 0 .../{GameConfig => GameSettings}/SC4P64.ini | 0 .../{GameConfig => GameSettings}/SC7D52.ini | 0 .../{GameConfig => GameSettings}/SC7E52.ini | 0 .../{GameConfig => GameSettings}/SC7F52.ini | 0 .../{GameConfig => GameSettings}/SC7I52.ini | 0 .../{GameConfig => GameSettings}/SC7P52.ini | 0 .../{GameConfig => GameSettings}/SC7S52.ini | 0 .../{GameConfig => GameSettings}/SC8E01.ini | 0 .../{GameConfig => GameSettings}/SC8J01.ini | 0 .../{GameConfig => GameSettings}/SC8P01.ini | 0 .../{GameConfig => GameSettings}/SCAE18.ini | 0 .../{GameConfig => GameSettings}/SCAJ18.ini | 0 .../{GameConfig => GameSettings}/SCAP18.ini | 0 .../{GameConfig => GameSettings}/SCYE4Q.ini | 0 .../{GameConfig => GameSettings}/SCYP4Q.ini | 0 .../{GameConfig => GameSettings}/SCYX4Q.ini | 0 .../{GameConfig => GameSettings}/SCYY4Q.ini | 0 .../{GameConfig => GameSettings}/SCYZ4Q.ini | 0 .../{GameConfig => GameSettings}/SD2E41.ini | 0 .../{GameConfig => GameSettings}/SD2J01.ini | 0 .../{GameConfig => GameSettings}/SD2P41.ini | 0 .../{GameConfig => GameSettings}/SD2Y41.ini | 0 .../{GameConfig => GameSettings}/SDBE78.ini | 0 .../{GameConfig => GameSettings}/SDBP78.ini | 0 .../{GameConfig => GameSettings}/SDFE4Q.ini | 0 .../{GameConfig => GameSettings}/SDNE41.ini | 0 .../{GameConfig => GameSettings}/SDNP41.ini | 0 .../{GameConfig => GameSettings}/SDWE18.ini | 0 .../{GameConfig => GameSettings}/SDWJ18.ini | 0 .../{GameConfig => GameSettings}/SDWP18.ini | 0 .../{GameConfig => GameSettings}/SE2P69.ini | 0 .../{GameConfig => GameSettings}/SEAE69.ini | 0 .../{GameConfig => GameSettings}/SEAJ13.ini | 0 .../{GameConfig => GameSettings}/SEAP69.ini | 0 .../{GameConfig => GameSettings}/SEME4Q.ini | 0 .../{GameConfig => GameSettings}/SEMJ01.ini | 0 .../{GameConfig => GameSettings}/SEMP4Q.ini | 0 .../{GameConfig => GameSettings}/SEMX4Q.ini | 0 .../{GameConfig => GameSettings}/SEMY4Q.ini | 0 .../{GameConfig => GameSettings}/SEMZ4Q.ini | 0 .../{GameConfig => GameSettings}/SERE4Q.ini | 0 .../{GameConfig => GameSettings}/SERF4Q.ini | 0 .../{GameConfig => GameSettings}/SERP4Q.ini | 0 .../{GameConfig => GameSettings}/SF8E01.ini | 0 .../{GameConfig => GameSettings}/SF8J01.ini | 0 .../{GameConfig => GameSettings}/SF8P01.ini | 0 .../{GameConfig => GameSettings}/SFIE01.ini | 0 .../{GameConfig => GameSettings}/SFIP01.ini | 0 .../{GameConfig => GameSettings}/SFWE69.ini | 0 .../{GameConfig => GameSettings}/SFWP69.ini | 0 .../{GameConfig => GameSettings}/SGAP8P.ini | 0 .../{GameConfig => GameSettings}/SH6E52.ini | 0 .../{GameConfig => GameSettings}/SHDE52.ini | 0 .../{GameConfig => GameSettings}/SHLPA4.ini | 0 .../{GameConfig => GameSettings}/SILE78.ini | 0 .../{GameConfig => GameSettings}/SILP78.ini | 0 .../{GameConfig => GameSettings}/SJBE52.ini | 0 .../{GameConfig => GameSettings}/SJBP52.ini | 0 .../{GameConfig => GameSettings}/SJDE41.ini | 0 .../{GameConfig => GameSettings}/SJDP41.ini | 0 .../{GameConfig => GameSettings}/SJDY41.ini | 0 .../{GameConfig => GameSettings}/SJDZ41.ini | 0 .../{GameConfig => GameSettings}/SJXD41.ini | 1 - .../{GameConfig => GameSettings}/SJXE41.ini | 1 - .../{GameConfig => GameSettings}/SJXP41.ini | 1 - .../{GameConfig => GameSettings}/SK3EEB.ini | 0 .../{GameConfig => GameSettings}/SK4E52.ini | 0 .../{GameConfig => GameSettings}/SKJE78.ini | 0 .../{GameConfig => GameSettings}/SKVE20.ini | 0 .../{GameConfig => GameSettings}/SLSEXJ.ini | 0 .../{GameConfig => GameSettings}/SLSJ01.ini | 0 .../{GameConfig => GameSettings}/SLSP01.ini | 0 .../{GameConfig => GameSettings}/SLWE41.ini | 0 .../{GameConfig => GameSettings}/SMBE8P.ini | 0 .../{GameConfig => GameSettings}/SMBP8P.ini | 0 .../{GameConfig => GameSettings}/SMFE4Q.ini | 0 .../{GameConfig => GameSettings}/SMFP4Q.ini | 0 .../{GameConfig => GameSettings}/SMNE01.ini | 0 .../{GameConfig => GameSettings}/SMNJ01.ini | 0 .../{GameConfig => GameSettings}/SMNK01.ini | 0 .../{GameConfig => GameSettings}/SMNP01.ini | 2 +- .../{GameConfig => GameSettings}/SMNW01.ini | 0 .../{GameConfig => GameSettings}/SMOE41.ini | 0 .../{GameConfig => GameSettings}/SMOP41.ini | 0 .../{GameConfig => GameSettings}/SMOX41.ini | 0 .../{GameConfig => GameSettings}/SN4EDA.ini | 0 .../{GameConfig => GameSettings}/SN4JDA.ini | 0 .../{GameConfig => GameSettings}/SN4XGT.ini | 0 .../{GameConfig => GameSettings}/SNCE8P.ini | 0 .../{GameConfig => GameSettings}/SNCJ8P.ini | 0 .../{GameConfig => GameSettings}/SNCP8P.ini | 0 .../{GameConfig => GameSettings}/SNDE20.ini | 0 .../{GameConfig => GameSettings}/SNJE69.ini | 0 .../{GameConfig => GameSettings}/SNJP69.ini | 0 .../{GameConfig => GameSettings}/SO3EE9.ini | 0 .../{GameConfig => GameSettings}/SO3J99.ini | 0 .../{GameConfig => GameSettings}/SOJE41.ini | 0 .../{GameConfig => GameSettings}/SOJP41.ini | 0 .../{GameConfig => GameSettings}/SOUE01.ini | 0 .../{GameConfig => GameSettings}/SOUJ01.ini | 0 .../{GameConfig => GameSettings}/SOUK01.ini | 0 .../{GameConfig => GameSettings}/SOUP01.ini | 0 .../{GameConfig => GameSettings}/SPDE52.ini | 0 .../{GameConfig => GameSettings}/SPDP52.ini | 0 .../{GameConfig => GameSettings}/SPPEFS.ini | 0 .../{GameConfig => GameSettings}/SPTJEB.ini | 0 .../{GameConfig => GameSettings}/SPVEA4.ini | 0 .../{GameConfig => GameSettings}/SPVPA4.ini | 0 .../{GameConfig => GameSettings}/SPVXA4.ini | 0 .../{GameConfig => GameSettings}/SPVYA4.ini | 0 .../{GameConfig => GameSettings}/SQME52.ini | 0 .../{GameConfig => GameSettings}/SQMP52.ini | 0 .../{GameConfig => GameSettings}/SR5E41.ini | 0 .../{GameConfig => GameSettings}/SRQE41.ini | 0 .../{GameConfig => GameSettings}/SRQP41.ini | 0 .../{GameConfig => GameSettings}/SS3EWR.ini | 0 .../{GameConfig => GameSettings}/SSQE01.ini | 0 .../{GameConfig => GameSettings}/SSQJ01.ini | 0 .../{GameConfig => GameSettings}/SSQP01.ini | 0 .../{GameConfig => GameSettings}/SSRE20.ini | 0 .../{GameConfig => GameSettings}/SSRPXT.ini | 0 .../{GameConfig => GameSettings}/SSZE5G.ini | 0 .../{GameConfig => GameSettings}/STEETR.ini | 0 .../{GameConfig => GameSettings}/STHP8P.ini | 0 .../{GameConfig => GameSettings}/STKE08.ini | 0 .../{GameConfig => GameSettings}/STKJ08.ini | 0 .../{GameConfig => GameSettings}/STKP08.ini | 0 .../{GameConfig => GameSettings}/SUKE01.ini | 0 .../{GameConfig => GameSettings}/SUKJ01.ini | 0 .../{GameConfig => GameSettings}/SUKP01.ini | 0 .../{GameConfig => GameSettings}/SVBE52.ini | 0 .../{GameConfig => GameSettings}/SVBP52.ini | 0 .../{GameConfig => GameSettings}/SVME01.ini | 0 .../{GameConfig => GameSettings}/SVMJ01.ini | 0 .../{GameConfig => GameSettings}/SVMP01.ini | 0 .../{GameConfig => GameSettings}/SWAE52.ini | 0 .../{GameConfig => GameSettings}/SX3J01.ini | 0 .../{GameConfig => GameSettings}/SX3P01.ini | 0 .../{GameConfig => GameSettings}/SX4J01.ini | 0 .../{GameConfig => GameSettings}/SX4P01.ini | 0 .../{GameConfig => GameSettings}/SX8E52.ini | 0 .../{GameConfig => GameSettings}/SXBP52.ini | 0 .../{GameConfig => GameSettings}/SXCE52.ini | 0 .../{GameConfig => GameSettings}/SXCP52.ini | 0 .../{GameConfig => GameSettings}/SXDE52.ini | 0 .../{GameConfig => GameSettings}/SXEE52.ini | 2 +- .../{GameConfig => GameSettings}/SZAE69.ini | 0 .../{GameConfig => GameSettings}/SZAP69.ini | 0 .../{GameConfig => GameSettings}/SZBE69.ini | 0 .../{GameConfig => GameSettings}/SZBP69.ini | 0 .../{GameConfig => GameSettings}/UGPE01.ini | 0 .../{GameConfig => GameSettings}/UGPP01.ini | 0 .../{GameConfig => GameSettings}/W2GE08.ini | 1 - .../{GameConfig => GameSettings}/W2GP08.ini | 1 - .../{GameConfig => GameSettings}/W2MEBB.ini | 0 .../{GameConfig => GameSettings}/W3GE08.ini | 1 - .../{GameConfig => GameSettings}/W3GP08.ini | 1 - .../{GameConfig => GameSettings}/W8CEXS.ini | 0 .../{GameConfig => GameSettings}/W8CPXS.ini | 0 .../{GameConfig => GameSettings}/WA4P01.ini | 0 .../{GameConfig => GameSettings}/WALE01.ini | 0 .../{GameConfig => GameSettings}/WAYETJ.ini | 0 .../{GameConfig => GameSettings}/WB2ETL.ini | 1 - .../{GameConfig => GameSettings}/WB3ETL.ini | 1 - .../{GameConfig => GameSettings}/WB6EGL.ini | 1 - .../{GameConfig => GameSettings}/WBLPGD.ini | 0 .../{GameConfig => GameSettings}/WBME01.ini | 0 .../{GameConfig => GameSettings}/WBQE18.ini | 0 .../{GameConfig => GameSettings}/WBXETL.ini | 1 - .../{GameConfig => GameSettings}/WBYETL.ini | 1 - .../{GameConfig => GameSettings}/WBZETL.ini | 1 - .../{GameConfig => GameSettings}/WC6EUP.ini | 1 - .../{GameConfig => GameSettings}/WCHEJS.ini | 1 - .../{GameConfig => GameSettings}/WCVENV.ini | 0 .../{GameConfig => GameSettings}/WD9EA4.ini | 0 .../{GameConfig => GameSettings}/WDME01.ini | 0 .../{GameConfig => GameSettings}/WDMP01.ini | 0 .../{GameConfig => GameSettings}/WERP18.ini | 0 .../{GameConfig => GameSettings}/WF4EGD.ini | 0 .../{GameConfig => GameSettings}/WFLE01.ini | 1 - .../{GameConfig => GameSettings}/WFUEQQ.ini | 1 - .../{GameConfig => GameSettings}/WGDEA4.ini | 0 .../{GameConfig => GameSettings}/WGDPA4.ini | 0 .../{GameConfig => GameSettings}/WGOEWG.ini | 0 .../{GameConfig => GameSettings}/WGOPWG.ini | 0 .../{GameConfig => GameSettings}/WGSE08.ini | 1 - .../{GameConfig => GameSettings}/WGSP08.ini | 1 - .../{GameConfig => GameSettings}/WGYEHN.ini | 0 .../{GameConfig => GameSettings}/WHFETY.ini | 0 .../{GameConfig => GameSettings}/WHWEFJ.ini | 1 - .../{GameConfig => GameSettings}/WHWPFJ.ini | 1 - .../{GameConfig => GameSettings}/WICPKQ.ini | 0 .../{GameConfig => GameSettings}/WIDEUN.ini | 0 .../{GameConfig => GameSettings}/WILETL.ini | 0 .../{GameConfig => GameSettings}/WIYETL.ini | 0 .../{GameConfig => GameSettings}/WJEEJX.ini | 0 .../{GameConfig => GameSettings}/WKTJA4.ini | 0 .../{GameConfig => GameSettings}/WKTPA4.ini | 0 .../{GameConfig => GameSettings}/WLOEHL.ini | 0 .../{GameConfig => GameSettings}/WLWEHL.ini | 0 .../{GameConfig => GameSettings}/WM8E18.ini | 0 .../{GameConfig => GameSettings}/WMBP01.ini | 0 .../{GameConfig => GameSettings}/WMMEAF.ini | 0 .../{GameConfig => GameSettings}/WOTEM0.ini | 0 .../{GameConfig => GameSettings}/WPCE01.ini | 1 - .../{GameConfig => GameSettings}/WPJEJW.ini | 1 - .../{GameConfig => GameSettings}/WPPEXS.ini | 0 .../{GameConfig => GameSettings}/WPPJJF.ini | 0 .../{GameConfig => GameSettings}/WPSE01.ini | 0 .../{GameConfig => GameSettings}/WPUEGD.ini | 1 - .../{GameConfig => GameSettings}/WPYPPY.ini | 0 .../{GameConfig => GameSettings}/WR9E08.ini | 0 .../{GameConfig => GameSettings}/WR9P08.ini | 0 .../{GameConfig => GameSettings}/WRGEHU.ini | 0 .../{GameConfig => GameSettings}/WRIPGD.ini | 0 .../{GameConfig => GameSettings}/WRUPXS.ini | 0 .../{GameConfig => GameSettings}/WRXE08.ini | 0 .../{GameConfig => GameSettings}/WSNE8P.ini | 0 .../{GameConfig => GameSettings}/WTEELU.ini | 1 - .../{GameConfig => GameSettings}/WTKEGL.ini | 1 - .../{GameConfig => GameSettings}/WTRPXS.ini | 0 .../{GameConfig => GameSettings}/WTTPTW.ini | 0 .../{GameConfig => GameSettings}/WTXPJS.ini | 0 .../{GameConfig => GameSettings}/WWRE01.ini | 0 .../{GameConfig => GameSettings}/WZIPTW.ini | 0 .../{GameConfig => GameSettings}/WZPPRZ.ini | 0 Source/Core/Common/Src/CommonPaths.h | 2 +- Source/Core/Common/Src/FileUtil.cpp | 64 +-- Source/Core/Common/Src/FileUtil.h | 4 +- Source/Core/Core/Src/ActionReplay.cpp | 176 +++--- Source/Core/Core/Src/ActionReplay.h | 5 +- Source/Core/Core/Src/BootManager.cpp | 12 +- Source/Core/Core/Src/Core.cpp | 3 +- Source/Core/Core/Src/CoreParameter.h | 3 +- Source/Core/Core/Src/GeckoCodeConfig.cpp | 3 +- Source/Core/Core/Src/PatchEngine.cpp | 128 +++-- Source/Core/Core/Src/PatchEngine.h | 4 +- Source/Core/DolphinWX/Src/CheatsWindow.cpp | 15 +- Source/Core/DolphinWX/Src/CheatsWindow.h | 6 +- Source/Core/DolphinWX/Src/ISOFile.cpp | 3 +- Source/Core/DolphinWX/Src/ISOProperties.cpp | 524 +++++++++--------- Source/Core/DolphinWX/Src/ISOProperties.h | 17 +- Source/Core/DolphinWX/Src/Main.cpp | 5 +- Source/Core/DolphinWX/Src/PHackSettings.cpp | 6 +- Source/Core/InputCommon/Src/InputConfig.cpp | 9 +- Source/Core/VideoCommon/Src/VideoConfig.cpp | 65 +-- Source/Core/VideoCommon/Src/VideoConfig.h | 2 +- Source/Plugins/Plugin_VideoDX11/Src/main.cpp | 4 +- Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 3 +- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 3 +- 1549 files changed, 544 insertions(+), 609 deletions(-) rename Data/Sys/{GameConfig => GameSettings}/D43E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/D43J01.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/D43P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/D43U01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/DTLX01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/DVDXDV.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/FABP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/FBYE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2BE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2BP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2CE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2FE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2GJB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2ME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2MP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2OE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2OP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2RE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2TE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2VE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2VP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2XE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G2XP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3AD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3AE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3AF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3AP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3DE6L.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3EE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3FE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3FF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3FP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3JEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3LE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3NJDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3QEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3RD52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3RE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3RF52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3RP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3SE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3VE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3XE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G3XP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4AEE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4BE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4BP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4CE54.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4FD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4FE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4FF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4FP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4GEE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4ME69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4MP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4NJDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4QE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4QP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4SE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4SP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G4ZE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G5DE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G5DP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G5SE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G5SP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G63E41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G63P41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G6FE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G6NE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G6NP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G6QE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G6TE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G6TP5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G89EAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8FE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8ME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8MJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8MP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8OJ18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8SJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8WE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G8WP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9BEE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9RE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9SE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9SJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9SP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9TD52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9TE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9TF52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9TI52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/G9TP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GA2E51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GA3E51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GA4E51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GA7E70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GABEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GACE5H.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAFE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAFJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAFP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAFU01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAGP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAHEGG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GALE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GALJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GALP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAME5H.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GANE7U.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAPE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAQE6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GARE5H.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GATE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GATP51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAUE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAUJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAVE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAVP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAVY78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAXE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZH69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZI69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZJ69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZM69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GAZS69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GB3E51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GB4E51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GB4P51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBDE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBDS7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBFE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBGE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBGP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBHDC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBHEC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBHFC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBHPC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBIE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBIP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBKE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBLE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBLP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBLPGL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBME7F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBMP7F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBOP51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBQE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBSE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBSP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBTE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBVE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBVP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBWD64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBWE64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBWF64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBWP64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBXE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBYE0A.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBZE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GBZP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC2E9G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC3D78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC3E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC3F78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC3P78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC4JBN.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC5PNK.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC6E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC6P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC7PNK.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GC9P6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCAE5H.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCBE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCBP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCCE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCCP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCDE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCDP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCEE41.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/GCEP41.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/GCFE9G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCGE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCHE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCJE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCJP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCLP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCNE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCNP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCOE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCOPDV.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCPE6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCPP6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCQE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCQP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCSEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCTE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCTP51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCVEEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCZE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GCZP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GD4E6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GD6EB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GD6P70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GD7PB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GD9E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GD9P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDDE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDEE71.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDFE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDFP5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDGE7H.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDGP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDIE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDIP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDJEB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDKEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDLEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDQP6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDREAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDSE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDSP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDTE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDVE6L.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDVP6L.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GDWEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GE4E7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GE5EA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GE9E5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEAE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEAP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEBEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEDE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEDP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEME7F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEND69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GENE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GENP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GENS69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEOE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEOP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GESEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEWE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEXE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEYE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEZE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GEZP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF2E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF4E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF4F52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF4P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF5E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF6E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF6F69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF7E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF7P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF8E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GF8P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFAD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFAE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFAP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFAS69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFBE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFCP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFDD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFDE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFEE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFEJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFEP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFFE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFGEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFHP6V.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFKE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFPEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFQEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFTE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFTP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFUE4Z.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFYE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFYP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFZE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFZJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GFZP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GG4E08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GG4P08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GG5E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGAJB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGCE0A.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGCOSD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGEE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGEP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGEY41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGME00.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGPJB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGRE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGSEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGSJA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGSPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGTE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGTP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGYE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGYP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGZE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GGZX52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH2E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH2P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4D69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4F69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4H69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4I69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4J69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4M69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH4S69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH5D52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH5E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH5F52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH5P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH6EAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GH7E5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHAE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHAP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHBE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHBP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHCE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHCF4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHGEEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHKE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHLE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHLJ69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHLP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHLX69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHLY69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHLZ69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHMD4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHME4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHMF4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHMP4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHNE71.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHQE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHQP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHRE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHSE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHSJ69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHSP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHSX69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHSY69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHUE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHVE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHWE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GHYE6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIAE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIBE4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GICE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIGJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIKE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIKP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GILE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GILP51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GINE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GINX69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIPEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIQE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GISE36.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GISP36.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GITE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GITP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIVE4Z.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GIZE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJ3PA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJBE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJCE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJDE5S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJKE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJNE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJSJ18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJUD78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJUE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJUF78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJWE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJXE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJXP51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GJZE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK2D52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK2E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK2F52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK2I52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK2P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK4E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK5E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK5X78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK6JA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK7E08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK7P08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GK9EA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKAE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKBEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKBPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKDP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKFEGG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKGE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKHEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKHPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKJE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKKE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKLD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKLE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKLF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKLI69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKLJ69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKLP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKLS69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKME41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKMP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKNEB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKOE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKOP6V.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKOP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKQJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKSE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKTJA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKUE9G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKYE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKYJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKYP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GKZE9G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GL5E4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GL7E64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GL7P64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GL8E4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GL8F4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLBE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLCE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLCF52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLEE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLEP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLLE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLMP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLNE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLNP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLOE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLOP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLQE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLRE64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLSD64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLSE64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLSF64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLSP64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLUE7U.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLWE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLYE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLYP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLZE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GLZF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM2E8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM2P8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM3E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM4E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM4J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM4P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM5E7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM5F7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM5P7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM6EE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM6PE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM8E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM8J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GM8P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMBE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMBP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMFS69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMHE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMHF52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMHP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMIE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMIP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMKD5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMLEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMNE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMPE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMPP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMSE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMSJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMSP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMTP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMUE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GMXE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GN6E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GN8E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GN8P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNDE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNHE5d.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/GNJEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNLE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNNE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNOE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNQE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNRJDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNUEDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNWE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GNWP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GO2E4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GO7E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GO7F69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GO7P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOAE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOBE4Z.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOCE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOGJB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOMP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GONE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOOE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOPEB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOPJB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOQEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOSE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOSP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOSX41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOWD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOWE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOWF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOWJ69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOWP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOYD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOYE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOYF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOYP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GOYS69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP2E82.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP2EAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP4J18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP5E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP5J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP5P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP6E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP6J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP6P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP7E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP7J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP7P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GP8EAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPAE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPAJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPAP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPAU01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPDE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPEJ2Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPHD52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPHE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPHP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPIE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPIP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPKE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPNE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPNP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPOE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPOP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPSE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPSP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPTE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPTP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPVE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPVP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPXP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GPZJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQ8E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQCD52.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GQCE52.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GQCF52.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GQCI52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQCP52.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GQCS52.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GQLE9G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQNE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQSDAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQSEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQSFAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQSPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQTE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQWE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQWJ69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQWP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQWX69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GQXE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GR2E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GR6E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GR8D69.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GR8E69.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GR8F69.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GR8J69.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GR8P69.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GRAE5Z.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRBE6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRBP6S.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GREE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GREP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRFE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRHE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRHP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRJEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRKE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRKP7G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRLE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRNE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GROP7J.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRQE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRSEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRSPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRUE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRVEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GRYE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GS2D78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GS2E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GS2F78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GS2P78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GS8P7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSAE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSAP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSCE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSEJB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSMP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSNE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSNP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSOE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSOP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSPE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSSE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSSJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSSP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSSP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSTE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSTP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSWE64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSWP64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSWS64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GSZP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT3D52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT3E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT3F52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT3P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT6E70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT7E41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT7P41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT7X41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GT8E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTCJBL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTEE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTEP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTFEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTKE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTKP51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTLE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTLP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTLX52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTSE4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTSP4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTUE8G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTWE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTWP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTYE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTYP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTZE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GTZP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUBE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUBP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUCP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUFE4Z.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUGE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUME52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUMP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUNE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUPE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUPP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUTE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUVE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUZE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GUZP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GV3E70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GV3P70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVCE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVCP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVDE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVHE4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVJE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVJJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVJP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVKE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVLD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVLE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVLF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVLP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVRE7H.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVSE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GVSP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW2E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW2P78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW3E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW3P78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW5E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW7E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW7P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW8E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GW9E78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWAE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWAF8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWAP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWBP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWEE51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWEJB0.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWEP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWGP4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWJE52.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GWKE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWKP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWLE6L.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/GWLX6L.ini (95%) rename Data/Sys/{GameConfig => GameSettings}/GWME51.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWOE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWPE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWPJG2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWPP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWQE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWRE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWRP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWSEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWTEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWVE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWWE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWWP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWYE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWYX41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWZE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GWZP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GX2E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GX2P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GX3E41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GX3P41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GX3X41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXBE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXBP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXCE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXEE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXEP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXFE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXFF69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXFP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXGE08.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/GXLE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXLP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXME52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXNE5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXOE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXOX69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXRE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXSE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXSP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXXE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GXXP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GY2E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYAE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYBP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYFEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYKEB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYQP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYRE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYWD41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYWEE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GYWP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZ2E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZ2J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZ2P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZ3E70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZ3PB2.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZEE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZLE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZLJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZLP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZMP7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZPE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZPP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZSE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZWE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/GZWP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/HAAA01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/HACA01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/HADE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/HAXXHB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/HAYA01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/HCFE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/JAAE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/JACP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/JADE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/JAEE01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/JBKE01.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/JBKP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/JCBE01.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/JCWE01.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/JODIHB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NAAE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NAAP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NABE01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/NACE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NAEE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NAFP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NAHE01.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/NAKE01.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/NAKP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NANE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/NARP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/PC6E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/PH_PRESETS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/PM4E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/PRJE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/PZLE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/PZLJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/PZLP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R22E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R22J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R22P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R29P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2GEXJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2GJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2GP99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2JJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2KP54.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2TE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2UE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2VJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R2VP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3BE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3BJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3BP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3CE20.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3DES5.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3DPS5.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3GXUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3ME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3MP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3NEXS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3NPH3.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3OE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3OJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3OP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3RE8P.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/R3RP8P.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/R3SP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R3TP54.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R46ENS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R49P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4BPGT.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4EE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4EJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4EP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4QE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4QJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4QK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4QP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4RP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R4ZJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5DE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5IE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5IP4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5IX4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5VE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5VP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5VX41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5WEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R5WJA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R64E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R64J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R64K01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R64P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R69E36.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6BE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6BJ78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6BK78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6BP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6BX78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6NY41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6TEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6YEXS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R6YPH3.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7EE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7EJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7EP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7FEGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7FJGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7FPGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7GEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7GJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7GPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7PE01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/R7PP01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/R7XE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7XJ13.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R7XP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R84EE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R84J99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R84P99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8AE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8AJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8AP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8DEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8DJA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8DPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8JEWR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8JPWR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8LE20.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8LP7J.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8PE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8PJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8PK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8PP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R8XE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R96EAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R9FP36.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/R9IE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RB4E08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RB4P08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBBE18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBBJ18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBBP99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBHE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBHJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBHP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBIEE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBIJ99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBIP99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBKE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBME5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBQPUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBTP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBUE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBUP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBWE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBWJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBWP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBXJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RBZXUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RCJE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RCJP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RCKPGN.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RCPE18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RD2E41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RD2J41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RD2K41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RD2P41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RD2X41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDBPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDFP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDGPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDHP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDIE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDKE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDQEGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDSE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDSJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDSPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDVE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDXP18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDZJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RDZP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RE4E08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RE4J08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RE4P08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/REDE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/REDJ41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/REDP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RELJAB.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/RELS01.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/RENE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RENJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RENP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/REXP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RF4P6M.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RF7J08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFBE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFBJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFBP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFCEGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFCJGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFCPGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFEE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFEJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFEP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFFEGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFFJGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFFPGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFQP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFSEEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RFSJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RG5PWR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RGAE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RGHE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RGLE7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RGQE70.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/RGVP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RH2P41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RH8E4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RH8JEL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RH8P4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RH8X4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHAE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHAJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHAK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHAP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHAW01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHDE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHDJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHDP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHMEE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHMP99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHOE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHOJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHOP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHTP54.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RHUP7J.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIBPKM.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIHP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIJE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RINE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RINP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIPEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIPJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIPPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIUJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIUPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RIVEXJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RJ3P7J.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RJAP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RJCP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RJSXUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RK2EEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RK2JEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RK2P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RK5E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RKDEEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RKDJEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RKDP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RKDPEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RKIPUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RKMP5D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RKSPUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RLBEWR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RLEEFS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RLGE64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RLGJ52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RLGP64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RLJPKM.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RLXEMJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM2E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM3E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM3J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM3P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM6EEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM8E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM8J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM8K01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RM8P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMAE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMAP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMCE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMCJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMCK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMCP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMGE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMGJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMGK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMGP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMHE08.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RMHJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMHP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMKE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMKJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMKP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMLEH4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMLJH4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMLK52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMLP7U.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMLPH4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RMSE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RNEEDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RNEJDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RNEPDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RNHE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RNMXUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RNOJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RNOP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RO2P7N.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/RO3EXJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RO3J99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RO3P99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RO7P7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RO8E7D.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RO9EFS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RO9PNK.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROAE36.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROAP36.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROCPNK.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RODE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RODJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RODK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RODP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROLE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROLJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROLK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROLP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RONEG9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RONJG9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RONPG9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROUJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROUPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROWE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROWJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/ROWP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RP7P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPBE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPBJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPBP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPDPGN.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPJE7U.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPJJ99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPPE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPWZ41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RPYP9B.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQ6EJJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQ6PKM.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQ6XKM.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQBENR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQLE64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQOP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQREXJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQRJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RQRPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RR2PUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RR5P70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRAXUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRBE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRBJ41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRBP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRKE70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRKP70.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRMX69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRXXUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRYPHY.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRZEGY.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RRZPGY.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RS5EC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RS5JC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RS5PC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RS8J8N.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RS9E8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RS9P8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSBE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSBJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSBP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSFE7U.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSFJ99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSFP99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSIE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSIJ13.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSIP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSLEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSLJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSLKAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSLPAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSME8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSMP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSPE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSPP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSRE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSRP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSTP64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSUP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSVE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSVJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSVP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSWP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSXE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSXJ13.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSXK69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSXP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RSZPGT.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RT3E54.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/RT3JEL.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/RT3P54.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/RT4EAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RT4JAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RT4PAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RT5E8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RT5P8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RT9E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTBP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTCP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTHE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTME41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTMP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTNE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTNJCQ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTNP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTZE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTZJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTZK08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RTZP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RUCXRT.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RUUE01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RUUJ01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RUUK01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RUUP01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RUYE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVKEXJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVKP99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVOPPL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVQP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVSE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVSP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVUP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVVP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RVZP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RW9X78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWBXUG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWEPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWLE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWRE4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWRP4F.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWSE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWSJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWSK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWSP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RWUX52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RX3E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RX9P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RX9Y69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RXXE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RXXJ4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RXXP4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RYBE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RYOEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RYQP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RYXP7J.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZ9PG9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZDE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZDJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZDK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZDP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZJD69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZJE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZJJ13.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZJP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZPE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZTE01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RZTJ01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RZTK01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RZTP01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RZTW01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/RZZE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZZJEL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/RZZP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S2IP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S2LE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S2LJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S2LP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S2TJAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S2WE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S2WP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S3BEWR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S3BPWR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S59E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S59JC8.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S59P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S72E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S72J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S75E69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/S75P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SAKENS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SAKPNS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SB3E08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SB3J08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SB3P08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SB4E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SB4J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SB4P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SBDE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SBDJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SBDK08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SBDP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SBLE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SBNEG9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SBVE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC2E8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC2P8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC4E64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC4P64.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC7D52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC7E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC7F52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC7I52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC7P52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC7S52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC8E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC8J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SC8P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCAE18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCAJ18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCAP18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCYE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCYP4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCYX4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCYY4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SCYZ4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SD2E41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SD2J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SD2P41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SD2Y41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDBE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDBP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDFE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDNE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDNP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDWE18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDWJ18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SDWP18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SE2P69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEAE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEAJ13.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEAP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEME4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEMJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEMP4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEMX4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEMY4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SEMZ4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SERE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SERF4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SERP4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SF8E01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SF8J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SF8P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SFIE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SFIP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SFWE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SFWP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SGAP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SH6E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SHDE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SHLPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SILE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SILP78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SJBE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SJBP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SJDE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SJDP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SJDY41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SJDZ41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SJXD41.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/SJXE41.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/SJXP41.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/SK3EEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SK4E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SKJE78.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SKVE20.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SLSEXJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SLSJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SLSP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SLWE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMBE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMBP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMFE4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMFP4Q.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMNE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMNJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMNK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMNP01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/SMNW01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMOE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMOP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SMOX41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SN4EDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SN4JDA.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SN4XGT.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SNCE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SNCJ8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SNCP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SNDE20.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SNJE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SNJP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SO3EE9.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SO3J99.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SOJE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SOJP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SOUE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SOUJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SOUK01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SOUP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPDE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPDP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPPEFS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPTJEB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPVEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPVPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPVXA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SPVYA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SQME52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SQMP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SR5E41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SRQE41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SRQP41.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SS3EWR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SSQE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SSQJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SSQP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SSRE20.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SSRPXT.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SSZE5G.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/STEETR.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/STHP8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/STKE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/STKJ08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/STKP08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SUKE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SUKJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SUKP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SVBE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SVBP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SVME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SVMJ01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SVMP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SWAE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SX3J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SX3P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SX4J01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SX4P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SX8E52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SXBP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SXCE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SXCP52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SXDE52.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SXEE52.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/SZAE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SZAP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SZBE69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/SZBP69.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/UGPE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/UGPP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/W2GE08.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/W2GP08.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/W2MEBB.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/W3GE08.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/W3GP08.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/W8CEXS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/W8CPXS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WA4P01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WALE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WAYETJ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WB2ETL.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/WB3ETL.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/WB6EGL.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/WBLPGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WBME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WBQE18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WBXETL.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/WBYETL.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/WBZETL.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/WC6EUP.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/WCHEJS.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/WCVENV.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WD9EA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WDME01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WDMP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WERP18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WF4EGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WFLE01.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/WFUEQQ.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/WGDEA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WGDPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WGOEWG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WGOPWG.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WGSE08.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/WGSP08.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/WGYEHN.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WHFETY.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WHWEFJ.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/WHWPFJ.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/WICPKQ.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WIDEUN.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WILETL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WIYETL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WJEEJX.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WKTJA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WKTPA4.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WLOEHL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WLWEHL.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WM8E18.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WMBP01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WMMEAF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WOTEM0.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WPCE01.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/WPJEJW.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/WPPEXS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WPPJJF.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WPSE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WPUEGD.ini (96%) rename Data/Sys/{GameConfig => GameSettings}/WPYPPY.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WR9E08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WR9P08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WRGEHU.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WRIPGD.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WRUPXS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WRXE08.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WSNE8P.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WTEELU.ini (97%) rename Data/Sys/{GameConfig => GameSettings}/WTKEGL.ini (98%) rename Data/Sys/{GameConfig => GameSettings}/WTRPXS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WTTPTW.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WTXPJS.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WWRE01.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WZIPTW.ini (100%) rename Data/Sys/{GameConfig => GameSettings}/WZPPRZ.ini (100%) diff --git a/Data/Sys/GameConfig/D43E01.ini b/Data/Sys/GameSettings/D43E01.ini similarity index 100% rename from Data/Sys/GameConfig/D43E01.ini rename to Data/Sys/GameSettings/D43E01.ini diff --git a/Data/Sys/GameConfig/D43J01.ini b/Data/Sys/GameSettings/D43J01.ini similarity index 97% rename from Data/Sys/GameConfig/D43J01.ini rename to Data/Sys/GameSettings/D43J01.ini index 03d04723dd..6db05bda2d 100644 --- a/Data/Sys/GameConfig/D43J01.ini +++ b/Data/Sys/GameSettings/D43J01.ini @@ -13,7 +13,7 @@ EmulationIssues = [OnFrame] # Add memory patches to be applied every frame here. -+$loophack +$loophack 0x806866E4:word:0x60000000 [ActionReplay] diff --git a/Data/Sys/GameConfig/D43P01.ini b/Data/Sys/GameSettings/D43P01.ini similarity index 100% rename from Data/Sys/GameConfig/D43P01.ini rename to Data/Sys/GameSettings/D43P01.ini diff --git a/Data/Sys/GameConfig/D43U01.ini b/Data/Sys/GameSettings/D43U01.ini similarity index 100% rename from Data/Sys/GameConfig/D43U01.ini rename to Data/Sys/GameSettings/D43U01.ini diff --git a/Data/Sys/GameConfig/DTLX01.ini b/Data/Sys/GameSettings/DTLX01.ini similarity index 100% rename from Data/Sys/GameConfig/DTLX01.ini rename to Data/Sys/GameSettings/DTLX01.ini diff --git a/Data/Sys/GameConfig/DVDXDV.ini b/Data/Sys/GameSettings/DVDXDV.ini similarity index 100% rename from Data/Sys/GameConfig/DVDXDV.ini rename to Data/Sys/GameSettings/DVDXDV.ini diff --git a/Data/Sys/GameConfig/FABP01.ini b/Data/Sys/GameSettings/FABP01.ini similarity index 100% rename from Data/Sys/GameConfig/FABP01.ini rename to Data/Sys/GameSettings/FABP01.ini diff --git a/Data/Sys/GameConfig/FBYE01.ini b/Data/Sys/GameSettings/FBYE01.ini similarity index 100% rename from Data/Sys/GameConfig/FBYE01.ini rename to Data/Sys/GameSettings/FBYE01.ini diff --git a/Data/Sys/GameConfig/G2BE5G.ini b/Data/Sys/GameSettings/G2BE5G.ini similarity index 100% rename from Data/Sys/GameConfig/G2BE5G.ini rename to Data/Sys/GameSettings/G2BE5G.ini diff --git a/Data/Sys/GameConfig/G2BP7D.ini b/Data/Sys/GameSettings/G2BP7D.ini similarity index 100% rename from Data/Sys/GameConfig/G2BP7D.ini rename to Data/Sys/GameSettings/G2BP7D.ini diff --git a/Data/Sys/GameConfig/G2CE52.ini b/Data/Sys/GameSettings/G2CE52.ini similarity index 100% rename from Data/Sys/GameConfig/G2CE52.ini rename to Data/Sys/GameSettings/G2CE52.ini diff --git a/Data/Sys/GameConfig/G2FE78.ini b/Data/Sys/GameSettings/G2FE78.ini similarity index 100% rename from Data/Sys/GameConfig/G2FE78.ini rename to Data/Sys/GameSettings/G2FE78.ini diff --git a/Data/Sys/GameConfig/G2GJB2.ini b/Data/Sys/GameSettings/G2GJB2.ini similarity index 100% rename from Data/Sys/GameConfig/G2GJB2.ini rename to Data/Sys/GameSettings/G2GJB2.ini diff --git a/Data/Sys/GameConfig/G2ME01.ini b/Data/Sys/GameSettings/G2ME01.ini similarity index 100% rename from Data/Sys/GameConfig/G2ME01.ini rename to Data/Sys/GameSettings/G2ME01.ini diff --git a/Data/Sys/GameConfig/G2MP01.ini b/Data/Sys/GameSettings/G2MP01.ini similarity index 100% rename from Data/Sys/GameConfig/G2MP01.ini rename to Data/Sys/GameSettings/G2MP01.ini diff --git a/Data/Sys/GameConfig/G2OE41.ini b/Data/Sys/GameSettings/G2OE41.ini similarity index 100% rename from Data/Sys/GameConfig/G2OE41.ini rename to Data/Sys/GameSettings/G2OE41.ini diff --git a/Data/Sys/GameConfig/G2OP41.ini b/Data/Sys/GameSettings/G2OP41.ini similarity index 100% rename from Data/Sys/GameConfig/G2OP41.ini rename to Data/Sys/GameSettings/G2OP41.ini diff --git a/Data/Sys/GameConfig/G2RE52.ini b/Data/Sys/GameSettings/G2RE52.ini similarity index 100% rename from Data/Sys/GameConfig/G2RE52.ini rename to Data/Sys/GameSettings/G2RE52.ini diff --git a/Data/Sys/GameConfig/G2TE52.ini b/Data/Sys/GameSettings/G2TE52.ini similarity index 100% rename from Data/Sys/GameConfig/G2TE52.ini rename to Data/Sys/GameSettings/G2TE52.ini diff --git a/Data/Sys/GameConfig/G2VE08.ini b/Data/Sys/GameSettings/G2VE08.ini similarity index 100% rename from Data/Sys/GameConfig/G2VE08.ini rename to Data/Sys/GameSettings/G2VE08.ini diff --git a/Data/Sys/GameConfig/G2VP08.ini b/Data/Sys/GameSettings/G2VP08.ini similarity index 100% rename from Data/Sys/GameConfig/G2VP08.ini rename to Data/Sys/GameSettings/G2VP08.ini diff --git a/Data/Sys/GameConfig/G2XE8P.ini b/Data/Sys/GameSettings/G2XE8P.ini similarity index 100% rename from Data/Sys/GameConfig/G2XE8P.ini rename to Data/Sys/GameSettings/G2XE8P.ini diff --git a/Data/Sys/GameConfig/G2XP8P.ini b/Data/Sys/GameSettings/G2XP8P.ini similarity index 100% rename from Data/Sys/GameConfig/G2XP8P.ini rename to Data/Sys/GameSettings/G2XP8P.ini diff --git a/Data/Sys/GameConfig/G3AD69.ini b/Data/Sys/GameSettings/G3AD69.ini similarity index 100% rename from Data/Sys/GameConfig/G3AD69.ini rename to Data/Sys/GameSettings/G3AD69.ini diff --git a/Data/Sys/GameConfig/G3AE69.ini b/Data/Sys/GameSettings/G3AE69.ini similarity index 100% rename from Data/Sys/GameConfig/G3AE69.ini rename to Data/Sys/GameSettings/G3AE69.ini diff --git a/Data/Sys/GameConfig/G3AF69.ini b/Data/Sys/GameSettings/G3AF69.ini similarity index 100% rename from Data/Sys/GameConfig/G3AF69.ini rename to Data/Sys/GameSettings/G3AF69.ini diff --git a/Data/Sys/GameConfig/G3AP69.ini b/Data/Sys/GameSettings/G3AP69.ini similarity index 100% rename from Data/Sys/GameConfig/G3AP69.ini rename to Data/Sys/GameSettings/G3AP69.ini diff --git a/Data/Sys/GameConfig/G3DE6L.ini b/Data/Sys/GameSettings/G3DE6L.ini similarity index 100% rename from Data/Sys/GameConfig/G3DE6L.ini rename to Data/Sys/GameSettings/G3DE6L.ini diff --git a/Data/Sys/GameConfig/G3EE51.ini b/Data/Sys/GameSettings/G3EE51.ini similarity index 100% rename from Data/Sys/GameConfig/G3EE51.ini rename to Data/Sys/GameSettings/G3EE51.ini diff --git a/Data/Sys/GameConfig/G3FE69.ini b/Data/Sys/GameSettings/G3FE69.ini similarity index 100% rename from Data/Sys/GameConfig/G3FE69.ini rename to Data/Sys/GameSettings/G3FE69.ini diff --git a/Data/Sys/GameConfig/G3FF69.ini b/Data/Sys/GameSettings/G3FF69.ini similarity index 100% rename from Data/Sys/GameConfig/G3FF69.ini rename to Data/Sys/GameSettings/G3FF69.ini diff --git a/Data/Sys/GameConfig/G3FP69.ini b/Data/Sys/GameSettings/G3FP69.ini similarity index 100% rename from Data/Sys/GameConfig/G3FP69.ini rename to Data/Sys/GameSettings/G3FP69.ini diff --git a/Data/Sys/GameConfig/G3JEAF.ini b/Data/Sys/GameSettings/G3JEAF.ini similarity index 100% rename from Data/Sys/GameConfig/G3JEAF.ini rename to Data/Sys/GameSettings/G3JEAF.ini diff --git a/Data/Sys/GameConfig/G3LE8P.ini b/Data/Sys/GameSettings/G3LE8P.ini similarity index 100% rename from Data/Sys/GameConfig/G3LE8P.ini rename to Data/Sys/GameSettings/G3LE8P.ini diff --git a/Data/Sys/GameConfig/G3NJDA.ini b/Data/Sys/GameSettings/G3NJDA.ini similarity index 100% rename from Data/Sys/GameConfig/G3NJDA.ini rename to Data/Sys/GameSettings/G3NJDA.ini diff --git a/Data/Sys/GameConfig/G3QEA4.ini b/Data/Sys/GameSettings/G3QEA4.ini similarity index 100% rename from Data/Sys/GameConfig/G3QEA4.ini rename to Data/Sys/GameSettings/G3QEA4.ini diff --git a/Data/Sys/GameConfig/G3RD52.ini b/Data/Sys/GameSettings/G3RD52.ini similarity index 100% rename from Data/Sys/GameConfig/G3RD52.ini rename to Data/Sys/GameSettings/G3RD52.ini diff --git a/Data/Sys/GameConfig/G3RE52.ini b/Data/Sys/GameSettings/G3RE52.ini similarity index 100% rename from Data/Sys/GameConfig/G3RE52.ini rename to Data/Sys/GameSettings/G3RE52.ini diff --git a/Data/Sys/GameConfig/G3RF52.ini b/Data/Sys/GameSettings/G3RF52.ini similarity index 100% rename from Data/Sys/GameConfig/G3RF52.ini rename to Data/Sys/GameSettings/G3RF52.ini diff --git a/Data/Sys/GameConfig/G3RP52.ini b/Data/Sys/GameSettings/G3RP52.ini similarity index 100% rename from Data/Sys/GameConfig/G3RP52.ini rename to Data/Sys/GameSettings/G3RP52.ini diff --git a/Data/Sys/GameConfig/G3SE41.ini b/Data/Sys/GameSettings/G3SE41.ini similarity index 100% rename from Data/Sys/GameConfig/G3SE41.ini rename to Data/Sys/GameSettings/G3SE41.ini diff --git a/Data/Sys/GameConfig/G3VE69.ini b/Data/Sys/GameSettings/G3VE69.ini similarity index 100% rename from Data/Sys/GameConfig/G3VE69.ini rename to Data/Sys/GameSettings/G3VE69.ini diff --git a/Data/Sys/GameConfig/G3XE52.ini b/Data/Sys/GameSettings/G3XE52.ini similarity index 100% rename from Data/Sys/GameConfig/G3XE52.ini rename to Data/Sys/GameSettings/G3XE52.ini diff --git a/Data/Sys/GameConfig/G3XP52.ini b/Data/Sys/GameSettings/G3XP52.ini similarity index 100% rename from Data/Sys/GameConfig/G3XP52.ini rename to Data/Sys/GameSettings/G3XP52.ini diff --git a/Data/Sys/GameConfig/G4AEE9.ini b/Data/Sys/GameSettings/G4AEE9.ini similarity index 100% rename from Data/Sys/GameConfig/G4AEE9.ini rename to Data/Sys/GameSettings/G4AEE9.ini diff --git a/Data/Sys/GameConfig/G4BE08.ini b/Data/Sys/GameSettings/G4BE08.ini similarity index 100% rename from Data/Sys/GameConfig/G4BE08.ini rename to Data/Sys/GameSettings/G4BE08.ini diff --git a/Data/Sys/GameConfig/G4BP08.ini b/Data/Sys/GameSettings/G4BP08.ini similarity index 100% rename from Data/Sys/GameConfig/G4BP08.ini rename to Data/Sys/GameSettings/G4BP08.ini diff --git a/Data/Sys/GameConfig/G4CE54.ini b/Data/Sys/GameSettings/G4CE54.ini similarity index 100% rename from Data/Sys/GameConfig/G4CE54.ini rename to Data/Sys/GameSettings/G4CE54.ini diff --git a/Data/Sys/GameConfig/G4FD69.ini b/Data/Sys/GameSettings/G4FD69.ini similarity index 100% rename from Data/Sys/GameConfig/G4FD69.ini rename to Data/Sys/GameSettings/G4FD69.ini diff --git a/Data/Sys/GameConfig/G4FE69.ini b/Data/Sys/GameSettings/G4FE69.ini similarity index 100% rename from Data/Sys/GameConfig/G4FE69.ini rename to Data/Sys/GameSettings/G4FE69.ini diff --git a/Data/Sys/GameConfig/G4FF69.ini b/Data/Sys/GameSettings/G4FF69.ini similarity index 100% rename from Data/Sys/GameConfig/G4FF69.ini rename to Data/Sys/GameSettings/G4FF69.ini diff --git a/Data/Sys/GameConfig/G4FP69.ini b/Data/Sys/GameSettings/G4FP69.ini similarity index 100% rename from Data/Sys/GameConfig/G4FP69.ini rename to Data/Sys/GameSettings/G4FP69.ini diff --git a/Data/Sys/GameConfig/G4GEE9.ini b/Data/Sys/GameSettings/G4GEE9.ini similarity index 100% rename from Data/Sys/GameConfig/G4GEE9.ini rename to Data/Sys/GameSettings/G4GEE9.ini diff --git a/Data/Sys/GameConfig/G4ME69.ini b/Data/Sys/GameSettings/G4ME69.ini similarity index 100% rename from Data/Sys/GameConfig/G4ME69.ini rename to Data/Sys/GameSettings/G4ME69.ini diff --git a/Data/Sys/GameConfig/G4MP69.ini b/Data/Sys/GameSettings/G4MP69.ini similarity index 100% rename from Data/Sys/GameConfig/G4MP69.ini rename to Data/Sys/GameSettings/G4MP69.ini diff --git a/Data/Sys/GameConfig/G4NJDA.ini b/Data/Sys/GameSettings/G4NJDA.ini similarity index 100% rename from Data/Sys/GameConfig/G4NJDA.ini rename to Data/Sys/GameSettings/G4NJDA.ini diff --git a/Data/Sys/GameConfig/G4QE01.ini b/Data/Sys/GameSettings/G4QE01.ini similarity index 100% rename from Data/Sys/GameConfig/G4QE01.ini rename to Data/Sys/GameSettings/G4QE01.ini diff --git a/Data/Sys/GameConfig/G4QP01.ini b/Data/Sys/GameSettings/G4QP01.ini similarity index 100% rename from Data/Sys/GameConfig/G4QP01.ini rename to Data/Sys/GameSettings/G4QP01.ini diff --git a/Data/Sys/GameConfig/G4SE01.ini b/Data/Sys/GameSettings/G4SE01.ini similarity index 100% rename from Data/Sys/GameConfig/G4SE01.ini rename to Data/Sys/GameSettings/G4SE01.ini diff --git a/Data/Sys/GameConfig/G4SP01.ini b/Data/Sys/GameSettings/G4SP01.ini similarity index 100% rename from Data/Sys/GameConfig/G4SP01.ini rename to Data/Sys/GameSettings/G4SP01.ini diff --git a/Data/Sys/GameConfig/G4ZE69.ini b/Data/Sys/GameSettings/G4ZE69.ini similarity index 100% rename from Data/Sys/GameConfig/G4ZE69.ini rename to Data/Sys/GameSettings/G4ZE69.ini diff --git a/Data/Sys/GameConfig/G5DE78.ini b/Data/Sys/GameSettings/G5DE78.ini similarity index 100% rename from Data/Sys/GameConfig/G5DE78.ini rename to Data/Sys/GameSettings/G5DE78.ini diff --git a/Data/Sys/GameConfig/G5DP78.ini b/Data/Sys/GameSettings/G5DP78.ini similarity index 100% rename from Data/Sys/GameConfig/G5DP78.ini rename to Data/Sys/GameSettings/G5DP78.ini diff --git a/Data/Sys/GameConfig/G5SE7D.ini b/Data/Sys/GameSettings/G5SE7D.ini similarity index 100% rename from Data/Sys/GameConfig/G5SE7D.ini rename to Data/Sys/GameSettings/G5SE7D.ini diff --git a/Data/Sys/GameConfig/G5SP7D.ini b/Data/Sys/GameSettings/G5SP7D.ini similarity index 100% rename from Data/Sys/GameConfig/G5SP7D.ini rename to Data/Sys/GameSettings/G5SP7D.ini diff --git a/Data/Sys/GameConfig/G63E41.ini b/Data/Sys/GameSettings/G63E41.ini similarity index 100% rename from Data/Sys/GameConfig/G63E41.ini rename to Data/Sys/GameSettings/G63E41.ini diff --git a/Data/Sys/GameConfig/G63P41.ini b/Data/Sys/GameSettings/G63P41.ini similarity index 100% rename from Data/Sys/GameConfig/G63P41.ini rename to Data/Sys/GameSettings/G63P41.ini diff --git a/Data/Sys/GameConfig/G6FE69.ini b/Data/Sys/GameSettings/G6FE69.ini similarity index 100% rename from Data/Sys/GameConfig/G6FE69.ini rename to Data/Sys/GameSettings/G6FE69.ini diff --git a/Data/Sys/GameConfig/G6NE69.ini b/Data/Sys/GameSettings/G6NE69.ini similarity index 100% rename from Data/Sys/GameConfig/G6NE69.ini rename to Data/Sys/GameSettings/G6NE69.ini diff --git a/Data/Sys/GameConfig/G6NP69.ini b/Data/Sys/GameSettings/G6NP69.ini similarity index 100% rename from Data/Sys/GameConfig/G6NP69.ini rename to Data/Sys/GameSettings/G6NP69.ini diff --git a/Data/Sys/GameConfig/G6QE08.ini b/Data/Sys/GameSettings/G6QE08.ini similarity index 100% rename from Data/Sys/GameConfig/G6QE08.ini rename to Data/Sys/GameSettings/G6QE08.ini diff --git a/Data/Sys/GameConfig/G6TE5G.ini b/Data/Sys/GameSettings/G6TE5G.ini similarity index 100% rename from Data/Sys/GameConfig/G6TE5G.ini rename to Data/Sys/GameSettings/G6TE5G.ini diff --git a/Data/Sys/GameConfig/G6TP5G.ini b/Data/Sys/GameSettings/G6TP5G.ini similarity index 100% rename from Data/Sys/GameConfig/G6TP5G.ini rename to Data/Sys/GameSettings/G6TP5G.ini diff --git a/Data/Sys/GameConfig/G89EAF.ini b/Data/Sys/GameSettings/G89EAF.ini similarity index 100% rename from Data/Sys/GameConfig/G89EAF.ini rename to Data/Sys/GameSettings/G89EAF.ini diff --git a/Data/Sys/GameConfig/G8FE8P.ini b/Data/Sys/GameSettings/G8FE8P.ini similarity index 100% rename from Data/Sys/GameConfig/G8FE8P.ini rename to Data/Sys/GameSettings/G8FE8P.ini diff --git a/Data/Sys/GameConfig/G8ME01.ini b/Data/Sys/GameSettings/G8ME01.ini similarity index 100% rename from Data/Sys/GameConfig/G8ME01.ini rename to Data/Sys/GameSettings/G8ME01.ini diff --git a/Data/Sys/GameConfig/G8MJ01.ini b/Data/Sys/GameSettings/G8MJ01.ini similarity index 100% rename from Data/Sys/GameConfig/G8MJ01.ini rename to Data/Sys/GameSettings/G8MJ01.ini diff --git a/Data/Sys/GameConfig/G8MP01.ini b/Data/Sys/GameSettings/G8MP01.ini similarity index 100% rename from Data/Sys/GameConfig/G8MP01.ini rename to Data/Sys/GameSettings/G8MP01.ini diff --git a/Data/Sys/GameConfig/G8OJ18.ini b/Data/Sys/GameSettings/G8OJ18.ini similarity index 100% rename from Data/Sys/GameConfig/G8OJ18.ini rename to Data/Sys/GameSettings/G8OJ18.ini diff --git a/Data/Sys/GameConfig/G8SJAF.ini b/Data/Sys/GameSettings/G8SJAF.ini similarity index 100% rename from Data/Sys/GameConfig/G8SJAF.ini rename to Data/Sys/GameSettings/G8SJAF.ini diff --git a/Data/Sys/GameConfig/G8WE01.ini b/Data/Sys/GameSettings/G8WE01.ini similarity index 100% rename from Data/Sys/GameConfig/G8WE01.ini rename to Data/Sys/GameSettings/G8WE01.ini diff --git a/Data/Sys/GameConfig/G8WP01.ini b/Data/Sys/GameSettings/G8WP01.ini similarity index 100% rename from Data/Sys/GameConfig/G8WP01.ini rename to Data/Sys/GameSettings/G8WP01.ini diff --git a/Data/Sys/GameConfig/G9BEE9.ini b/Data/Sys/GameSettings/G9BEE9.ini similarity index 100% rename from Data/Sys/GameConfig/G9BEE9.ini rename to Data/Sys/GameSettings/G9BEE9.ini diff --git a/Data/Sys/GameConfig/G9RE7D.ini b/Data/Sys/GameSettings/G9RE7D.ini similarity index 100% rename from Data/Sys/GameConfig/G9RE7D.ini rename to Data/Sys/GameSettings/G9RE7D.ini diff --git a/Data/Sys/GameConfig/G9SE8P.ini b/Data/Sys/GameSettings/G9SE8P.ini similarity index 100% rename from Data/Sys/GameConfig/G9SE8P.ini rename to Data/Sys/GameSettings/G9SE8P.ini diff --git a/Data/Sys/GameConfig/G9SJ8P.ini b/Data/Sys/GameSettings/G9SJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/G9SJ8P.ini rename to Data/Sys/GameSettings/G9SJ8P.ini diff --git a/Data/Sys/GameConfig/G9SP8P.ini b/Data/Sys/GameSettings/G9SP8P.ini similarity index 100% rename from Data/Sys/GameConfig/G9SP8P.ini rename to Data/Sys/GameSettings/G9SP8P.ini diff --git a/Data/Sys/GameConfig/G9TD52.ini b/Data/Sys/GameSettings/G9TD52.ini similarity index 100% rename from Data/Sys/GameConfig/G9TD52.ini rename to Data/Sys/GameSettings/G9TD52.ini diff --git a/Data/Sys/GameConfig/G9TE52.ini b/Data/Sys/GameSettings/G9TE52.ini similarity index 100% rename from Data/Sys/GameConfig/G9TE52.ini rename to Data/Sys/GameSettings/G9TE52.ini diff --git a/Data/Sys/GameConfig/G9TF52.ini b/Data/Sys/GameSettings/G9TF52.ini similarity index 100% rename from Data/Sys/GameConfig/G9TF52.ini rename to Data/Sys/GameSettings/G9TF52.ini diff --git a/Data/Sys/GameConfig/G9TI52.ini b/Data/Sys/GameSettings/G9TI52.ini similarity index 100% rename from Data/Sys/GameConfig/G9TI52.ini rename to Data/Sys/GameSettings/G9TI52.ini diff --git a/Data/Sys/GameConfig/G9TP52.ini b/Data/Sys/GameSettings/G9TP52.ini similarity index 100% rename from Data/Sys/GameConfig/G9TP52.ini rename to Data/Sys/GameSettings/G9TP52.ini diff --git a/Data/Sys/GameConfig/GA2E51.ini b/Data/Sys/GameSettings/GA2E51.ini similarity index 100% rename from Data/Sys/GameConfig/GA2E51.ini rename to Data/Sys/GameSettings/GA2E51.ini diff --git a/Data/Sys/GameConfig/GA3E51.ini b/Data/Sys/GameSettings/GA3E51.ini similarity index 100% rename from Data/Sys/GameConfig/GA3E51.ini rename to Data/Sys/GameSettings/GA3E51.ini diff --git a/Data/Sys/GameConfig/GA4E51.ini b/Data/Sys/GameSettings/GA4E51.ini similarity index 100% rename from Data/Sys/GameConfig/GA4E51.ini rename to Data/Sys/GameSettings/GA4E51.ini diff --git a/Data/Sys/GameConfig/GA7E70.ini b/Data/Sys/GameSettings/GA7E70.ini similarity index 100% rename from Data/Sys/GameConfig/GA7E70.ini rename to Data/Sys/GameSettings/GA7E70.ini diff --git a/Data/Sys/GameConfig/GABEAF.ini b/Data/Sys/GameSettings/GABEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GABEAF.ini rename to Data/Sys/GameSettings/GABEAF.ini diff --git a/Data/Sys/GameConfig/GACE5H.ini b/Data/Sys/GameSettings/GACE5H.ini similarity index 100% rename from Data/Sys/GameConfig/GACE5H.ini rename to Data/Sys/GameSettings/GACE5H.ini diff --git a/Data/Sys/GameConfig/GAFE01.ini b/Data/Sys/GameSettings/GAFE01.ini similarity index 100% rename from Data/Sys/GameConfig/GAFE01.ini rename to Data/Sys/GameSettings/GAFE01.ini diff --git a/Data/Sys/GameConfig/GAFJ01.ini b/Data/Sys/GameSettings/GAFJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GAFJ01.ini rename to Data/Sys/GameSettings/GAFJ01.ini diff --git a/Data/Sys/GameConfig/GAFP01.ini b/Data/Sys/GameSettings/GAFP01.ini similarity index 100% rename from Data/Sys/GameConfig/GAFP01.ini rename to Data/Sys/GameSettings/GAFP01.ini diff --git a/Data/Sys/GameConfig/GAFU01.ini b/Data/Sys/GameSettings/GAFU01.ini similarity index 100% rename from Data/Sys/GameConfig/GAFU01.ini rename to Data/Sys/GameSettings/GAFU01.ini diff --git a/Data/Sys/GameConfig/GAGP70.ini b/Data/Sys/GameSettings/GAGP70.ini similarity index 100% rename from Data/Sys/GameConfig/GAGP70.ini rename to Data/Sys/GameSettings/GAGP70.ini diff --git a/Data/Sys/GameConfig/GAHEGG.ini b/Data/Sys/GameSettings/GAHEGG.ini similarity index 100% rename from Data/Sys/GameConfig/GAHEGG.ini rename to Data/Sys/GameSettings/GAHEGG.ini diff --git a/Data/Sys/GameConfig/GALE01.ini b/Data/Sys/GameSettings/GALE01.ini similarity index 100% rename from Data/Sys/GameConfig/GALE01.ini rename to Data/Sys/GameSettings/GALE01.ini diff --git a/Data/Sys/GameConfig/GALJ01.ini b/Data/Sys/GameSettings/GALJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GALJ01.ini rename to Data/Sys/GameSettings/GALJ01.ini diff --git a/Data/Sys/GameConfig/GALP01.ini b/Data/Sys/GameSettings/GALP01.ini similarity index 100% rename from Data/Sys/GameConfig/GALP01.ini rename to Data/Sys/GameSettings/GALP01.ini diff --git a/Data/Sys/GameConfig/GAME5H.ini b/Data/Sys/GameSettings/GAME5H.ini similarity index 100% rename from Data/Sys/GameConfig/GAME5H.ini rename to Data/Sys/GameSettings/GAME5H.ini diff --git a/Data/Sys/GameConfig/GANE7U.ini b/Data/Sys/GameSettings/GANE7U.ini similarity index 100% rename from Data/Sys/GameConfig/GANE7U.ini rename to Data/Sys/GameSettings/GANE7U.ini diff --git a/Data/Sys/GameConfig/GAPE52.ini b/Data/Sys/GameSettings/GAPE52.ini similarity index 100% rename from Data/Sys/GameConfig/GAPE52.ini rename to Data/Sys/GameSettings/GAPE52.ini diff --git a/Data/Sys/GameConfig/GAQE6S.ini b/Data/Sys/GameSettings/GAQE6S.ini similarity index 100% rename from Data/Sys/GameConfig/GAQE6S.ini rename to Data/Sys/GameSettings/GAQE6S.ini diff --git a/Data/Sys/GameConfig/GARE5H.ini b/Data/Sys/GameSettings/GARE5H.ini similarity index 100% rename from Data/Sys/GameConfig/GARE5H.ini rename to Data/Sys/GameSettings/GARE5H.ini diff --git a/Data/Sys/GameConfig/GATE51.ini b/Data/Sys/GameSettings/GATE51.ini similarity index 100% rename from Data/Sys/GameConfig/GATE51.ini rename to Data/Sys/GameSettings/GATE51.ini diff --git a/Data/Sys/GameConfig/GATP51.ini b/Data/Sys/GameSettings/GATP51.ini similarity index 100% rename from Data/Sys/GameConfig/GATP51.ini rename to Data/Sys/GameSettings/GATP51.ini diff --git a/Data/Sys/GameConfig/GAUE08.ini b/Data/Sys/GameSettings/GAUE08.ini similarity index 100% rename from Data/Sys/GameConfig/GAUE08.ini rename to Data/Sys/GameSettings/GAUE08.ini diff --git a/Data/Sys/GameConfig/GAUJ08.ini b/Data/Sys/GameSettings/GAUJ08.ini similarity index 100% rename from Data/Sys/GameConfig/GAUJ08.ini rename to Data/Sys/GameSettings/GAUJ08.ini diff --git a/Data/Sys/GameConfig/GAVE78.ini b/Data/Sys/GameSettings/GAVE78.ini similarity index 100% rename from Data/Sys/GameConfig/GAVE78.ini rename to Data/Sys/GameSettings/GAVE78.ini diff --git a/Data/Sys/GameConfig/GAVP78.ini b/Data/Sys/GameSettings/GAVP78.ini similarity index 100% rename from Data/Sys/GameConfig/GAVP78.ini rename to Data/Sys/GameSettings/GAVP78.ini diff --git a/Data/Sys/GameConfig/GAVY78.ini b/Data/Sys/GameSettings/GAVY78.ini similarity index 100% rename from Data/Sys/GameConfig/GAVY78.ini rename to Data/Sys/GameSettings/GAVY78.ini diff --git a/Data/Sys/GameConfig/GAXE5D.ini b/Data/Sys/GameSettings/GAXE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GAXE5D.ini rename to Data/Sys/GameSettings/GAXE5D.ini diff --git a/Data/Sys/GameConfig/GAZD69.ini b/Data/Sys/GameSettings/GAZD69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZD69.ini rename to Data/Sys/GameSettings/GAZD69.ini diff --git a/Data/Sys/GameConfig/GAZE69.ini b/Data/Sys/GameSettings/GAZE69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZE69.ini rename to Data/Sys/GameSettings/GAZE69.ini diff --git a/Data/Sys/GameConfig/GAZF69.ini b/Data/Sys/GameSettings/GAZF69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZF69.ini rename to Data/Sys/GameSettings/GAZF69.ini diff --git a/Data/Sys/GameConfig/GAZH69.ini b/Data/Sys/GameSettings/GAZH69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZH69.ini rename to Data/Sys/GameSettings/GAZH69.ini diff --git a/Data/Sys/GameConfig/GAZI69.ini b/Data/Sys/GameSettings/GAZI69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZI69.ini rename to Data/Sys/GameSettings/GAZI69.ini diff --git a/Data/Sys/GameConfig/GAZJ69.ini b/Data/Sys/GameSettings/GAZJ69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZJ69.ini rename to Data/Sys/GameSettings/GAZJ69.ini diff --git a/Data/Sys/GameConfig/GAZM69.ini b/Data/Sys/GameSettings/GAZM69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZM69.ini rename to Data/Sys/GameSettings/GAZM69.ini diff --git a/Data/Sys/GameConfig/GAZP69.ini b/Data/Sys/GameSettings/GAZP69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZP69.ini rename to Data/Sys/GameSettings/GAZP69.ini diff --git a/Data/Sys/GameConfig/GAZS69.ini b/Data/Sys/GameSettings/GAZS69.ini similarity index 100% rename from Data/Sys/GameConfig/GAZS69.ini rename to Data/Sys/GameSettings/GAZS69.ini diff --git a/Data/Sys/GameConfig/GB3E51.ini b/Data/Sys/GameSettings/GB3E51.ini similarity index 100% rename from Data/Sys/GameConfig/GB3E51.ini rename to Data/Sys/GameSettings/GB3E51.ini diff --git a/Data/Sys/GameConfig/GB4E51.ini b/Data/Sys/GameSettings/GB4E51.ini similarity index 100% rename from Data/Sys/GameConfig/GB4E51.ini rename to Data/Sys/GameSettings/GB4E51.ini diff --git a/Data/Sys/GameConfig/GB4P51.ini b/Data/Sys/GameSettings/GB4P51.ini similarity index 100% rename from Data/Sys/GameConfig/GB4P51.ini rename to Data/Sys/GameSettings/GB4P51.ini diff --git a/Data/Sys/GameConfig/GBDE5G.ini b/Data/Sys/GameSettings/GBDE5G.ini similarity index 100% rename from Data/Sys/GameConfig/GBDE5G.ini rename to Data/Sys/GameSettings/GBDE5G.ini diff --git a/Data/Sys/GameConfig/GBDS7D.ini b/Data/Sys/GameSettings/GBDS7D.ini similarity index 100% rename from Data/Sys/GameConfig/GBDS7D.ini rename to Data/Sys/GameSettings/GBDS7D.ini diff --git a/Data/Sys/GameConfig/GBFE70.ini b/Data/Sys/GameSettings/GBFE70.ini similarity index 100% rename from Data/Sys/GameConfig/GBFE70.ini rename to Data/Sys/GameSettings/GBFE70.ini diff --git a/Data/Sys/GameConfig/GBGE5G.ini b/Data/Sys/GameSettings/GBGE5G.ini similarity index 100% rename from Data/Sys/GameConfig/GBGE5G.ini rename to Data/Sys/GameSettings/GBGE5G.ini diff --git a/Data/Sys/GameConfig/GBGP7D.ini b/Data/Sys/GameSettings/GBGP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GBGP7D.ini rename to Data/Sys/GameSettings/GBGP7D.ini diff --git a/Data/Sys/GameConfig/GBHDC8.ini b/Data/Sys/GameSettings/GBHDC8.ini similarity index 100% rename from Data/Sys/GameConfig/GBHDC8.ini rename to Data/Sys/GameSettings/GBHDC8.ini diff --git a/Data/Sys/GameConfig/GBHEC8.ini b/Data/Sys/GameSettings/GBHEC8.ini similarity index 100% rename from Data/Sys/GameConfig/GBHEC8.ini rename to Data/Sys/GameSettings/GBHEC8.ini diff --git a/Data/Sys/GameConfig/GBHFC8.ini b/Data/Sys/GameSettings/GBHFC8.ini similarity index 100% rename from Data/Sys/GameConfig/GBHFC8.ini rename to Data/Sys/GameSettings/GBHFC8.ini diff --git a/Data/Sys/GameConfig/GBHPC8.ini b/Data/Sys/GameSettings/GBHPC8.ini similarity index 100% rename from Data/Sys/GameConfig/GBHPC8.ini rename to Data/Sys/GameSettings/GBHPC8.ini diff --git a/Data/Sys/GameConfig/GBIE08.ini b/Data/Sys/GameSettings/GBIE08.ini similarity index 100% rename from Data/Sys/GameConfig/GBIE08.ini rename to Data/Sys/GameSettings/GBIE08.ini diff --git a/Data/Sys/GameConfig/GBIP08.ini b/Data/Sys/GameSettings/GBIP08.ini similarity index 100% rename from Data/Sys/GameConfig/GBIP08.ini rename to Data/Sys/GameSettings/GBIP08.ini diff --git a/Data/Sys/GameConfig/GBKE70.ini b/Data/Sys/GameSettings/GBKE70.ini similarity index 100% rename from Data/Sys/GameConfig/GBKE70.ini rename to Data/Sys/GameSettings/GBKE70.ini diff --git a/Data/Sys/GameConfig/GBLE52.ini b/Data/Sys/GameSettings/GBLE52.ini similarity index 100% rename from Data/Sys/GameConfig/GBLE52.ini rename to Data/Sys/GameSettings/GBLE52.ini diff --git a/Data/Sys/GameConfig/GBLP52.ini b/Data/Sys/GameSettings/GBLP52.ini similarity index 100% rename from Data/Sys/GameConfig/GBLP52.ini rename to Data/Sys/GameSettings/GBLP52.ini diff --git a/Data/Sys/GameConfig/GBLPGL.ini b/Data/Sys/GameSettings/GBLPGL.ini similarity index 100% rename from Data/Sys/GameConfig/GBLPGL.ini rename to Data/Sys/GameSettings/GBLPGL.ini diff --git a/Data/Sys/GameConfig/GBME7F.ini b/Data/Sys/GameSettings/GBME7F.ini similarity index 100% rename from Data/Sys/GameConfig/GBME7F.ini rename to Data/Sys/GameSettings/GBME7F.ini diff --git a/Data/Sys/GameConfig/GBMP7F.ini b/Data/Sys/GameSettings/GBMP7F.ini similarity index 100% rename from Data/Sys/GameConfig/GBMP7F.ini rename to Data/Sys/GameSettings/GBMP7F.ini diff --git a/Data/Sys/GameConfig/GBOP51.ini b/Data/Sys/GameSettings/GBOP51.ini similarity index 100% rename from Data/Sys/GameConfig/GBOP51.ini rename to Data/Sys/GameSettings/GBOP51.ini diff --git a/Data/Sys/GameConfig/GBQE78.ini b/Data/Sys/GameSettings/GBQE78.ini similarity index 100% rename from Data/Sys/GameConfig/GBQE78.ini rename to Data/Sys/GameSettings/GBQE78.ini diff --git a/Data/Sys/GameConfig/GBSE8P.ini b/Data/Sys/GameSettings/GBSE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GBSE8P.ini rename to Data/Sys/GameSettings/GBSE8P.ini diff --git a/Data/Sys/GameConfig/GBSP8P.ini b/Data/Sys/GameSettings/GBSP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GBSP8P.ini rename to Data/Sys/GameSettings/GBSP8P.ini diff --git a/Data/Sys/GameConfig/GBTE70.ini b/Data/Sys/GameSettings/GBTE70.ini similarity index 100% rename from Data/Sys/GameConfig/GBTE70.ini rename to Data/Sys/GameSettings/GBTE70.ini diff --git a/Data/Sys/GameConfig/GBVE41.ini b/Data/Sys/GameSettings/GBVE41.ini similarity index 100% rename from Data/Sys/GameConfig/GBVE41.ini rename to Data/Sys/GameSettings/GBVE41.ini diff --git a/Data/Sys/GameConfig/GBVP41.ini b/Data/Sys/GameSettings/GBVP41.ini similarity index 100% rename from Data/Sys/GameConfig/GBVP41.ini rename to Data/Sys/GameSettings/GBVP41.ini diff --git a/Data/Sys/GameConfig/GBWD64.ini b/Data/Sys/GameSettings/GBWD64.ini similarity index 100% rename from Data/Sys/GameConfig/GBWD64.ini rename to Data/Sys/GameSettings/GBWD64.ini diff --git a/Data/Sys/GameConfig/GBWE64.ini b/Data/Sys/GameSettings/GBWE64.ini similarity index 100% rename from Data/Sys/GameConfig/GBWE64.ini rename to Data/Sys/GameSettings/GBWE64.ini diff --git a/Data/Sys/GameConfig/GBWF64.ini b/Data/Sys/GameSettings/GBWF64.ini similarity index 100% rename from Data/Sys/GameConfig/GBWF64.ini rename to Data/Sys/GameSettings/GBWF64.ini diff --git a/Data/Sys/GameConfig/GBWP64.ini b/Data/Sys/GameSettings/GBWP64.ini similarity index 100% rename from Data/Sys/GameConfig/GBWP64.ini rename to Data/Sys/GameSettings/GBWP64.ini diff --git a/Data/Sys/GameConfig/GBXE51.ini b/Data/Sys/GameSettings/GBXE51.ini similarity index 100% rename from Data/Sys/GameConfig/GBXE51.ini rename to Data/Sys/GameSettings/GBXE51.ini diff --git a/Data/Sys/GameConfig/GBYE0A.ini b/Data/Sys/GameSettings/GBYE0A.ini similarity index 100% rename from Data/Sys/GameConfig/GBYE0A.ini rename to Data/Sys/GameSettings/GBYE0A.ini diff --git a/Data/Sys/GameConfig/GBZE08.ini b/Data/Sys/GameSettings/GBZE08.ini similarity index 100% rename from Data/Sys/GameConfig/GBZE08.ini rename to Data/Sys/GameSettings/GBZE08.ini diff --git a/Data/Sys/GameConfig/GBZP08.ini b/Data/Sys/GameSettings/GBZP08.ini similarity index 100% rename from Data/Sys/GameConfig/GBZP08.ini rename to Data/Sys/GameSettings/GBZP08.ini diff --git a/Data/Sys/GameConfig/GC2E9G.ini b/Data/Sys/GameSettings/GC2E9G.ini similarity index 100% rename from Data/Sys/GameConfig/GC2E9G.ini rename to Data/Sys/GameSettings/GC2E9G.ini diff --git a/Data/Sys/GameConfig/GC3D78.ini b/Data/Sys/GameSettings/GC3D78.ini similarity index 100% rename from Data/Sys/GameConfig/GC3D78.ini rename to Data/Sys/GameSettings/GC3D78.ini diff --git a/Data/Sys/GameConfig/GC3E78.ini b/Data/Sys/GameSettings/GC3E78.ini similarity index 100% rename from Data/Sys/GameConfig/GC3E78.ini rename to Data/Sys/GameSettings/GC3E78.ini diff --git a/Data/Sys/GameConfig/GC3F78.ini b/Data/Sys/GameSettings/GC3F78.ini similarity index 100% rename from Data/Sys/GameConfig/GC3F78.ini rename to Data/Sys/GameSettings/GC3F78.ini diff --git a/Data/Sys/GameConfig/GC3P78.ini b/Data/Sys/GameSettings/GC3P78.ini similarity index 100% rename from Data/Sys/GameConfig/GC3P78.ini rename to Data/Sys/GameSettings/GC3P78.ini diff --git a/Data/Sys/GameConfig/GC4JBN.ini b/Data/Sys/GameSettings/GC4JBN.ini similarity index 100% rename from Data/Sys/GameConfig/GC4JBN.ini rename to Data/Sys/GameSettings/GC4JBN.ini diff --git a/Data/Sys/GameConfig/GC5PNK.ini b/Data/Sys/GameSettings/GC5PNK.ini similarity index 100% rename from Data/Sys/GameConfig/GC5PNK.ini rename to Data/Sys/GameSettings/GC5PNK.ini diff --git a/Data/Sys/GameConfig/GC6E01.ini b/Data/Sys/GameSettings/GC6E01.ini similarity index 100% rename from Data/Sys/GameConfig/GC6E01.ini rename to Data/Sys/GameSettings/GC6E01.ini diff --git a/Data/Sys/GameConfig/GC6P01.ini b/Data/Sys/GameSettings/GC6P01.ini similarity index 100% rename from Data/Sys/GameConfig/GC6P01.ini rename to Data/Sys/GameSettings/GC6P01.ini diff --git a/Data/Sys/GameConfig/GC7PNK.ini b/Data/Sys/GameSettings/GC7PNK.ini similarity index 100% rename from Data/Sys/GameConfig/GC7PNK.ini rename to Data/Sys/GameSettings/GC7PNK.ini diff --git a/Data/Sys/GameConfig/GC9P6S.ini b/Data/Sys/GameSettings/GC9P6S.ini similarity index 100% rename from Data/Sys/GameConfig/GC9P6S.ini rename to Data/Sys/GameSettings/GC9P6S.ini diff --git a/Data/Sys/GameConfig/GCAE5H.ini b/Data/Sys/GameSettings/GCAE5H.ini similarity index 100% rename from Data/Sys/GameConfig/GCAE5H.ini rename to Data/Sys/GameSettings/GCAE5H.ini diff --git a/Data/Sys/GameConfig/GCBE7D.ini b/Data/Sys/GameSettings/GCBE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GCBE7D.ini rename to Data/Sys/GameSettings/GCBE7D.ini diff --git a/Data/Sys/GameConfig/GCBP7D.ini b/Data/Sys/GameSettings/GCBP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GCBP7D.ini rename to Data/Sys/GameSettings/GCBP7D.ini diff --git a/Data/Sys/GameConfig/GCCE01.ini b/Data/Sys/GameSettings/GCCE01.ini similarity index 100% rename from Data/Sys/GameConfig/GCCE01.ini rename to Data/Sys/GameSettings/GCCE01.ini diff --git a/Data/Sys/GameConfig/GCCP01.ini b/Data/Sys/GameSettings/GCCP01.ini similarity index 100% rename from Data/Sys/GameConfig/GCCP01.ini rename to Data/Sys/GameSettings/GCCP01.ini diff --git a/Data/Sys/GameConfig/GCDE08.ini b/Data/Sys/GameSettings/GCDE08.ini similarity index 100% rename from Data/Sys/GameConfig/GCDE08.ini rename to Data/Sys/GameSettings/GCDE08.ini diff --git a/Data/Sys/GameConfig/GCDP08.ini b/Data/Sys/GameSettings/GCDP08.ini similarity index 100% rename from Data/Sys/GameConfig/GCDP08.ini rename to Data/Sys/GameSettings/GCDP08.ini diff --git a/Data/Sys/GameConfig/GCEE41.ini b/Data/Sys/GameSettings/GCEE41.ini similarity index 97% rename from Data/Sys/GameConfig/GCEE41.ini rename to Data/Sys/GameSettings/GCEE41.ini index a9e3e13ca3..37e171c52a 100644 --- a/Data/Sys/GameConfig/GCEE41.ini +++ b/Data/Sys/GameSettings/GCEE41.ini @@ -16,4 +16,3 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = True -[Gecko] diff --git a/Data/Sys/GameConfig/GCEP41.ini b/Data/Sys/GameSettings/GCEP41.ini similarity index 97% rename from Data/Sys/GameConfig/GCEP41.ini rename to Data/Sys/GameSettings/GCEP41.ini index 5385275894..e049fe69ba 100644 --- a/Data/Sys/GameConfig/GCEP41.ini +++ b/Data/Sys/GameSettings/GCEP41.ini @@ -16,4 +16,3 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = True -[Gecko] diff --git a/Data/Sys/GameConfig/GCFE9G.ini b/Data/Sys/GameSettings/GCFE9G.ini similarity index 100% rename from Data/Sys/GameConfig/GCFE9G.ini rename to Data/Sys/GameSettings/GCFE9G.ini diff --git a/Data/Sys/GameConfig/GCGE41.ini b/Data/Sys/GameSettings/GCGE41.ini similarity index 100% rename from Data/Sys/GameConfig/GCGE41.ini rename to Data/Sys/GameSettings/GCGE41.ini diff --git a/Data/Sys/GameConfig/GCHE78.ini b/Data/Sys/GameSettings/GCHE78.ini similarity index 100% rename from Data/Sys/GameConfig/GCHE78.ini rename to Data/Sys/GameSettings/GCHE78.ini diff --git a/Data/Sys/GameConfig/GCJE41.ini b/Data/Sys/GameSettings/GCJE41.ini similarity index 100% rename from Data/Sys/GameConfig/GCJE41.ini rename to Data/Sys/GameSettings/GCJE41.ini diff --git a/Data/Sys/GameConfig/GCJP41.ini b/Data/Sys/GameSettings/GCJP41.ini similarity index 100% rename from Data/Sys/GameConfig/GCJP41.ini rename to Data/Sys/GameSettings/GCJP41.ini diff --git a/Data/Sys/GameConfig/GCLP69.ini b/Data/Sys/GameSettings/GCLP69.ini similarity index 100% rename from Data/Sys/GameConfig/GCLP69.ini rename to Data/Sys/GameSettings/GCLP69.ini diff --git a/Data/Sys/GameConfig/GCNE7D.ini b/Data/Sys/GameSettings/GCNE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GCNE7D.ini rename to Data/Sys/GameSettings/GCNE7D.ini diff --git a/Data/Sys/GameConfig/GCNP7D.ini b/Data/Sys/GameSettings/GCNP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GCNP7D.ini rename to Data/Sys/GameSettings/GCNP7D.ini diff --git a/Data/Sys/GameConfig/GCOE52.ini b/Data/Sys/GameSettings/GCOE52.ini similarity index 100% rename from Data/Sys/GameConfig/GCOE52.ini rename to Data/Sys/GameSettings/GCOE52.ini diff --git a/Data/Sys/GameConfig/GCOPDV.ini b/Data/Sys/GameSettings/GCOPDV.ini similarity index 100% rename from Data/Sys/GameConfig/GCOPDV.ini rename to Data/Sys/GameSettings/GCOPDV.ini diff --git a/Data/Sys/GameConfig/GCPE6S.ini b/Data/Sys/GameSettings/GCPE6S.ini similarity index 100% rename from Data/Sys/GameConfig/GCPE6S.ini rename to Data/Sys/GameSettings/GCPE6S.ini diff --git a/Data/Sys/GameConfig/GCPP6S.ini b/Data/Sys/GameSettings/GCPP6S.ini similarity index 100% rename from Data/Sys/GameConfig/GCPP6S.ini rename to Data/Sys/GameSettings/GCPP6S.ini diff --git a/Data/Sys/GameConfig/GCQE7D.ini b/Data/Sys/GameSettings/GCQE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GCQE7D.ini rename to Data/Sys/GameSettings/GCQE7D.ini diff --git a/Data/Sys/GameConfig/GCQP7D.ini b/Data/Sys/GameSettings/GCQP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GCQP7D.ini rename to Data/Sys/GameSettings/GCQP7D.ini diff --git a/Data/Sys/GameConfig/GCSEAF.ini b/Data/Sys/GameSettings/GCSEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GCSEAF.ini rename to Data/Sys/GameSettings/GCSEAF.ini diff --git a/Data/Sys/GameConfig/GCTE51.ini b/Data/Sys/GameSettings/GCTE51.ini similarity index 100% rename from Data/Sys/GameConfig/GCTE51.ini rename to Data/Sys/GameSettings/GCTE51.ini diff --git a/Data/Sys/GameConfig/GCTP51.ini b/Data/Sys/GameSettings/GCTP51.ini similarity index 100% rename from Data/Sys/GameConfig/GCTP51.ini rename to Data/Sys/GameSettings/GCTP51.ini diff --git a/Data/Sys/GameConfig/GCVEEB.ini b/Data/Sys/GameSettings/GCVEEB.ini similarity index 100% rename from Data/Sys/GameConfig/GCVEEB.ini rename to Data/Sys/GameSettings/GCVEEB.ini diff --git a/Data/Sys/GameConfig/GCZE69.ini b/Data/Sys/GameSettings/GCZE69.ini similarity index 100% rename from Data/Sys/GameConfig/GCZE69.ini rename to Data/Sys/GameSettings/GCZE69.ini diff --git a/Data/Sys/GameConfig/GCZP69.ini b/Data/Sys/GameSettings/GCZP69.ini similarity index 100% rename from Data/Sys/GameConfig/GCZP69.ini rename to Data/Sys/GameSettings/GCZP69.ini diff --git a/Data/Sys/GameConfig/GD4E6S.ini b/Data/Sys/GameSettings/GD4E6S.ini similarity index 100% rename from Data/Sys/GameConfig/GD4E6S.ini rename to Data/Sys/GameSettings/GD4E6S.ini diff --git a/Data/Sys/GameConfig/GD6EB2.ini b/Data/Sys/GameSettings/GD6EB2.ini similarity index 100% rename from Data/Sys/GameConfig/GD6EB2.ini rename to Data/Sys/GameSettings/GD6EB2.ini diff --git a/Data/Sys/GameConfig/GD6P70.ini b/Data/Sys/GameSettings/GD6P70.ini similarity index 100% rename from Data/Sys/GameConfig/GD6P70.ini rename to Data/Sys/GameSettings/GD6P70.ini diff --git a/Data/Sys/GameConfig/GD7PB2.ini b/Data/Sys/GameSettings/GD7PB2.ini similarity index 100% rename from Data/Sys/GameConfig/GD7PB2.ini rename to Data/Sys/GameSettings/GD7PB2.ini diff --git a/Data/Sys/GameConfig/GD9E69.ini b/Data/Sys/GameSettings/GD9E69.ini similarity index 100% rename from Data/Sys/GameConfig/GD9E69.ini rename to Data/Sys/GameSettings/GD9E69.ini diff --git a/Data/Sys/GameConfig/GD9P69.ini b/Data/Sys/GameSettings/GD9P69.ini similarity index 100% rename from Data/Sys/GameConfig/GD9P69.ini rename to Data/Sys/GameSettings/GD9P69.ini diff --git a/Data/Sys/GameConfig/GDDE41.ini b/Data/Sys/GameSettings/GDDE41.ini similarity index 100% rename from Data/Sys/GameConfig/GDDE41.ini rename to Data/Sys/GameSettings/GDDE41.ini diff --git a/Data/Sys/GameConfig/GDEE71.ini b/Data/Sys/GameSettings/GDEE71.ini similarity index 100% rename from Data/Sys/GameConfig/GDEE71.ini rename to Data/Sys/GameSettings/GDEE71.ini diff --git a/Data/Sys/GameConfig/GDFE5D.ini b/Data/Sys/GameSettings/GDFE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GDFE5D.ini rename to Data/Sys/GameSettings/GDFE5D.ini diff --git a/Data/Sys/GameConfig/GDFP5D.ini b/Data/Sys/GameSettings/GDFP5D.ini similarity index 100% rename from Data/Sys/GameConfig/GDFP5D.ini rename to Data/Sys/GameSettings/GDFP5D.ini diff --git a/Data/Sys/GameConfig/GDGE7H.ini b/Data/Sys/GameSettings/GDGE7H.ini similarity index 100% rename from Data/Sys/GameConfig/GDGE7H.ini rename to Data/Sys/GameSettings/GDGE7H.ini diff --git a/Data/Sys/GameConfig/GDGP78.ini b/Data/Sys/GameSettings/GDGP78.ini similarity index 100% rename from Data/Sys/GameConfig/GDGP78.ini rename to Data/Sys/GameSettings/GDGP78.ini diff --git a/Data/Sys/GameConfig/GDIE7D.ini b/Data/Sys/GameSettings/GDIE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GDIE7D.ini rename to Data/Sys/GameSettings/GDIE7D.ini diff --git a/Data/Sys/GameConfig/GDIP7D.ini b/Data/Sys/GameSettings/GDIP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GDIP7D.ini rename to Data/Sys/GameSettings/GDIP7D.ini diff --git a/Data/Sys/GameConfig/GDJEB2.ini b/Data/Sys/GameSettings/GDJEB2.ini similarity index 100% rename from Data/Sys/GameConfig/GDJEB2.ini rename to Data/Sys/GameSettings/GDJEB2.ini diff --git a/Data/Sys/GameConfig/GDKEA4.ini b/Data/Sys/GameSettings/GDKEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GDKEA4.ini rename to Data/Sys/GameSettings/GDKEA4.ini diff --git a/Data/Sys/GameConfig/GDLEA4.ini b/Data/Sys/GameSettings/GDLEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GDLEA4.ini rename to Data/Sys/GameSettings/GDLEA4.ini diff --git a/Data/Sys/GameConfig/GDME01.ini b/Data/Sys/GameSettings/GDME01.ini similarity index 100% rename from Data/Sys/GameConfig/GDME01.ini rename to Data/Sys/GameSettings/GDME01.ini diff --git a/Data/Sys/GameConfig/GDQP6S.ini b/Data/Sys/GameSettings/GDQP6S.ini similarity index 100% rename from Data/Sys/GameConfig/GDQP6S.ini rename to Data/Sys/GameSettings/GDQP6S.ini diff --git a/Data/Sys/GameConfig/GDREAF.ini b/Data/Sys/GameSettings/GDREAF.ini similarity index 100% rename from Data/Sys/GameConfig/GDREAF.ini rename to Data/Sys/GameSettings/GDREAF.ini diff --git a/Data/Sys/GameConfig/GDSE78.ini b/Data/Sys/GameSettings/GDSE78.ini similarity index 100% rename from Data/Sys/GameConfig/GDSE78.ini rename to Data/Sys/GameSettings/GDSE78.ini diff --git a/Data/Sys/GameConfig/GDSP78.ini b/Data/Sys/GameSettings/GDSP78.ini similarity index 100% rename from Data/Sys/GameConfig/GDSP78.ini rename to Data/Sys/GameSettings/GDSP78.ini diff --git a/Data/Sys/GameConfig/GDTE69.ini b/Data/Sys/GameSettings/GDTE69.ini similarity index 100% rename from Data/Sys/GameConfig/GDTE69.ini rename to Data/Sys/GameSettings/GDTE69.ini diff --git a/Data/Sys/GameConfig/GDVE6L.ini b/Data/Sys/GameSettings/GDVE6L.ini similarity index 100% rename from Data/Sys/GameConfig/GDVE6L.ini rename to Data/Sys/GameSettings/GDVE6L.ini diff --git a/Data/Sys/GameConfig/GDVP6L.ini b/Data/Sys/GameSettings/GDVP6L.ini similarity index 100% rename from Data/Sys/GameConfig/GDVP6L.ini rename to Data/Sys/GameSettings/GDVP6L.ini diff --git a/Data/Sys/GameConfig/GDWEA4.ini b/Data/Sys/GameSettings/GDWEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GDWEA4.ini rename to Data/Sys/GameSettings/GDWEA4.ini diff --git a/Data/Sys/GameConfig/GE4E7D.ini b/Data/Sys/GameSettings/GE4E7D.ini similarity index 100% rename from Data/Sys/GameConfig/GE4E7D.ini rename to Data/Sys/GameSettings/GE4E7D.ini diff --git a/Data/Sys/GameConfig/GE5EA4.ini b/Data/Sys/GameSettings/GE5EA4.ini similarity index 100% rename from Data/Sys/GameConfig/GE5EA4.ini rename to Data/Sys/GameSettings/GE5EA4.ini diff --git a/Data/Sys/GameConfig/GE9E5D.ini b/Data/Sys/GameSettings/GE9E5D.ini similarity index 100% rename from Data/Sys/GameConfig/GE9E5D.ini rename to Data/Sys/GameSettings/GE9E5D.ini diff --git a/Data/Sys/GameConfig/GEAE8P.ini b/Data/Sys/GameSettings/GEAE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GEAE8P.ini rename to Data/Sys/GameSettings/GEAE8P.ini diff --git a/Data/Sys/GameConfig/GEAP8P.ini b/Data/Sys/GameSettings/GEAP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GEAP8P.ini rename to Data/Sys/GameSettings/GEAP8P.ini diff --git a/Data/Sys/GameConfig/GEBEA4.ini b/Data/Sys/GameSettings/GEBEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GEBEA4.ini rename to Data/Sys/GameSettings/GEBEA4.ini diff --git a/Data/Sys/GameConfig/GEDE01.ini b/Data/Sys/GameSettings/GEDE01.ini similarity index 100% rename from Data/Sys/GameConfig/GEDE01.ini rename to Data/Sys/GameSettings/GEDE01.ini diff --git a/Data/Sys/GameConfig/GEDP01.ini b/Data/Sys/GameSettings/GEDP01.ini similarity index 100% rename from Data/Sys/GameConfig/GEDP01.ini rename to Data/Sys/GameSettings/GEDP01.ini diff --git a/Data/Sys/GameConfig/GEME7F.ini b/Data/Sys/GameSettings/GEME7F.ini similarity index 100% rename from Data/Sys/GameConfig/GEME7F.ini rename to Data/Sys/GameSettings/GEME7F.ini diff --git a/Data/Sys/GameConfig/GEND69.ini b/Data/Sys/GameSettings/GEND69.ini similarity index 100% rename from Data/Sys/GameConfig/GEND69.ini rename to Data/Sys/GameSettings/GEND69.ini diff --git a/Data/Sys/GameConfig/GENE69.ini b/Data/Sys/GameSettings/GENE69.ini similarity index 100% rename from Data/Sys/GameConfig/GENE69.ini rename to Data/Sys/GameSettings/GENE69.ini diff --git a/Data/Sys/GameConfig/GENP69.ini b/Data/Sys/GameSettings/GENP69.ini similarity index 100% rename from Data/Sys/GameConfig/GENP69.ini rename to Data/Sys/GameSettings/GENP69.ini diff --git a/Data/Sys/GameConfig/GENS69.ini b/Data/Sys/GameSettings/GENS69.ini similarity index 100% rename from Data/Sys/GameConfig/GENS69.ini rename to Data/Sys/GameSettings/GENS69.ini diff --git a/Data/Sys/GameConfig/GEOE08.ini b/Data/Sys/GameSettings/GEOE08.ini similarity index 100% rename from Data/Sys/GameConfig/GEOE08.ini rename to Data/Sys/GameSettings/GEOE08.ini diff --git a/Data/Sys/GameConfig/GEOP08.ini b/Data/Sys/GameSettings/GEOP08.ini similarity index 100% rename from Data/Sys/GameConfig/GEOP08.ini rename to Data/Sys/GameSettings/GEOP08.ini diff --git a/Data/Sys/GameConfig/GESEA4.ini b/Data/Sys/GameSettings/GESEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GESEA4.ini rename to Data/Sys/GameSettings/GESEA4.ini diff --git a/Data/Sys/GameConfig/GEWE41.ini b/Data/Sys/GameSettings/GEWE41.ini similarity index 100% rename from Data/Sys/GameConfig/GEWE41.ini rename to Data/Sys/GameSettings/GEWE41.ini diff --git a/Data/Sys/GameConfig/GEXE52.ini b/Data/Sys/GameSettings/GEXE52.ini similarity index 100% rename from Data/Sys/GameConfig/GEXE52.ini rename to Data/Sys/GameSettings/GEXE52.ini diff --git a/Data/Sys/GameConfig/GEYE69.ini b/Data/Sys/GameSettings/GEYE69.ini similarity index 100% rename from Data/Sys/GameConfig/GEYE69.ini rename to Data/Sys/GameSettings/GEYE69.ini diff --git a/Data/Sys/GameConfig/GEZE8P.ini b/Data/Sys/GameSettings/GEZE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GEZE8P.ini rename to Data/Sys/GameSettings/GEZE8P.ini diff --git a/Data/Sys/GameConfig/GEZP8P.ini b/Data/Sys/GameSettings/GEZP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GEZP8P.ini rename to Data/Sys/GameSettings/GEZP8P.ini diff --git a/Data/Sys/GameConfig/GF2E69.ini b/Data/Sys/GameSettings/GF2E69.ini similarity index 100% rename from Data/Sys/GameConfig/GF2E69.ini rename to Data/Sys/GameSettings/GF2E69.ini diff --git a/Data/Sys/GameConfig/GF4E52.ini b/Data/Sys/GameSettings/GF4E52.ini similarity index 100% rename from Data/Sys/GameConfig/GF4E52.ini rename to Data/Sys/GameSettings/GF4E52.ini diff --git a/Data/Sys/GameConfig/GF4F52.ini b/Data/Sys/GameSettings/GF4F52.ini similarity index 100% rename from Data/Sys/GameConfig/GF4F52.ini rename to Data/Sys/GameSettings/GF4F52.ini diff --git a/Data/Sys/GameConfig/GF4P52.ini b/Data/Sys/GameSettings/GF4P52.ini similarity index 100% rename from Data/Sys/GameConfig/GF4P52.ini rename to Data/Sys/GameSettings/GF4P52.ini diff --git a/Data/Sys/GameConfig/GF5E69.ini b/Data/Sys/GameSettings/GF5E69.ini similarity index 100% rename from Data/Sys/GameConfig/GF5E69.ini rename to Data/Sys/GameSettings/GF5E69.ini diff --git a/Data/Sys/GameConfig/GF6E69.ini b/Data/Sys/GameSettings/GF6E69.ini similarity index 100% rename from Data/Sys/GameConfig/GF6E69.ini rename to Data/Sys/GameSettings/GF6E69.ini diff --git a/Data/Sys/GameConfig/GF6F69.ini b/Data/Sys/GameSettings/GF6F69.ini similarity index 100% rename from Data/Sys/GameConfig/GF6F69.ini rename to Data/Sys/GameSettings/GF6F69.ini diff --git a/Data/Sys/GameConfig/GF7E01.ini b/Data/Sys/GameSettings/GF7E01.ini similarity index 100% rename from Data/Sys/GameConfig/GF7E01.ini rename to Data/Sys/GameSettings/GF7E01.ini diff --git a/Data/Sys/GameConfig/GF7P01.ini b/Data/Sys/GameSettings/GF7P01.ini similarity index 100% rename from Data/Sys/GameConfig/GF7P01.ini rename to Data/Sys/GameSettings/GF7P01.ini diff --git a/Data/Sys/GameConfig/GF8E69.ini b/Data/Sys/GameSettings/GF8E69.ini similarity index 100% rename from Data/Sys/GameConfig/GF8E69.ini rename to Data/Sys/GameSettings/GF8E69.ini diff --git a/Data/Sys/GameConfig/GF8P69.ini b/Data/Sys/GameSettings/GF8P69.ini similarity index 100% rename from Data/Sys/GameConfig/GF8P69.ini rename to Data/Sys/GameSettings/GF8P69.ini diff --git a/Data/Sys/GameConfig/GFAD69.ini b/Data/Sys/GameSettings/GFAD69.ini similarity index 100% rename from Data/Sys/GameConfig/GFAD69.ini rename to Data/Sys/GameSettings/GFAD69.ini diff --git a/Data/Sys/GameConfig/GFAE69.ini b/Data/Sys/GameSettings/GFAE69.ini similarity index 100% rename from Data/Sys/GameConfig/GFAE69.ini rename to Data/Sys/GameSettings/GFAE69.ini diff --git a/Data/Sys/GameConfig/GFAP69.ini b/Data/Sys/GameSettings/GFAP69.ini similarity index 100% rename from Data/Sys/GameConfig/GFAP69.ini rename to Data/Sys/GameSettings/GFAP69.ini diff --git a/Data/Sys/GameConfig/GFAS69.ini b/Data/Sys/GameSettings/GFAS69.ini similarity index 100% rename from Data/Sys/GameConfig/GFAS69.ini rename to Data/Sys/GameSettings/GFAS69.ini diff --git a/Data/Sys/GameConfig/GFBE5D.ini b/Data/Sys/GameSettings/GFBE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GFBE5D.ini rename to Data/Sys/GameSettings/GFBE5D.ini diff --git a/Data/Sys/GameConfig/GFCP69.ini b/Data/Sys/GameSettings/GFCP69.ini similarity index 100% rename from Data/Sys/GameConfig/GFCP69.ini rename to Data/Sys/GameSettings/GFCP69.ini diff --git a/Data/Sys/GameConfig/GFDD69.ini b/Data/Sys/GameSettings/GFDD69.ini similarity index 100% rename from Data/Sys/GameConfig/GFDD69.ini rename to Data/Sys/GameSettings/GFDD69.ini diff --git a/Data/Sys/GameConfig/GFDE69.ini b/Data/Sys/GameSettings/GFDE69.ini similarity index 100% rename from Data/Sys/GameConfig/GFDE69.ini rename to Data/Sys/GameSettings/GFDE69.ini diff --git a/Data/Sys/GameConfig/GFEE01.ini b/Data/Sys/GameSettings/GFEE01.ini similarity index 100% rename from Data/Sys/GameConfig/GFEE01.ini rename to Data/Sys/GameSettings/GFEE01.ini diff --git a/Data/Sys/GameConfig/GFEJ01.ini b/Data/Sys/GameSettings/GFEJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GFEJ01.ini rename to Data/Sys/GameSettings/GFEJ01.ini diff --git a/Data/Sys/GameConfig/GFEP01.ini b/Data/Sys/GameSettings/GFEP01.ini similarity index 100% rename from Data/Sys/GameConfig/GFEP01.ini rename to Data/Sys/GameSettings/GFEP01.ini diff --git a/Data/Sys/GameConfig/GFFE5D.ini b/Data/Sys/GameSettings/GFFE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GFFE5D.ini rename to Data/Sys/GameSettings/GFFE5D.ini diff --git a/Data/Sys/GameConfig/GFGEA4.ini b/Data/Sys/GameSettings/GFGEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GFGEA4.ini rename to Data/Sys/GameSettings/GFGEA4.ini diff --git a/Data/Sys/GameConfig/GFHP6V.ini b/Data/Sys/GameSettings/GFHP6V.ini similarity index 100% rename from Data/Sys/GameConfig/GFHP6V.ini rename to Data/Sys/GameSettings/GFHP6V.ini diff --git a/Data/Sys/GameConfig/GFKE69.ini b/Data/Sys/GameSettings/GFKE69.ini similarity index 100% rename from Data/Sys/GameConfig/GFKE69.ini rename to Data/Sys/GameSettings/GFKE69.ini diff --git a/Data/Sys/GameConfig/GFPEA4.ini b/Data/Sys/GameSettings/GFPEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GFPEA4.ini rename to Data/Sys/GameSettings/GFPEA4.ini diff --git a/Data/Sys/GameConfig/GFQEA4.ini b/Data/Sys/GameSettings/GFQEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GFQEA4.ini rename to Data/Sys/GameSettings/GFQEA4.ini diff --git a/Data/Sys/GameConfig/GFTE01.ini b/Data/Sys/GameSettings/GFTE01.ini similarity index 100% rename from Data/Sys/GameConfig/GFTE01.ini rename to Data/Sys/GameSettings/GFTE01.ini diff --git a/Data/Sys/GameConfig/GFTP01.ini b/Data/Sys/GameSettings/GFTP01.ini similarity index 100% rename from Data/Sys/GameConfig/GFTP01.ini rename to Data/Sys/GameSettings/GFTP01.ini diff --git a/Data/Sys/GameConfig/GFUE4Z.ini b/Data/Sys/GameSettings/GFUE4Z.ini similarity index 100% rename from Data/Sys/GameConfig/GFUE4Z.ini rename to Data/Sys/GameSettings/GFUE4Z.ini diff --git a/Data/Sys/GameConfig/GFYE69.ini b/Data/Sys/GameSettings/GFYE69.ini similarity index 100% rename from Data/Sys/GameConfig/GFYE69.ini rename to Data/Sys/GameSettings/GFYE69.ini diff --git a/Data/Sys/GameConfig/GFYP69.ini b/Data/Sys/GameSettings/GFYP69.ini similarity index 100% rename from Data/Sys/GameConfig/GFYP69.ini rename to Data/Sys/GameSettings/GFYP69.ini diff --git a/Data/Sys/GameConfig/GFZE01.ini b/Data/Sys/GameSettings/GFZE01.ini similarity index 100% rename from Data/Sys/GameConfig/GFZE01.ini rename to Data/Sys/GameSettings/GFZE01.ini diff --git a/Data/Sys/GameConfig/GFZJ01.ini b/Data/Sys/GameSettings/GFZJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GFZJ01.ini rename to Data/Sys/GameSettings/GFZJ01.ini diff --git a/Data/Sys/GameConfig/GFZP01.ini b/Data/Sys/GameSettings/GFZP01.ini similarity index 100% rename from Data/Sys/GameConfig/GFZP01.ini rename to Data/Sys/GameSettings/GFZP01.ini diff --git a/Data/Sys/GameConfig/GG4E08.ini b/Data/Sys/GameSettings/GG4E08.ini similarity index 100% rename from Data/Sys/GameConfig/GG4E08.ini rename to Data/Sys/GameSettings/GG4E08.ini diff --git a/Data/Sys/GameConfig/GG4P08.ini b/Data/Sys/GameSettings/GG4P08.ini similarity index 100% rename from Data/Sys/GameConfig/GG4P08.ini rename to Data/Sys/GameSettings/GG4P08.ini diff --git a/Data/Sys/GameConfig/GG5E52.ini b/Data/Sys/GameSettings/GG5E52.ini similarity index 100% rename from Data/Sys/GameConfig/GG5E52.ini rename to Data/Sys/GameSettings/GG5E52.ini diff --git a/Data/Sys/GameConfig/GGAJB2.ini b/Data/Sys/GameSettings/GGAJB2.ini similarity index 100% rename from Data/Sys/GameConfig/GGAJB2.ini rename to Data/Sys/GameSettings/GGAJB2.ini diff --git a/Data/Sys/GameConfig/GGCE0A.ini b/Data/Sys/GameSettings/GGCE0A.ini similarity index 100% rename from Data/Sys/GameConfig/GGCE0A.ini rename to Data/Sys/GameSettings/GGCE0A.ini diff --git a/Data/Sys/GameConfig/GGCOSD.ini b/Data/Sys/GameSettings/GGCOSD.ini similarity index 100% rename from Data/Sys/GameConfig/GGCOSD.ini rename to Data/Sys/GameSettings/GGCOSD.ini diff --git a/Data/Sys/GameConfig/GGEE41.ini b/Data/Sys/GameSettings/GGEE41.ini similarity index 100% rename from Data/Sys/GameConfig/GGEE41.ini rename to Data/Sys/GameSettings/GGEE41.ini diff --git a/Data/Sys/GameConfig/GGEP41.ini b/Data/Sys/GameSettings/GGEP41.ini similarity index 100% rename from Data/Sys/GameConfig/GGEP41.ini rename to Data/Sys/GameSettings/GGEP41.ini diff --git a/Data/Sys/GameConfig/GGEY41.ini b/Data/Sys/GameSettings/GGEY41.ini similarity index 100% rename from Data/Sys/GameConfig/GGEY41.ini rename to Data/Sys/GameSettings/GGEY41.ini diff --git a/Data/Sys/GameConfig/GGME00.ini b/Data/Sys/GameSettings/GGME00.ini similarity index 100% rename from Data/Sys/GameConfig/GGME00.ini rename to Data/Sys/GameSettings/GGME00.ini diff --git a/Data/Sys/GameConfig/GGPJB2.ini b/Data/Sys/GameSettings/GGPJB2.ini similarity index 100% rename from Data/Sys/GameConfig/GGPJB2.ini rename to Data/Sys/GameSettings/GGPJB2.ini diff --git a/Data/Sys/GameConfig/GGRE41.ini b/Data/Sys/GameSettings/GGRE41.ini similarity index 100% rename from Data/Sys/GameConfig/GGRE41.ini rename to Data/Sys/GameSettings/GGRE41.ini diff --git a/Data/Sys/GameConfig/GGSEA4.ini b/Data/Sys/GameSettings/GGSEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GGSEA4.ini rename to Data/Sys/GameSettings/GGSEA4.ini diff --git a/Data/Sys/GameConfig/GGSJA4.ini b/Data/Sys/GameSettings/GGSJA4.ini similarity index 100% rename from Data/Sys/GameConfig/GGSJA4.ini rename to Data/Sys/GameSettings/GGSJA4.ini diff --git a/Data/Sys/GameConfig/GGSPA4.ini b/Data/Sys/GameSettings/GGSPA4.ini similarity index 100% rename from Data/Sys/GameConfig/GGSPA4.ini rename to Data/Sys/GameSettings/GGSPA4.ini diff --git a/Data/Sys/GameConfig/GGTE01.ini b/Data/Sys/GameSettings/GGTE01.ini similarity index 100% rename from Data/Sys/GameConfig/GGTE01.ini rename to Data/Sys/GameSettings/GGTE01.ini diff --git a/Data/Sys/GameConfig/GGTP01.ini b/Data/Sys/GameSettings/GGTP01.ini similarity index 100% rename from Data/Sys/GameConfig/GGTP01.ini rename to Data/Sys/GameSettings/GGTP01.ini diff --git a/Data/Sys/GameConfig/GGYE41.ini b/Data/Sys/GameSettings/GGYE41.ini similarity index 100% rename from Data/Sys/GameConfig/GGYE41.ini rename to Data/Sys/GameSettings/GGYE41.ini diff --git a/Data/Sys/GameConfig/GGYP41.ini b/Data/Sys/GameSettings/GGYP41.ini similarity index 100% rename from Data/Sys/GameConfig/GGYP41.ini rename to Data/Sys/GameSettings/GGYP41.ini diff --git a/Data/Sys/GameConfig/GGZE52.ini b/Data/Sys/GameSettings/GGZE52.ini similarity index 100% rename from Data/Sys/GameConfig/GGZE52.ini rename to Data/Sys/GameSettings/GGZE52.ini diff --git a/Data/Sys/GameConfig/GGZX52.ini b/Data/Sys/GameSettings/GGZX52.ini similarity index 100% rename from Data/Sys/GameConfig/GGZX52.ini rename to Data/Sys/GameSettings/GGZX52.ini diff --git a/Data/Sys/GameConfig/GH2E69.ini b/Data/Sys/GameSettings/GH2E69.ini similarity index 100% rename from Data/Sys/GameConfig/GH2E69.ini rename to Data/Sys/GameSettings/GH2E69.ini diff --git a/Data/Sys/GameConfig/GH2P69.ini b/Data/Sys/GameSettings/GH2P69.ini similarity index 100% rename from Data/Sys/GameConfig/GH2P69.ini rename to Data/Sys/GameSettings/GH2P69.ini diff --git a/Data/Sys/GameConfig/GH4D69.ini b/Data/Sys/GameSettings/GH4D69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4D69.ini rename to Data/Sys/GameSettings/GH4D69.ini diff --git a/Data/Sys/GameConfig/GH4E69.ini b/Data/Sys/GameSettings/GH4E69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4E69.ini rename to Data/Sys/GameSettings/GH4E69.ini diff --git a/Data/Sys/GameConfig/GH4F69.ini b/Data/Sys/GameSettings/GH4F69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4F69.ini rename to Data/Sys/GameSettings/GH4F69.ini diff --git a/Data/Sys/GameConfig/GH4H69.ini b/Data/Sys/GameSettings/GH4H69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4H69.ini rename to Data/Sys/GameSettings/GH4H69.ini diff --git a/Data/Sys/GameConfig/GH4I69.ini b/Data/Sys/GameSettings/GH4I69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4I69.ini rename to Data/Sys/GameSettings/GH4I69.ini diff --git a/Data/Sys/GameConfig/GH4J69.ini b/Data/Sys/GameSettings/GH4J69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4J69.ini rename to Data/Sys/GameSettings/GH4J69.ini diff --git a/Data/Sys/GameConfig/GH4M69.ini b/Data/Sys/GameSettings/GH4M69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4M69.ini rename to Data/Sys/GameSettings/GH4M69.ini diff --git a/Data/Sys/GameConfig/GH4P69.ini b/Data/Sys/GameSettings/GH4P69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4P69.ini rename to Data/Sys/GameSettings/GH4P69.ini diff --git a/Data/Sys/GameConfig/GH4S69.ini b/Data/Sys/GameSettings/GH4S69.ini similarity index 100% rename from Data/Sys/GameConfig/GH4S69.ini rename to Data/Sys/GameSettings/GH4S69.ini diff --git a/Data/Sys/GameConfig/GH5D52.ini b/Data/Sys/GameSettings/GH5D52.ini similarity index 100% rename from Data/Sys/GameConfig/GH5D52.ini rename to Data/Sys/GameSettings/GH5D52.ini diff --git a/Data/Sys/GameConfig/GH5E52.ini b/Data/Sys/GameSettings/GH5E52.ini similarity index 100% rename from Data/Sys/GameConfig/GH5E52.ini rename to Data/Sys/GameSettings/GH5E52.ini diff --git a/Data/Sys/GameConfig/GH5F52.ini b/Data/Sys/GameSettings/GH5F52.ini similarity index 100% rename from Data/Sys/GameConfig/GH5F52.ini rename to Data/Sys/GameSettings/GH5F52.ini diff --git a/Data/Sys/GameConfig/GH5P52.ini b/Data/Sys/GameSettings/GH5P52.ini similarity index 100% rename from Data/Sys/GameConfig/GH5P52.ini rename to Data/Sys/GameSettings/GH5P52.ini diff --git a/Data/Sys/GameConfig/GH6EAF.ini b/Data/Sys/GameSettings/GH6EAF.ini similarity index 100% rename from Data/Sys/GameConfig/GH6EAF.ini rename to Data/Sys/GameSettings/GH6EAF.ini diff --git a/Data/Sys/GameConfig/GH7E5D.ini b/Data/Sys/GameSettings/GH7E5D.ini similarity index 100% rename from Data/Sys/GameConfig/GH7E5D.ini rename to Data/Sys/GameSettings/GH7E5D.ini diff --git a/Data/Sys/GameConfig/GHAE08.ini b/Data/Sys/GameSettings/GHAE08.ini similarity index 100% rename from Data/Sys/GameConfig/GHAE08.ini rename to Data/Sys/GameSettings/GHAE08.ini diff --git a/Data/Sys/GameConfig/GHAP08.ini b/Data/Sys/GameSettings/GHAP08.ini similarity index 100% rename from Data/Sys/GameConfig/GHAP08.ini rename to Data/Sys/GameSettings/GHAP08.ini diff --git a/Data/Sys/GameConfig/GHBE7D.ini b/Data/Sys/GameSettings/GHBE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GHBE7D.ini rename to Data/Sys/GameSettings/GHBE7D.ini diff --git a/Data/Sys/GameConfig/GHBP7D.ini b/Data/Sys/GameSettings/GHBP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GHBP7D.ini rename to Data/Sys/GameSettings/GHBP7D.ini diff --git a/Data/Sys/GameConfig/GHCE4Q.ini b/Data/Sys/GameSettings/GHCE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/GHCE4Q.ini rename to Data/Sys/GameSettings/GHCE4Q.ini diff --git a/Data/Sys/GameConfig/GHCF4Q.ini b/Data/Sys/GameSettings/GHCF4Q.ini similarity index 100% rename from Data/Sys/GameConfig/GHCF4Q.ini rename to Data/Sys/GameSettings/GHCF4Q.ini diff --git a/Data/Sys/GameConfig/GHGEEB.ini b/Data/Sys/GameSettings/GHGEEB.ini similarity index 100% rename from Data/Sys/GameConfig/GHGEEB.ini rename to Data/Sys/GameSettings/GHGEEB.ini diff --git a/Data/Sys/GameConfig/GHKE7D.ini b/Data/Sys/GameSettings/GHKE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GHKE7D.ini rename to Data/Sys/GameSettings/GHKE7D.ini diff --git a/Data/Sys/GameConfig/GHLE69.ini b/Data/Sys/GameSettings/GHLE69.ini similarity index 100% rename from Data/Sys/GameConfig/GHLE69.ini rename to Data/Sys/GameSettings/GHLE69.ini diff --git a/Data/Sys/GameConfig/GHLJ69.ini b/Data/Sys/GameSettings/GHLJ69.ini similarity index 100% rename from Data/Sys/GameConfig/GHLJ69.ini rename to Data/Sys/GameSettings/GHLJ69.ini diff --git a/Data/Sys/GameConfig/GHLP69.ini b/Data/Sys/GameSettings/GHLP69.ini similarity index 100% rename from Data/Sys/GameConfig/GHLP69.ini rename to Data/Sys/GameSettings/GHLP69.ini diff --git a/Data/Sys/GameConfig/GHLX69.ini b/Data/Sys/GameSettings/GHLX69.ini similarity index 100% rename from Data/Sys/GameConfig/GHLX69.ini rename to Data/Sys/GameSettings/GHLX69.ini diff --git a/Data/Sys/GameConfig/GHLY69.ini b/Data/Sys/GameSettings/GHLY69.ini similarity index 100% rename from Data/Sys/GameConfig/GHLY69.ini rename to Data/Sys/GameSettings/GHLY69.ini diff --git a/Data/Sys/GameConfig/GHLZ69.ini b/Data/Sys/GameSettings/GHLZ69.ini similarity index 100% rename from Data/Sys/GameConfig/GHLZ69.ini rename to Data/Sys/GameSettings/GHLZ69.ini diff --git a/Data/Sys/GameConfig/GHMD4F.ini b/Data/Sys/GameSettings/GHMD4F.ini similarity index 100% rename from Data/Sys/GameConfig/GHMD4F.ini rename to Data/Sys/GameSettings/GHMD4F.ini diff --git a/Data/Sys/GameConfig/GHME4F.ini b/Data/Sys/GameSettings/GHME4F.ini similarity index 100% rename from Data/Sys/GameConfig/GHME4F.ini rename to Data/Sys/GameSettings/GHME4F.ini diff --git a/Data/Sys/GameConfig/GHMF4F.ini b/Data/Sys/GameSettings/GHMF4F.ini similarity index 100% rename from Data/Sys/GameConfig/GHMF4F.ini rename to Data/Sys/GameSettings/GHMF4F.ini diff --git a/Data/Sys/GameConfig/GHMP4F.ini b/Data/Sys/GameSettings/GHMP4F.ini similarity index 100% rename from Data/Sys/GameConfig/GHMP4F.ini rename to Data/Sys/GameSettings/GHMP4F.ini diff --git a/Data/Sys/GameConfig/GHNE71.ini b/Data/Sys/GameSettings/GHNE71.ini similarity index 100% rename from Data/Sys/GameConfig/GHNE71.ini rename to Data/Sys/GameSettings/GHNE71.ini diff --git a/Data/Sys/GameConfig/GHQE7D.ini b/Data/Sys/GameSettings/GHQE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GHQE7D.ini rename to Data/Sys/GameSettings/GHQE7D.ini diff --git a/Data/Sys/GameConfig/GHQP7D.ini b/Data/Sys/GameSettings/GHQP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GHQP7D.ini rename to Data/Sys/GameSettings/GHQP7D.ini diff --git a/Data/Sys/GameConfig/GHRE78.ini b/Data/Sys/GameSettings/GHRE78.ini similarity index 100% rename from Data/Sys/GameConfig/GHRE78.ini rename to Data/Sys/GameSettings/GHRE78.ini diff --git a/Data/Sys/GameConfig/GHSE69.ini b/Data/Sys/GameSettings/GHSE69.ini similarity index 100% rename from Data/Sys/GameConfig/GHSE69.ini rename to Data/Sys/GameSettings/GHSE69.ini diff --git a/Data/Sys/GameConfig/GHSJ69.ini b/Data/Sys/GameSettings/GHSJ69.ini similarity index 100% rename from Data/Sys/GameConfig/GHSJ69.ini rename to Data/Sys/GameSettings/GHSJ69.ini diff --git a/Data/Sys/GameConfig/GHSP69.ini b/Data/Sys/GameSettings/GHSP69.ini similarity index 100% rename from Data/Sys/GameConfig/GHSP69.ini rename to Data/Sys/GameSettings/GHSP69.ini diff --git a/Data/Sys/GameConfig/GHSX69.ini b/Data/Sys/GameSettings/GHSX69.ini similarity index 100% rename from Data/Sys/GameConfig/GHSX69.ini rename to Data/Sys/GameSettings/GHSX69.ini diff --git a/Data/Sys/GameConfig/GHSY69.ini b/Data/Sys/GameSettings/GHSY69.ini similarity index 100% rename from Data/Sys/GameConfig/GHSY69.ini rename to Data/Sys/GameSettings/GHSY69.ini diff --git a/Data/Sys/GameConfig/GHUE7D.ini b/Data/Sys/GameSettings/GHUE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GHUE7D.ini rename to Data/Sys/GameSettings/GHUE7D.ini diff --git a/Data/Sys/GameConfig/GHVE08.ini b/Data/Sys/GameSettings/GHVE08.ini similarity index 100% rename from Data/Sys/GameConfig/GHVE08.ini rename to Data/Sys/GameSettings/GHVE08.ini diff --git a/Data/Sys/GameConfig/GHWE78.ini b/Data/Sys/GameSettings/GHWE78.ini similarity index 100% rename from Data/Sys/GameConfig/GHWE78.ini rename to Data/Sys/GameSettings/GHWE78.ini diff --git a/Data/Sys/GameConfig/GHYE6S.ini b/Data/Sys/GameSettings/GHYE6S.ini similarity index 100% rename from Data/Sys/GameConfig/GHYE6S.ini rename to Data/Sys/GameSettings/GHYE6S.ini diff --git a/Data/Sys/GameConfig/GIAE7D.ini b/Data/Sys/GameSettings/GIAE7D.ini similarity index 100% rename from Data/Sys/GameConfig/GIAE7D.ini rename to Data/Sys/GameSettings/GIAE7D.ini diff --git a/Data/Sys/GameConfig/GIBE4F.ini b/Data/Sys/GameSettings/GIBE4F.ini similarity index 100% rename from Data/Sys/GameConfig/GIBE4F.ini rename to Data/Sys/GameSettings/GIBE4F.ini diff --git a/Data/Sys/GameConfig/GICE78.ini b/Data/Sys/GameSettings/GICE78.ini similarity index 100% rename from Data/Sys/GameConfig/GICE78.ini rename to Data/Sys/GameSettings/GICE78.ini diff --git a/Data/Sys/GameConfig/GIGJ8P.ini b/Data/Sys/GameSettings/GIGJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/GIGJ8P.ini rename to Data/Sys/GameSettings/GIGJ8P.ini diff --git a/Data/Sys/GameConfig/GIKE70.ini b/Data/Sys/GameSettings/GIKE70.ini similarity index 100% rename from Data/Sys/GameConfig/GIKE70.ini rename to Data/Sys/GameSettings/GIKE70.ini diff --git a/Data/Sys/GameConfig/GIKP70.ini b/Data/Sys/GameSettings/GIKP70.ini similarity index 100% rename from Data/Sys/GameConfig/GIKP70.ini rename to Data/Sys/GameSettings/GIKP70.ini diff --git a/Data/Sys/GameConfig/GILE51.ini b/Data/Sys/GameSettings/GILE51.ini similarity index 100% rename from Data/Sys/GameConfig/GILE51.ini rename to Data/Sys/GameSettings/GILE51.ini diff --git a/Data/Sys/GameConfig/GILP51.ini b/Data/Sys/GameSettings/GILP51.ini similarity index 100% rename from Data/Sys/GameConfig/GILP51.ini rename to Data/Sys/GameSettings/GILP51.ini diff --git a/Data/Sys/GameConfig/GINE69.ini b/Data/Sys/GameSettings/GINE69.ini similarity index 100% rename from Data/Sys/GameConfig/GINE69.ini rename to Data/Sys/GameSettings/GINE69.ini diff --git a/Data/Sys/GameConfig/GINX69.ini b/Data/Sys/GameSettings/GINX69.ini similarity index 100% rename from Data/Sys/GameConfig/GINX69.ini rename to Data/Sys/GameSettings/GINX69.ini diff --git a/Data/Sys/GameConfig/GIPEAF.ini b/Data/Sys/GameSettings/GIPEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GIPEAF.ini rename to Data/Sys/GameSettings/GIPEAF.ini diff --git a/Data/Sys/GameConfig/GIQE78.ini b/Data/Sys/GameSettings/GIQE78.ini similarity index 100% rename from Data/Sys/GameConfig/GIQE78.ini rename to Data/Sys/GameSettings/GIQE78.ini diff --git a/Data/Sys/GameConfig/GISE36.ini b/Data/Sys/GameSettings/GISE36.ini similarity index 100% rename from Data/Sys/GameConfig/GISE36.ini rename to Data/Sys/GameSettings/GISE36.ini diff --git a/Data/Sys/GameConfig/GISP36.ini b/Data/Sys/GameSettings/GISP36.ini similarity index 100% rename from Data/Sys/GameConfig/GISP36.ini rename to Data/Sys/GameSettings/GISP36.ini diff --git a/Data/Sys/GameConfig/GITE01.ini b/Data/Sys/GameSettings/GITE01.ini similarity index 100% rename from Data/Sys/GameConfig/GITE01.ini rename to Data/Sys/GameSettings/GITE01.ini diff --git a/Data/Sys/GameConfig/GITP01.ini b/Data/Sys/GameSettings/GITP01.ini similarity index 100% rename from Data/Sys/GameConfig/GITP01.ini rename to Data/Sys/GameSettings/GITP01.ini diff --git a/Data/Sys/GameConfig/GIVE4Z.ini b/Data/Sys/GameSettings/GIVE4Z.ini similarity index 100% rename from Data/Sys/GameConfig/GIVE4Z.ini rename to Data/Sys/GameSettings/GIVE4Z.ini diff --git a/Data/Sys/GameConfig/GIZE52.ini b/Data/Sys/GameSettings/GIZE52.ini similarity index 100% rename from Data/Sys/GameConfig/GIZE52.ini rename to Data/Sys/GameSettings/GIZE52.ini diff --git a/Data/Sys/GameConfig/GJ3PA4.ini b/Data/Sys/GameSettings/GJ3PA4.ini similarity index 100% rename from Data/Sys/GameConfig/GJ3PA4.ini rename to Data/Sys/GameSettings/GJ3PA4.ini diff --git a/Data/Sys/GameConfig/GJBE5G.ini b/Data/Sys/GameSettings/GJBE5G.ini similarity index 100% rename from Data/Sys/GameConfig/GJBE5G.ini rename to Data/Sys/GameSettings/GJBE5G.ini diff --git a/Data/Sys/GameConfig/GJCE8P.ini b/Data/Sys/GameSettings/GJCE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GJCE8P.ini rename to Data/Sys/GameSettings/GJCE8P.ini diff --git a/Data/Sys/GameConfig/GJDE5S.ini b/Data/Sys/GameSettings/GJDE5S.ini similarity index 100% rename from Data/Sys/GameConfig/GJDE5S.ini rename to Data/Sys/GameSettings/GJDE5S.ini diff --git a/Data/Sys/GameConfig/GJKE52.ini b/Data/Sys/GameSettings/GJKE52.ini similarity index 100% rename from Data/Sys/GameConfig/GJKE52.ini rename to Data/Sys/GameSettings/GJKE52.ini diff --git a/Data/Sys/GameConfig/GJNE78.ini b/Data/Sys/GameSettings/GJNE78.ini similarity index 100% rename from Data/Sys/GameConfig/GJNE78.ini rename to Data/Sys/GameSettings/GJNE78.ini diff --git a/Data/Sys/GameConfig/GJSJ18.ini b/Data/Sys/GameSettings/GJSJ18.ini similarity index 100% rename from Data/Sys/GameConfig/GJSJ18.ini rename to Data/Sys/GameSettings/GJSJ18.ini diff --git a/Data/Sys/GameConfig/GJUD78.ini b/Data/Sys/GameSettings/GJUD78.ini similarity index 100% rename from Data/Sys/GameConfig/GJUD78.ini rename to Data/Sys/GameSettings/GJUD78.ini diff --git a/Data/Sys/GameConfig/GJUE78.ini b/Data/Sys/GameSettings/GJUE78.ini similarity index 100% rename from Data/Sys/GameConfig/GJUE78.ini rename to Data/Sys/GameSettings/GJUE78.ini diff --git a/Data/Sys/GameConfig/GJUF78.ini b/Data/Sys/GameSettings/GJUF78.ini similarity index 100% rename from Data/Sys/GameConfig/GJUF78.ini rename to Data/Sys/GameSettings/GJUF78.ini diff --git a/Data/Sys/GameConfig/GJWE78.ini b/Data/Sys/GameSettings/GJWE78.ini similarity index 100% rename from Data/Sys/GameConfig/GJWE78.ini rename to Data/Sys/GameSettings/GJWE78.ini diff --git a/Data/Sys/GameConfig/GJXE51.ini b/Data/Sys/GameSettings/GJXE51.ini similarity index 100% rename from Data/Sys/GameConfig/GJXE51.ini rename to Data/Sys/GameSettings/GJXE51.ini diff --git a/Data/Sys/GameConfig/GJXP51.ini b/Data/Sys/GameSettings/GJXP51.ini similarity index 100% rename from Data/Sys/GameConfig/GJXP51.ini rename to Data/Sys/GameSettings/GJXP51.ini diff --git a/Data/Sys/GameConfig/GJZE52.ini b/Data/Sys/GameSettings/GJZE52.ini similarity index 100% rename from Data/Sys/GameConfig/GJZE52.ini rename to Data/Sys/GameSettings/GJZE52.ini diff --git a/Data/Sys/GameConfig/GK2D52.ini b/Data/Sys/GameSettings/GK2D52.ini similarity index 100% rename from Data/Sys/GameConfig/GK2D52.ini rename to Data/Sys/GameSettings/GK2D52.ini diff --git a/Data/Sys/GameConfig/GK2E52.ini b/Data/Sys/GameSettings/GK2E52.ini similarity index 100% rename from Data/Sys/GameConfig/GK2E52.ini rename to Data/Sys/GameSettings/GK2E52.ini diff --git a/Data/Sys/GameConfig/GK2F52.ini b/Data/Sys/GameSettings/GK2F52.ini similarity index 100% rename from Data/Sys/GameConfig/GK2F52.ini rename to Data/Sys/GameSettings/GK2F52.ini diff --git a/Data/Sys/GameConfig/GK2I52.ini b/Data/Sys/GameSettings/GK2I52.ini similarity index 100% rename from Data/Sys/GameConfig/GK2I52.ini rename to Data/Sys/GameSettings/GK2I52.ini diff --git a/Data/Sys/GameConfig/GK2P52.ini b/Data/Sys/GameSettings/GK2P52.ini similarity index 100% rename from Data/Sys/GameConfig/GK2P52.ini rename to Data/Sys/GameSettings/GK2P52.ini diff --git a/Data/Sys/GameConfig/GK4E01.ini b/Data/Sys/GameSettings/GK4E01.ini similarity index 100% rename from Data/Sys/GameConfig/GK4E01.ini rename to Data/Sys/GameSettings/GK4E01.ini diff --git a/Data/Sys/GameConfig/GK5E78.ini b/Data/Sys/GameSettings/GK5E78.ini similarity index 100% rename from Data/Sys/GameConfig/GK5E78.ini rename to Data/Sys/GameSettings/GK5E78.ini diff --git a/Data/Sys/GameConfig/GK5X78.ini b/Data/Sys/GameSettings/GK5X78.ini similarity index 100% rename from Data/Sys/GameConfig/GK5X78.ini rename to Data/Sys/GameSettings/GK5X78.ini diff --git a/Data/Sys/GameConfig/GK6JA4.ini b/Data/Sys/GameSettings/GK6JA4.ini similarity index 100% rename from Data/Sys/GameConfig/GK6JA4.ini rename to Data/Sys/GameSettings/GK6JA4.ini diff --git a/Data/Sys/GameConfig/GK7E08.ini b/Data/Sys/GameSettings/GK7E08.ini similarity index 100% rename from Data/Sys/GameConfig/GK7E08.ini rename to Data/Sys/GameSettings/GK7E08.ini diff --git a/Data/Sys/GameConfig/GK7P08.ini b/Data/Sys/GameSettings/GK7P08.ini similarity index 100% rename from Data/Sys/GameConfig/GK7P08.ini rename to Data/Sys/GameSettings/GK7P08.ini diff --git a/Data/Sys/GameConfig/GK9EA4.ini b/Data/Sys/GameSettings/GK9EA4.ini similarity index 100% rename from Data/Sys/GameConfig/GK9EA4.ini rename to Data/Sys/GameSettings/GK9EA4.ini diff --git a/Data/Sys/GameConfig/GKAE8P.ini b/Data/Sys/GameSettings/GKAE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GKAE8P.ini rename to Data/Sys/GameSettings/GKAE8P.ini diff --git a/Data/Sys/GameConfig/GKBEAF.ini b/Data/Sys/GameSettings/GKBEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GKBEAF.ini rename to Data/Sys/GameSettings/GKBEAF.ini diff --git a/Data/Sys/GameConfig/GKBPAF.ini b/Data/Sys/GameSettings/GKBPAF.ini similarity index 100% rename from Data/Sys/GameConfig/GKBPAF.ini rename to Data/Sys/GameSettings/GKBPAF.ini diff --git a/Data/Sys/GameConfig/GKDP01.ini b/Data/Sys/GameSettings/GKDP01.ini similarity index 100% rename from Data/Sys/GameConfig/GKDP01.ini rename to Data/Sys/GameSettings/GKDP01.ini diff --git a/Data/Sys/GameConfig/GKFEGG.ini b/Data/Sys/GameSettings/GKFEGG.ini similarity index 100% rename from Data/Sys/GameConfig/GKFEGG.ini rename to Data/Sys/GameSettings/GKFEGG.ini diff --git a/Data/Sys/GameConfig/GKGE01.ini b/Data/Sys/GameSettings/GKGE01.ini similarity index 100% rename from Data/Sys/GameConfig/GKGE01.ini rename to Data/Sys/GameSettings/GKGE01.ini diff --git a/Data/Sys/GameConfig/GKHEA4.ini b/Data/Sys/GameSettings/GKHEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GKHEA4.ini rename to Data/Sys/GameSettings/GKHEA4.ini diff --git a/Data/Sys/GameConfig/GKHPA4.ini b/Data/Sys/GameSettings/GKHPA4.ini similarity index 100% rename from Data/Sys/GameConfig/GKHPA4.ini rename to Data/Sys/GameSettings/GKHPA4.ini diff --git a/Data/Sys/GameConfig/GKJE78.ini b/Data/Sys/GameSettings/GKJE78.ini similarity index 100% rename from Data/Sys/GameConfig/GKJE78.ini rename to Data/Sys/GameSettings/GKJE78.ini diff --git a/Data/Sys/GameConfig/GKKE69.ini b/Data/Sys/GameSettings/GKKE69.ini similarity index 100% rename from Data/Sys/GameConfig/GKKE69.ini rename to Data/Sys/GameSettings/GKKE69.ini diff --git a/Data/Sys/GameConfig/GKLD69.ini b/Data/Sys/GameSettings/GKLD69.ini similarity index 100% rename from Data/Sys/GameConfig/GKLD69.ini rename to Data/Sys/GameSettings/GKLD69.ini diff --git a/Data/Sys/GameConfig/GKLE69.ini b/Data/Sys/GameSettings/GKLE69.ini similarity index 100% rename from Data/Sys/GameConfig/GKLE69.ini rename to Data/Sys/GameSettings/GKLE69.ini diff --git a/Data/Sys/GameConfig/GKLF69.ini b/Data/Sys/GameSettings/GKLF69.ini similarity index 100% rename from Data/Sys/GameConfig/GKLF69.ini rename to Data/Sys/GameSettings/GKLF69.ini diff --git a/Data/Sys/GameConfig/GKLI69.ini b/Data/Sys/GameSettings/GKLI69.ini similarity index 100% rename from Data/Sys/GameConfig/GKLI69.ini rename to Data/Sys/GameSettings/GKLI69.ini diff --git a/Data/Sys/GameConfig/GKLJ69.ini b/Data/Sys/GameSettings/GKLJ69.ini similarity index 100% rename from Data/Sys/GameConfig/GKLJ69.ini rename to Data/Sys/GameSettings/GKLJ69.ini diff --git a/Data/Sys/GameConfig/GKLP69.ini b/Data/Sys/GameSettings/GKLP69.ini similarity index 100% rename from Data/Sys/GameConfig/GKLP69.ini rename to Data/Sys/GameSettings/GKLP69.ini diff --git a/Data/Sys/GameConfig/GKLS69.ini b/Data/Sys/GameSettings/GKLS69.ini similarity index 100% rename from Data/Sys/GameConfig/GKLS69.ini rename to Data/Sys/GameSettings/GKLS69.ini diff --git a/Data/Sys/GameConfig/GKME41.ini b/Data/Sys/GameSettings/GKME41.ini similarity index 100% rename from Data/Sys/GameConfig/GKME41.ini rename to Data/Sys/GameSettings/GKME41.ini diff --git a/Data/Sys/GameConfig/GKMP41.ini b/Data/Sys/GameSettings/GKMP41.ini similarity index 100% rename from Data/Sys/GameConfig/GKMP41.ini rename to Data/Sys/GameSettings/GKMP41.ini diff --git a/Data/Sys/GameConfig/GKNEB2.ini b/Data/Sys/GameSettings/GKNEB2.ini similarity index 100% rename from Data/Sys/GameConfig/GKNEB2.ini rename to Data/Sys/GameSettings/GKNEB2.ini diff --git a/Data/Sys/GameConfig/GKOE70.ini b/Data/Sys/GameSettings/GKOE70.ini similarity index 100% rename from Data/Sys/GameConfig/GKOE70.ini rename to Data/Sys/GameSettings/GKOE70.ini diff --git a/Data/Sys/GameConfig/GKOP6V.ini b/Data/Sys/GameSettings/GKOP6V.ini similarity index 100% rename from Data/Sys/GameConfig/GKOP6V.ini rename to Data/Sys/GameSettings/GKOP6V.ini diff --git a/Data/Sys/GameConfig/GKOP70.ini b/Data/Sys/GameSettings/GKOP70.ini similarity index 100% rename from Data/Sys/GameConfig/GKOP70.ini rename to Data/Sys/GameSettings/GKOP70.ini diff --git a/Data/Sys/GameConfig/GKQJ01.ini b/Data/Sys/GameSettings/GKQJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GKQJ01.ini rename to Data/Sys/GameSettings/GKQJ01.ini diff --git a/Data/Sys/GameConfig/GKSE52.ini b/Data/Sys/GameSettings/GKSE52.ini similarity index 100% rename from Data/Sys/GameConfig/GKSE52.ini rename to Data/Sys/GameSettings/GKSE52.ini diff --git a/Data/Sys/GameConfig/GKTJA4.ini b/Data/Sys/GameSettings/GKTJA4.ini similarity index 100% rename from Data/Sys/GameConfig/GKTJA4.ini rename to Data/Sys/GameSettings/GKTJA4.ini diff --git a/Data/Sys/GameConfig/GKUE9G.ini b/Data/Sys/GameSettings/GKUE9G.ini similarity index 100% rename from Data/Sys/GameConfig/GKUE9G.ini rename to Data/Sys/GameSettings/GKUE9G.ini diff --git a/Data/Sys/GameConfig/GKYE01.ini b/Data/Sys/GameSettings/GKYE01.ini similarity index 100% rename from Data/Sys/GameConfig/GKYE01.ini rename to Data/Sys/GameSettings/GKYE01.ini diff --git a/Data/Sys/GameConfig/GKYJ01.ini b/Data/Sys/GameSettings/GKYJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GKYJ01.ini rename to Data/Sys/GameSettings/GKYJ01.ini diff --git a/Data/Sys/GameConfig/GKYP01.ini b/Data/Sys/GameSettings/GKYP01.ini similarity index 100% rename from Data/Sys/GameConfig/GKYP01.ini rename to Data/Sys/GameSettings/GKYP01.ini diff --git a/Data/Sys/GameConfig/GKZE9G.ini b/Data/Sys/GameSettings/GKZE9G.ini similarity index 100% rename from Data/Sys/GameConfig/GKZE9G.ini rename to Data/Sys/GameSettings/GKZE9G.ini diff --git a/Data/Sys/GameConfig/GL5E4F.ini b/Data/Sys/GameSettings/GL5E4F.ini similarity index 100% rename from Data/Sys/GameConfig/GL5E4F.ini rename to Data/Sys/GameSettings/GL5E4F.ini diff --git a/Data/Sys/GameConfig/GL7E64.ini b/Data/Sys/GameSettings/GL7E64.ini similarity index 100% rename from Data/Sys/GameConfig/GL7E64.ini rename to Data/Sys/GameSettings/GL7E64.ini diff --git a/Data/Sys/GameConfig/GL7P64.ini b/Data/Sys/GameSettings/GL7P64.ini similarity index 100% rename from Data/Sys/GameConfig/GL7P64.ini rename to Data/Sys/GameSettings/GL7P64.ini diff --git a/Data/Sys/GameConfig/GL8E4F.ini b/Data/Sys/GameSettings/GL8E4F.ini similarity index 100% rename from Data/Sys/GameConfig/GL8E4F.ini rename to Data/Sys/GameSettings/GL8E4F.ini diff --git a/Data/Sys/GameConfig/GL8F4F.ini b/Data/Sys/GameSettings/GL8F4F.ini similarity index 100% rename from Data/Sys/GameConfig/GL8F4F.ini rename to Data/Sys/GameSettings/GL8F4F.ini diff --git a/Data/Sys/GameConfig/GLBE8P.ini b/Data/Sys/GameSettings/GLBE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GLBE8P.ini rename to Data/Sys/GameSettings/GLBE8P.ini diff --git a/Data/Sys/GameConfig/GLCE52.ini b/Data/Sys/GameSettings/GLCE52.ini similarity index 100% rename from Data/Sys/GameConfig/GLCE52.ini rename to Data/Sys/GameSettings/GLCE52.ini diff --git a/Data/Sys/GameConfig/GLCF52.ini b/Data/Sys/GameSettings/GLCF52.ini similarity index 100% rename from Data/Sys/GameConfig/GLCF52.ini rename to Data/Sys/GameSettings/GLCF52.ini diff --git a/Data/Sys/GameConfig/GLEE08.ini b/Data/Sys/GameSettings/GLEE08.ini similarity index 100% rename from Data/Sys/GameConfig/GLEE08.ini rename to Data/Sys/GameSettings/GLEE08.ini diff --git a/Data/Sys/GameConfig/GLEP08.ini b/Data/Sys/GameSettings/GLEP08.ini similarity index 100% rename from Data/Sys/GameConfig/GLEP08.ini rename to Data/Sys/GameSettings/GLEP08.ini diff --git a/Data/Sys/GameConfig/GLLE78.ini b/Data/Sys/GameSettings/GLLE78.ini similarity index 100% rename from Data/Sys/GameConfig/GLLE78.ini rename to Data/Sys/GameSettings/GLLE78.ini diff --git a/Data/Sys/GameConfig/GLME01.ini b/Data/Sys/GameSettings/GLME01.ini similarity index 100% rename from Data/Sys/GameConfig/GLME01.ini rename to Data/Sys/GameSettings/GLME01.ini diff --git a/Data/Sys/GameConfig/GLMP01.ini b/Data/Sys/GameSettings/GLMP01.ini similarity index 100% rename from Data/Sys/GameConfig/GLMP01.ini rename to Data/Sys/GameSettings/GLMP01.ini diff --git a/Data/Sys/GameConfig/GLNE69.ini b/Data/Sys/GameSettings/GLNE69.ini similarity index 100% rename from Data/Sys/GameConfig/GLNE69.ini rename to Data/Sys/GameSettings/GLNE69.ini diff --git a/Data/Sys/GameConfig/GLNP69.ini b/Data/Sys/GameSettings/GLNP69.ini similarity index 100% rename from Data/Sys/GameConfig/GLNP69.ini rename to Data/Sys/GameSettings/GLNP69.ini diff --git a/Data/Sys/GameConfig/GLOE69.ini b/Data/Sys/GameSettings/GLOE69.ini similarity index 100% rename from Data/Sys/GameConfig/GLOE69.ini rename to Data/Sys/GameSettings/GLOE69.ini diff --git a/Data/Sys/GameConfig/GLOP69.ini b/Data/Sys/GameSettings/GLOP69.ini similarity index 100% rename from Data/Sys/GameConfig/GLOP69.ini rename to Data/Sys/GameSettings/GLOP69.ini diff --git a/Data/Sys/GameConfig/GLQE41.ini b/Data/Sys/GameSettings/GLQE41.ini similarity index 100% rename from Data/Sys/GameConfig/GLQE41.ini rename to Data/Sys/GameSettings/GLQE41.ini diff --git a/Data/Sys/GameConfig/GLRE64.ini b/Data/Sys/GameSettings/GLRE64.ini similarity index 100% rename from Data/Sys/GameConfig/GLRE64.ini rename to Data/Sys/GameSettings/GLRE64.ini diff --git a/Data/Sys/GameConfig/GLSD64.ini b/Data/Sys/GameSettings/GLSD64.ini similarity index 100% rename from Data/Sys/GameConfig/GLSD64.ini rename to Data/Sys/GameSettings/GLSD64.ini diff --git a/Data/Sys/GameConfig/GLSE64.ini b/Data/Sys/GameSettings/GLSE64.ini similarity index 100% rename from Data/Sys/GameConfig/GLSE64.ini rename to Data/Sys/GameSettings/GLSE64.ini diff --git a/Data/Sys/GameConfig/GLSF64.ini b/Data/Sys/GameSettings/GLSF64.ini similarity index 100% rename from Data/Sys/GameConfig/GLSF64.ini rename to Data/Sys/GameSettings/GLSF64.ini diff --git a/Data/Sys/GameConfig/GLSP64.ini b/Data/Sys/GameSettings/GLSP64.ini similarity index 100% rename from Data/Sys/GameConfig/GLSP64.ini rename to Data/Sys/GameSettings/GLSP64.ini diff --git a/Data/Sys/GameConfig/GLUE7U.ini b/Data/Sys/GameSettings/GLUE7U.ini similarity index 100% rename from Data/Sys/GameConfig/GLUE7U.ini rename to Data/Sys/GameSettings/GLUE7U.ini diff --git a/Data/Sys/GameConfig/GLWE51.ini b/Data/Sys/GameSettings/GLWE51.ini similarity index 100% rename from Data/Sys/GameConfig/GLWE51.ini rename to Data/Sys/GameSettings/GLWE51.ini diff --git a/Data/Sys/GameConfig/GLYE69.ini b/Data/Sys/GameSettings/GLYE69.ini similarity index 100% rename from Data/Sys/GameConfig/GLYE69.ini rename to Data/Sys/GameSettings/GLYE69.ini diff --git a/Data/Sys/GameConfig/GLYP69.ini b/Data/Sys/GameSettings/GLYP69.ini similarity index 100% rename from Data/Sys/GameConfig/GLYP69.ini rename to Data/Sys/GameSettings/GLYP69.ini diff --git a/Data/Sys/GameConfig/GLZE69.ini b/Data/Sys/GameSettings/GLZE69.ini similarity index 100% rename from Data/Sys/GameConfig/GLZE69.ini rename to Data/Sys/GameSettings/GLZE69.ini diff --git a/Data/Sys/GameConfig/GLZF69.ini b/Data/Sys/GameSettings/GLZF69.ini similarity index 100% rename from Data/Sys/GameConfig/GLZF69.ini rename to Data/Sys/GameSettings/GLZF69.ini diff --git a/Data/Sys/GameConfig/GM2E8P.ini b/Data/Sys/GameSettings/GM2E8P.ini similarity index 100% rename from Data/Sys/GameConfig/GM2E8P.ini rename to Data/Sys/GameSettings/GM2E8P.ini diff --git a/Data/Sys/GameConfig/GM2P8P.ini b/Data/Sys/GameSettings/GM2P8P.ini similarity index 100% rename from Data/Sys/GameConfig/GM2P8P.ini rename to Data/Sys/GameSettings/GM2P8P.ini diff --git a/Data/Sys/GameConfig/GM3E69.ini b/Data/Sys/GameSettings/GM3E69.ini similarity index 100% rename from Data/Sys/GameConfig/GM3E69.ini rename to Data/Sys/GameSettings/GM3E69.ini diff --git a/Data/Sys/GameConfig/GM4E01.ini b/Data/Sys/GameSettings/GM4E01.ini similarity index 100% rename from Data/Sys/GameConfig/GM4E01.ini rename to Data/Sys/GameSettings/GM4E01.ini diff --git a/Data/Sys/GameConfig/GM4J01.ini b/Data/Sys/GameSettings/GM4J01.ini similarity index 100% rename from Data/Sys/GameConfig/GM4J01.ini rename to Data/Sys/GameSettings/GM4J01.ini diff --git a/Data/Sys/GameConfig/GM4P01.ini b/Data/Sys/GameSettings/GM4P01.ini similarity index 100% rename from Data/Sys/GameConfig/GM4P01.ini rename to Data/Sys/GameSettings/GM4P01.ini diff --git a/Data/Sys/GameConfig/GM5E7D.ini b/Data/Sys/GameSettings/GM5E7D.ini similarity index 100% rename from Data/Sys/GameConfig/GM5E7D.ini rename to Data/Sys/GameSettings/GM5E7D.ini diff --git a/Data/Sys/GameConfig/GM5F7D.ini b/Data/Sys/GameSettings/GM5F7D.ini similarity index 100% rename from Data/Sys/GameConfig/GM5F7D.ini rename to Data/Sys/GameSettings/GM5F7D.ini diff --git a/Data/Sys/GameConfig/GM5P7D.ini b/Data/Sys/GameSettings/GM5P7D.ini similarity index 100% rename from Data/Sys/GameConfig/GM5P7D.ini rename to Data/Sys/GameSettings/GM5P7D.ini diff --git a/Data/Sys/GameConfig/GM6EE9.ini b/Data/Sys/GameSettings/GM6EE9.ini similarity index 100% rename from Data/Sys/GameConfig/GM6EE9.ini rename to Data/Sys/GameSettings/GM6EE9.ini diff --git a/Data/Sys/GameConfig/GM6PE9.ini b/Data/Sys/GameSettings/GM6PE9.ini similarity index 100% rename from Data/Sys/GameConfig/GM6PE9.ini rename to Data/Sys/GameSettings/GM6PE9.ini diff --git a/Data/Sys/GameConfig/GM8E01.ini b/Data/Sys/GameSettings/GM8E01.ini similarity index 100% rename from Data/Sys/GameConfig/GM8E01.ini rename to Data/Sys/GameSettings/GM8E01.ini diff --git a/Data/Sys/GameConfig/GM8J01.ini b/Data/Sys/GameSettings/GM8J01.ini similarity index 100% rename from Data/Sys/GameConfig/GM8J01.ini rename to Data/Sys/GameSettings/GM8J01.ini diff --git a/Data/Sys/GameConfig/GM8P01.ini b/Data/Sys/GameSettings/GM8P01.ini similarity index 100% rename from Data/Sys/GameConfig/GM8P01.ini rename to Data/Sys/GameSettings/GM8P01.ini diff --git a/Data/Sys/GameConfig/GMBE8P.ini b/Data/Sys/GameSettings/GMBE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GMBE8P.ini rename to Data/Sys/GameSettings/GMBE8P.ini diff --git a/Data/Sys/GameConfig/GMBP8P.ini b/Data/Sys/GameSettings/GMBP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GMBP8P.ini rename to Data/Sys/GameSettings/GMBP8P.ini diff --git a/Data/Sys/GameConfig/GMFS69.ini b/Data/Sys/GameSettings/GMFS69.ini similarity index 100% rename from Data/Sys/GameConfig/GMFS69.ini rename to Data/Sys/GameSettings/GMFS69.ini diff --git a/Data/Sys/GameConfig/GMHE52.ini b/Data/Sys/GameSettings/GMHE52.ini similarity index 100% rename from Data/Sys/GameConfig/GMHE52.ini rename to Data/Sys/GameSettings/GMHE52.ini diff --git a/Data/Sys/GameConfig/GMHF52.ini b/Data/Sys/GameSettings/GMHF52.ini similarity index 100% rename from Data/Sys/GameConfig/GMHF52.ini rename to Data/Sys/GameSettings/GMHF52.ini diff --git a/Data/Sys/GameConfig/GMHP52.ini b/Data/Sys/GameSettings/GMHP52.ini similarity index 100% rename from Data/Sys/GameConfig/GMHP52.ini rename to Data/Sys/GameSettings/GMHP52.ini diff --git a/Data/Sys/GameConfig/GMIE70.ini b/Data/Sys/GameSettings/GMIE70.ini similarity index 100% rename from Data/Sys/GameConfig/GMIE70.ini rename to Data/Sys/GameSettings/GMIE70.ini diff --git a/Data/Sys/GameConfig/GMIP70.ini b/Data/Sys/GameSettings/GMIP70.ini similarity index 100% rename from Data/Sys/GameConfig/GMIP70.ini rename to Data/Sys/GameSettings/GMIP70.ini diff --git a/Data/Sys/GameConfig/GMKD5D.ini b/Data/Sys/GameSettings/GMKD5D.ini similarity index 100% rename from Data/Sys/GameConfig/GMKD5D.ini rename to Data/Sys/GameSettings/GMKD5D.ini diff --git a/Data/Sys/GameConfig/GMLEA4.ini b/Data/Sys/GameSettings/GMLEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GMLEA4.ini rename to Data/Sys/GameSettings/GMLEA4.ini diff --git a/Data/Sys/GameConfig/GMNE78.ini b/Data/Sys/GameSettings/GMNE78.ini similarity index 100% rename from Data/Sys/GameConfig/GMNE78.ini rename to Data/Sys/GameSettings/GMNE78.ini diff --git a/Data/Sys/GameConfig/GMPE01.ini b/Data/Sys/GameSettings/GMPE01.ini similarity index 100% rename from Data/Sys/GameConfig/GMPE01.ini rename to Data/Sys/GameSettings/GMPE01.ini diff --git a/Data/Sys/GameConfig/GMPP01.ini b/Data/Sys/GameSettings/GMPP01.ini similarity index 100% rename from Data/Sys/GameConfig/GMPP01.ini rename to Data/Sys/GameSettings/GMPP01.ini diff --git a/Data/Sys/GameConfig/GMSE01.ini b/Data/Sys/GameSettings/GMSE01.ini similarity index 100% rename from Data/Sys/GameConfig/GMSE01.ini rename to Data/Sys/GameSettings/GMSE01.ini diff --git a/Data/Sys/GameConfig/GMSJ01.ini b/Data/Sys/GameSettings/GMSJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GMSJ01.ini rename to Data/Sys/GameSettings/GMSJ01.ini diff --git a/Data/Sys/GameConfig/GMSP01.ini b/Data/Sys/GameSettings/GMSP01.ini similarity index 100% rename from Data/Sys/GameConfig/GMSP01.ini rename to Data/Sys/GameSettings/GMSP01.ini diff --git a/Data/Sys/GameConfig/GMTP69.ini b/Data/Sys/GameSettings/GMTP69.ini similarity index 100% rename from Data/Sys/GameConfig/GMTP69.ini rename to Data/Sys/GameSettings/GMTP69.ini diff --git a/Data/Sys/GameConfig/GMUE5D.ini b/Data/Sys/GameSettings/GMUE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GMUE5D.ini rename to Data/Sys/GameSettings/GMUE5D.ini diff --git a/Data/Sys/GameConfig/GMXE70.ini b/Data/Sys/GameSettings/GMXE70.ini similarity index 100% rename from Data/Sys/GameConfig/GMXE70.ini rename to Data/Sys/GameSettings/GMXE70.ini diff --git a/Data/Sys/GameConfig/GN6E69.ini b/Data/Sys/GameSettings/GN6E69.ini similarity index 100% rename from Data/Sys/GameConfig/GN6E69.ini rename to Data/Sys/GameSettings/GN6E69.ini diff --git a/Data/Sys/GameConfig/GN8E69.ini b/Data/Sys/GameSettings/GN8E69.ini similarity index 100% rename from Data/Sys/GameConfig/GN8E69.ini rename to Data/Sys/GameSettings/GN8E69.ini diff --git a/Data/Sys/GameConfig/GN8P69.ini b/Data/Sys/GameSettings/GN8P69.ini similarity index 100% rename from Data/Sys/GameConfig/GN8P69.ini rename to Data/Sys/GameSettings/GN8P69.ini diff --git a/Data/Sys/GameConfig/GNDE69.ini b/Data/Sys/GameSettings/GNDE69.ini similarity index 100% rename from Data/Sys/GameConfig/GNDE69.ini rename to Data/Sys/GameSettings/GNDE69.ini diff --git a/Data/Sys/GameConfig/GNHE5d.ini b/Data/Sys/GameSettings/GNHE5d.ini similarity index 97% rename from Data/Sys/GameConfig/GNHE5d.ini rename to Data/Sys/GameSettings/GNHE5d.ini index 17ee4b8008..8c54af0a1e 100644 --- a/Data/Sys/GameConfig/GNHE5d.ini +++ b/Data/Sys/GameSettings/GNHE5d.ini @@ -13,7 +13,7 @@ EmulationIssues = Enable the GameCube BIOS to allow the game to boot. [OnFrame] # Add memory patches to be applied every frame here. -+$Nop Hack +$Nop Hack 0x80025BA0:dword:0x60000000 [ActionReplay] diff --git a/Data/Sys/GameConfig/GNJEAF.ini b/Data/Sys/GameSettings/GNJEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GNJEAF.ini rename to Data/Sys/GameSettings/GNJEAF.ini diff --git a/Data/Sys/GameConfig/GNLE69.ini b/Data/Sys/GameSettings/GNLE69.ini similarity index 100% rename from Data/Sys/GameConfig/GNLE69.ini rename to Data/Sys/GameSettings/GNLE69.ini diff --git a/Data/Sys/GameConfig/GNNE69.ini b/Data/Sys/GameSettings/GNNE69.ini similarity index 100% rename from Data/Sys/GameConfig/GNNE69.ini rename to Data/Sys/GameSettings/GNNE69.ini diff --git a/Data/Sys/GameConfig/GNOE78.ini b/Data/Sys/GameSettings/GNOE78.ini similarity index 100% rename from Data/Sys/GameConfig/GNOE78.ini rename to Data/Sys/GameSettings/GNOE78.ini diff --git a/Data/Sys/GameConfig/GNQE69.ini b/Data/Sys/GameSettings/GNQE69.ini similarity index 100% rename from Data/Sys/GameConfig/GNQE69.ini rename to Data/Sys/GameSettings/GNQE69.ini diff --git a/Data/Sys/GameConfig/GNRJDA.ini b/Data/Sys/GameSettings/GNRJDA.ini similarity index 100% rename from Data/Sys/GameConfig/GNRJDA.ini rename to Data/Sys/GameSettings/GNRJDA.ini diff --git a/Data/Sys/GameConfig/GNUEDA.ini b/Data/Sys/GameSettings/GNUEDA.ini similarity index 100% rename from Data/Sys/GameConfig/GNUEDA.ini rename to Data/Sys/GameSettings/GNUEDA.ini diff --git a/Data/Sys/GameConfig/GNWE69.ini b/Data/Sys/GameSettings/GNWE69.ini similarity index 100% rename from Data/Sys/GameConfig/GNWE69.ini rename to Data/Sys/GameSettings/GNWE69.ini diff --git a/Data/Sys/GameConfig/GNWP69.ini b/Data/Sys/GameSettings/GNWP69.ini similarity index 100% rename from Data/Sys/GameConfig/GNWP69.ini rename to Data/Sys/GameSettings/GNWP69.ini diff --git a/Data/Sys/GameConfig/GO2E4F.ini b/Data/Sys/GameSettings/GO2E4F.ini similarity index 100% rename from Data/Sys/GameConfig/GO2E4F.ini rename to Data/Sys/GameSettings/GO2E4F.ini diff --git a/Data/Sys/GameConfig/GO7E69.ini b/Data/Sys/GameSettings/GO7E69.ini similarity index 100% rename from Data/Sys/GameConfig/GO7E69.ini rename to Data/Sys/GameSettings/GO7E69.ini diff --git a/Data/Sys/GameConfig/GO7F69.ini b/Data/Sys/GameSettings/GO7F69.ini similarity index 100% rename from Data/Sys/GameConfig/GO7F69.ini rename to Data/Sys/GameSettings/GO7F69.ini diff --git a/Data/Sys/GameConfig/GO7P69.ini b/Data/Sys/GameSettings/GO7P69.ini similarity index 100% rename from Data/Sys/GameConfig/GO7P69.ini rename to Data/Sys/GameSettings/GO7P69.ini diff --git a/Data/Sys/GameConfig/GOAE52.ini b/Data/Sys/GameSettings/GOAE52.ini similarity index 100% rename from Data/Sys/GameConfig/GOAE52.ini rename to Data/Sys/GameSettings/GOAE52.ini diff --git a/Data/Sys/GameConfig/GOBE4Z.ini b/Data/Sys/GameSettings/GOBE4Z.ini similarity index 100% rename from Data/Sys/GameConfig/GOBE4Z.ini rename to Data/Sys/GameSettings/GOBE4Z.ini diff --git a/Data/Sys/GameConfig/GOCE5D.ini b/Data/Sys/GameSettings/GOCE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GOCE5D.ini rename to Data/Sys/GameSettings/GOCE5D.ini diff --git a/Data/Sys/GameConfig/GOGJB2.ini b/Data/Sys/GameSettings/GOGJB2.ini similarity index 100% rename from Data/Sys/GameConfig/GOGJB2.ini rename to Data/Sys/GameSettings/GOGJB2.ini diff --git a/Data/Sys/GameConfig/GOME01.ini b/Data/Sys/GameSettings/GOME01.ini similarity index 100% rename from Data/Sys/GameConfig/GOME01.ini rename to Data/Sys/GameSettings/GOME01.ini diff --git a/Data/Sys/GameConfig/GOMP01.ini b/Data/Sys/GameSettings/GOMP01.ini similarity index 100% rename from Data/Sys/GameConfig/GOMP01.ini rename to Data/Sys/GameSettings/GOMP01.ini diff --git a/Data/Sys/GameConfig/GONE69.ini b/Data/Sys/GameSettings/GONE69.ini similarity index 100% rename from Data/Sys/GameConfig/GONE69.ini rename to Data/Sys/GameSettings/GONE69.ini diff --git a/Data/Sys/GameConfig/GOOE01.ini b/Data/Sys/GameSettings/GOOE01.ini similarity index 100% rename from Data/Sys/GameConfig/GOOE01.ini rename to Data/Sys/GameSettings/GOOE01.ini diff --git a/Data/Sys/GameConfig/GOPEB2.ini b/Data/Sys/GameSettings/GOPEB2.ini similarity index 100% rename from Data/Sys/GameConfig/GOPEB2.ini rename to Data/Sys/GameSettings/GOPEB2.ini diff --git a/Data/Sys/GameConfig/GOPJB2.ini b/Data/Sys/GameSettings/GOPJB2.ini similarity index 100% rename from Data/Sys/GameConfig/GOPJB2.ini rename to Data/Sys/GameSettings/GOPJB2.ini diff --git a/Data/Sys/GameConfig/GOQEAF.ini b/Data/Sys/GameSettings/GOQEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GOQEAF.ini rename to Data/Sys/GameSettings/GOQEAF.ini diff --git a/Data/Sys/GameConfig/GOSE41.ini b/Data/Sys/GameSettings/GOSE41.ini similarity index 100% rename from Data/Sys/GameConfig/GOSE41.ini rename to Data/Sys/GameSettings/GOSE41.ini diff --git a/Data/Sys/GameConfig/GOSP41.ini b/Data/Sys/GameSettings/GOSP41.ini similarity index 100% rename from Data/Sys/GameConfig/GOSP41.ini rename to Data/Sys/GameSettings/GOSP41.ini diff --git a/Data/Sys/GameConfig/GOSX41.ini b/Data/Sys/GameSettings/GOSX41.ini similarity index 100% rename from Data/Sys/GameConfig/GOSX41.ini rename to Data/Sys/GameSettings/GOSX41.ini diff --git a/Data/Sys/GameConfig/GOWD69.ini b/Data/Sys/GameSettings/GOWD69.ini similarity index 100% rename from Data/Sys/GameConfig/GOWD69.ini rename to Data/Sys/GameSettings/GOWD69.ini diff --git a/Data/Sys/GameConfig/GOWE69.ini b/Data/Sys/GameSettings/GOWE69.ini similarity index 100% rename from Data/Sys/GameConfig/GOWE69.ini rename to Data/Sys/GameSettings/GOWE69.ini diff --git a/Data/Sys/GameConfig/GOWF69.ini b/Data/Sys/GameSettings/GOWF69.ini similarity index 100% rename from Data/Sys/GameConfig/GOWF69.ini rename to Data/Sys/GameSettings/GOWF69.ini diff --git a/Data/Sys/GameConfig/GOWJ69.ini b/Data/Sys/GameSettings/GOWJ69.ini similarity index 100% rename from Data/Sys/GameConfig/GOWJ69.ini rename to Data/Sys/GameSettings/GOWJ69.ini diff --git a/Data/Sys/GameConfig/GOWP69.ini b/Data/Sys/GameSettings/GOWP69.ini similarity index 100% rename from Data/Sys/GameConfig/GOWP69.ini rename to Data/Sys/GameSettings/GOWP69.ini diff --git a/Data/Sys/GameConfig/GOYD69.ini b/Data/Sys/GameSettings/GOYD69.ini similarity index 100% rename from Data/Sys/GameConfig/GOYD69.ini rename to Data/Sys/GameSettings/GOYD69.ini diff --git a/Data/Sys/GameConfig/GOYE69.ini b/Data/Sys/GameSettings/GOYE69.ini similarity index 100% rename from Data/Sys/GameConfig/GOYE69.ini rename to Data/Sys/GameSettings/GOYE69.ini diff --git a/Data/Sys/GameConfig/GOYF69.ini b/Data/Sys/GameSettings/GOYF69.ini similarity index 100% rename from Data/Sys/GameConfig/GOYF69.ini rename to Data/Sys/GameSettings/GOYF69.ini diff --git a/Data/Sys/GameConfig/GOYP69.ini b/Data/Sys/GameSettings/GOYP69.ini similarity index 100% rename from Data/Sys/GameConfig/GOYP69.ini rename to Data/Sys/GameSettings/GOYP69.ini diff --git a/Data/Sys/GameConfig/GOYS69.ini b/Data/Sys/GameSettings/GOYS69.ini similarity index 100% rename from Data/Sys/GameConfig/GOYS69.ini rename to Data/Sys/GameSettings/GOYS69.ini diff --git a/Data/Sys/GameConfig/GP2E82.ini b/Data/Sys/GameSettings/GP2E82.ini similarity index 100% rename from Data/Sys/GameConfig/GP2E82.ini rename to Data/Sys/GameSettings/GP2E82.ini diff --git a/Data/Sys/GameConfig/GP2EAF.ini b/Data/Sys/GameSettings/GP2EAF.ini similarity index 100% rename from Data/Sys/GameConfig/GP2EAF.ini rename to Data/Sys/GameSettings/GP2EAF.ini diff --git a/Data/Sys/GameConfig/GP4J18.ini b/Data/Sys/GameSettings/GP4J18.ini similarity index 100% rename from Data/Sys/GameConfig/GP4J18.ini rename to Data/Sys/GameSettings/GP4J18.ini diff --git a/Data/Sys/GameConfig/GP5E01.ini b/Data/Sys/GameSettings/GP5E01.ini similarity index 100% rename from Data/Sys/GameConfig/GP5E01.ini rename to Data/Sys/GameSettings/GP5E01.ini diff --git a/Data/Sys/GameConfig/GP5J01.ini b/Data/Sys/GameSettings/GP5J01.ini similarity index 100% rename from Data/Sys/GameConfig/GP5J01.ini rename to Data/Sys/GameSettings/GP5J01.ini diff --git a/Data/Sys/GameConfig/GP5P01.ini b/Data/Sys/GameSettings/GP5P01.ini similarity index 100% rename from Data/Sys/GameConfig/GP5P01.ini rename to Data/Sys/GameSettings/GP5P01.ini diff --git a/Data/Sys/GameConfig/GP6E01.ini b/Data/Sys/GameSettings/GP6E01.ini similarity index 100% rename from Data/Sys/GameConfig/GP6E01.ini rename to Data/Sys/GameSettings/GP6E01.ini diff --git a/Data/Sys/GameConfig/GP6J01.ini b/Data/Sys/GameSettings/GP6J01.ini similarity index 100% rename from Data/Sys/GameConfig/GP6J01.ini rename to Data/Sys/GameSettings/GP6J01.ini diff --git a/Data/Sys/GameConfig/GP6P01.ini b/Data/Sys/GameSettings/GP6P01.ini similarity index 100% rename from Data/Sys/GameConfig/GP6P01.ini rename to Data/Sys/GameSettings/GP6P01.ini diff --git a/Data/Sys/GameConfig/GP7E01.ini b/Data/Sys/GameSettings/GP7E01.ini similarity index 100% rename from Data/Sys/GameConfig/GP7E01.ini rename to Data/Sys/GameSettings/GP7E01.ini diff --git a/Data/Sys/GameConfig/GP7J01.ini b/Data/Sys/GameSettings/GP7J01.ini similarity index 100% rename from Data/Sys/GameConfig/GP7J01.ini rename to Data/Sys/GameSettings/GP7J01.ini diff --git a/Data/Sys/GameConfig/GP7P01.ini b/Data/Sys/GameSettings/GP7P01.ini similarity index 100% rename from Data/Sys/GameConfig/GP7P01.ini rename to Data/Sys/GameSettings/GP7P01.ini diff --git a/Data/Sys/GameConfig/GP8EAF.ini b/Data/Sys/GameSettings/GP8EAF.ini similarity index 100% rename from Data/Sys/GameConfig/GP8EAF.ini rename to Data/Sys/GameSettings/GP8EAF.ini diff --git a/Data/Sys/GameConfig/GPAE01.ini b/Data/Sys/GameSettings/GPAE01.ini similarity index 100% rename from Data/Sys/GameConfig/GPAE01.ini rename to Data/Sys/GameSettings/GPAE01.ini diff --git a/Data/Sys/GameConfig/GPAJ01.ini b/Data/Sys/GameSettings/GPAJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GPAJ01.ini rename to Data/Sys/GameSettings/GPAJ01.ini diff --git a/Data/Sys/GameConfig/GPAP01.ini b/Data/Sys/GameSettings/GPAP01.ini similarity index 100% rename from Data/Sys/GameConfig/GPAP01.ini rename to Data/Sys/GameSettings/GPAP01.ini diff --git a/Data/Sys/GameConfig/GPAU01.ini b/Data/Sys/GameSettings/GPAU01.ini similarity index 100% rename from Data/Sys/GameConfig/GPAU01.ini rename to Data/Sys/GameSettings/GPAU01.ini diff --git a/Data/Sys/GameConfig/GPDE51.ini b/Data/Sys/GameSettings/GPDE51.ini similarity index 100% rename from Data/Sys/GameConfig/GPDE51.ini rename to Data/Sys/GameSettings/GPDE51.ini diff --git a/Data/Sys/GameConfig/GPEJ2Q.ini b/Data/Sys/GameSettings/GPEJ2Q.ini similarity index 100% rename from Data/Sys/GameConfig/GPEJ2Q.ini rename to Data/Sys/GameSettings/GPEJ2Q.ini diff --git a/Data/Sys/GameConfig/GPHD52.ini b/Data/Sys/GameSettings/GPHD52.ini similarity index 100% rename from Data/Sys/GameConfig/GPHD52.ini rename to Data/Sys/GameSettings/GPHD52.ini diff --git a/Data/Sys/GameConfig/GPHE52.ini b/Data/Sys/GameSettings/GPHE52.ini similarity index 100% rename from Data/Sys/GameConfig/GPHE52.ini rename to Data/Sys/GameSettings/GPHE52.ini diff --git a/Data/Sys/GameConfig/GPHP52.ini b/Data/Sys/GameSettings/GPHP52.ini similarity index 100% rename from Data/Sys/GameConfig/GPHP52.ini rename to Data/Sys/GameSettings/GPHP52.ini diff --git a/Data/Sys/GameConfig/GPIE01.ini b/Data/Sys/GameSettings/GPIE01.ini similarity index 100% rename from Data/Sys/GameConfig/GPIE01.ini rename to Data/Sys/GameSettings/GPIE01.ini diff --git a/Data/Sys/GameConfig/GPIP01.ini b/Data/Sys/GameSettings/GPIP01.ini similarity index 100% rename from Data/Sys/GameConfig/GPIP01.ini rename to Data/Sys/GameSettings/GPIP01.ini diff --git a/Data/Sys/GameConfig/GPKE41.ini b/Data/Sys/GameSettings/GPKE41.ini similarity index 100% rename from Data/Sys/GameConfig/GPKE41.ini rename to Data/Sys/GameSettings/GPKE41.ini diff --git a/Data/Sys/GameConfig/GPNE08.ini b/Data/Sys/GameSettings/GPNE08.ini similarity index 100% rename from Data/Sys/GameConfig/GPNE08.ini rename to Data/Sys/GameSettings/GPNE08.ini diff --git a/Data/Sys/GameConfig/GPNP08.ini b/Data/Sys/GameSettings/GPNP08.ini similarity index 100% rename from Data/Sys/GameConfig/GPNP08.ini rename to Data/Sys/GameSettings/GPNP08.ini diff --git a/Data/Sys/GameConfig/GPOE8P.ini b/Data/Sys/GameSettings/GPOE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GPOE8P.ini rename to Data/Sys/GameSettings/GPOE8P.ini diff --git a/Data/Sys/GameConfig/GPOP8P.ini b/Data/Sys/GameSettings/GPOP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GPOP8P.ini rename to Data/Sys/GameSettings/GPOP8P.ini diff --git a/Data/Sys/GameConfig/GPSE8P.ini b/Data/Sys/GameSettings/GPSE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GPSE8P.ini rename to Data/Sys/GameSettings/GPSE8P.ini diff --git a/Data/Sys/GameConfig/GPSP8P.ini b/Data/Sys/GameSettings/GPSP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GPSP8P.ini rename to Data/Sys/GameSettings/GPSP8P.ini diff --git a/Data/Sys/GameConfig/GPTE41.ini b/Data/Sys/GameSettings/GPTE41.ini similarity index 100% rename from Data/Sys/GameConfig/GPTE41.ini rename to Data/Sys/GameSettings/GPTE41.ini diff --git a/Data/Sys/GameConfig/GPTP41.ini b/Data/Sys/GameSettings/GPTP41.ini similarity index 100% rename from Data/Sys/GameConfig/GPTP41.ini rename to Data/Sys/GameSettings/GPTP41.ini diff --git a/Data/Sys/GameConfig/GPVE01.ini b/Data/Sys/GameSettings/GPVE01.ini similarity index 100% rename from Data/Sys/GameConfig/GPVE01.ini rename to Data/Sys/GameSettings/GPVE01.ini diff --git a/Data/Sys/GameConfig/GPVP01.ini b/Data/Sys/GameSettings/GPVP01.ini similarity index 100% rename from Data/Sys/GameConfig/GPVP01.ini rename to Data/Sys/GameSettings/GPVP01.ini diff --git a/Data/Sys/GameConfig/GPXP01.ini b/Data/Sys/GameSettings/GPXP01.ini similarity index 100% rename from Data/Sys/GameConfig/GPXP01.ini rename to Data/Sys/GameSettings/GPXP01.ini diff --git a/Data/Sys/GameConfig/GPZJ01.ini b/Data/Sys/GameSettings/GPZJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GPZJ01.ini rename to Data/Sys/GameSettings/GPZJ01.ini diff --git a/Data/Sys/GameConfig/GQ8E69.ini b/Data/Sys/GameSettings/GQ8E69.ini similarity index 100% rename from Data/Sys/GameConfig/GQ8E69.ini rename to Data/Sys/GameSettings/GQ8E69.ini diff --git a/Data/Sys/GameConfig/GQCD52.ini b/Data/Sys/GameSettings/GQCD52.ini similarity index 98% rename from Data/Sys/GameConfig/GQCD52.ini rename to Data/Sys/GameSettings/GQCD52.ini index bed0ef720c..e69adf6d19 100644 --- a/Data/Sys/GameConfig/GQCD52.ini +++ b/Data/Sys/GameSettings/GQCD52.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] \ No newline at end of file diff --git a/Data/Sys/GameConfig/GQCE52.ini b/Data/Sys/GameSettings/GQCE52.ini similarity index 98% rename from Data/Sys/GameConfig/GQCE52.ini rename to Data/Sys/GameSettings/GQCE52.ini index 4d7a73a134..8f3452a597 100644 --- a/Data/Sys/GameConfig/GQCE52.ini +++ b/Data/Sys/GameSettings/GQCE52.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GQCF52.ini b/Data/Sys/GameSettings/GQCF52.ini similarity index 98% rename from Data/Sys/GameConfig/GQCF52.ini rename to Data/Sys/GameSettings/GQCF52.ini index 29e4d50f68..da55f72b96 100644 --- a/Data/Sys/GameConfig/GQCF52.ini +++ b/Data/Sys/GameSettings/GQCF52.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] \ No newline at end of file diff --git a/Data/Sys/GameConfig/GQCI52.ini b/Data/Sys/GameSettings/GQCI52.ini similarity index 100% rename from Data/Sys/GameConfig/GQCI52.ini rename to Data/Sys/GameSettings/GQCI52.ini diff --git a/Data/Sys/GameConfig/GQCP52.ini b/Data/Sys/GameSettings/GQCP52.ini similarity index 98% rename from Data/Sys/GameConfig/GQCP52.ini rename to Data/Sys/GameSettings/GQCP52.ini index 68e6d65851..6c8850c4f1 100644 --- a/Data/Sys/GameConfig/GQCP52.ini +++ b/Data/Sys/GameSettings/GQCP52.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] \ No newline at end of file diff --git a/Data/Sys/GameConfig/GQCS52.ini b/Data/Sys/GameSettings/GQCS52.ini similarity index 98% rename from Data/Sys/GameConfig/GQCS52.ini rename to Data/Sys/GameSettings/GQCS52.ini index 54fdb0d90b..1da24daea4 100644 --- a/Data/Sys/GameConfig/GQCS52.ini +++ b/Data/Sys/GameSettings/GQCS52.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GQLE9G.ini b/Data/Sys/GameSettings/GQLE9G.ini similarity index 100% rename from Data/Sys/GameConfig/GQLE9G.ini rename to Data/Sys/GameSettings/GQLE9G.ini diff --git a/Data/Sys/GameConfig/GQNE5D.ini b/Data/Sys/GameSettings/GQNE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GQNE5D.ini rename to Data/Sys/GameSettings/GQNE5D.ini diff --git a/Data/Sys/GameConfig/GQSDAF.ini b/Data/Sys/GameSettings/GQSDAF.ini similarity index 100% rename from Data/Sys/GameConfig/GQSDAF.ini rename to Data/Sys/GameSettings/GQSDAF.ini diff --git a/Data/Sys/GameConfig/GQSEAF.ini b/Data/Sys/GameSettings/GQSEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GQSEAF.ini rename to Data/Sys/GameSettings/GQSEAF.ini diff --git a/Data/Sys/GameConfig/GQSFAF.ini b/Data/Sys/GameSettings/GQSFAF.ini similarity index 100% rename from Data/Sys/GameConfig/GQSFAF.ini rename to Data/Sys/GameSettings/GQSFAF.ini diff --git a/Data/Sys/GameConfig/GQSPAF.ini b/Data/Sys/GameSettings/GQSPAF.ini similarity index 100% rename from Data/Sys/GameConfig/GQSPAF.ini rename to Data/Sys/GameSettings/GQSPAF.ini diff --git a/Data/Sys/GameConfig/GQTE4Q.ini b/Data/Sys/GameSettings/GQTE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/GQTE4Q.ini rename to Data/Sys/GameSettings/GQTE4Q.ini diff --git a/Data/Sys/GameConfig/GQWE69.ini b/Data/Sys/GameSettings/GQWE69.ini similarity index 100% rename from Data/Sys/GameConfig/GQWE69.ini rename to Data/Sys/GameSettings/GQWE69.ini diff --git a/Data/Sys/GameConfig/GQWJ69.ini b/Data/Sys/GameSettings/GQWJ69.ini similarity index 100% rename from Data/Sys/GameConfig/GQWJ69.ini rename to Data/Sys/GameSettings/GQWJ69.ini diff --git a/Data/Sys/GameConfig/GQWP69.ini b/Data/Sys/GameSettings/GQWP69.ini similarity index 100% rename from Data/Sys/GameConfig/GQWP69.ini rename to Data/Sys/GameSettings/GQWP69.ini diff --git a/Data/Sys/GameConfig/GQWX69.ini b/Data/Sys/GameSettings/GQWX69.ini similarity index 100% rename from Data/Sys/GameConfig/GQWX69.ini rename to Data/Sys/GameSettings/GQWX69.ini diff --git a/Data/Sys/GameConfig/GQXE69.ini b/Data/Sys/GameSettings/GQXE69.ini similarity index 100% rename from Data/Sys/GameConfig/GQXE69.ini rename to Data/Sys/GameSettings/GQXE69.ini diff --git a/Data/Sys/GameConfig/GR2E52.ini b/Data/Sys/GameSettings/GR2E52.ini similarity index 100% rename from Data/Sys/GameConfig/GR2E52.ini rename to Data/Sys/GameSettings/GR2E52.ini diff --git a/Data/Sys/GameConfig/GR6E78.ini b/Data/Sys/GameSettings/GR6E78.ini similarity index 100% rename from Data/Sys/GameConfig/GR6E78.ini rename to Data/Sys/GameSettings/GR6E78.ini diff --git a/Data/Sys/GameConfig/GR8D69.ini b/Data/Sys/GameSettings/GR8D69.ini similarity index 98% rename from Data/Sys/GameConfig/GR8D69.ini rename to Data/Sys/GameSettings/GR8D69.ini index e314d09dc9..9137bd8be8 100644 --- a/Data/Sys/GameConfig/GR8D69.ini +++ b/Data/Sys/GameSettings/GR8D69.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GR8E69.ini b/Data/Sys/GameSettings/GR8E69.ini similarity index 98% rename from Data/Sys/GameConfig/GR8E69.ini rename to Data/Sys/GameSettings/GR8E69.ini index 9114a39003..616f8db8c0 100644 --- a/Data/Sys/GameConfig/GR8E69.ini +++ b/Data/Sys/GameSettings/GR8E69.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GR8F69.ini b/Data/Sys/GameSettings/GR8F69.ini similarity index 98% rename from Data/Sys/GameConfig/GR8F69.ini rename to Data/Sys/GameSettings/GR8F69.ini index 4bf6f432ab..738cd33de7 100644 --- a/Data/Sys/GameConfig/GR8F69.ini +++ b/Data/Sys/GameSettings/GR8F69.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GR8J69.ini b/Data/Sys/GameSettings/GR8J69.ini similarity index 98% rename from Data/Sys/GameConfig/GR8J69.ini rename to Data/Sys/GameSettings/GR8J69.ini index 7b3a2e8d96..c66e915d6f 100644 --- a/Data/Sys/GameConfig/GR8J69.ini +++ b/Data/Sys/GameSettings/GR8J69.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GR8P69.ini b/Data/Sys/GameSettings/GR8P69.ini similarity index 98% rename from Data/Sys/GameConfig/GR8P69.ini rename to Data/Sys/GameSettings/GR8P69.ini index 47e646f884..f9845f3af2 100644 --- a/Data/Sys/GameConfig/GR8P69.ini +++ b/Data/Sys/GameSettings/GR8P69.ini @@ -17,4 +17,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GRAE5Z.ini b/Data/Sys/GameSettings/GRAE5Z.ini similarity index 100% rename from Data/Sys/GameConfig/GRAE5Z.ini rename to Data/Sys/GameSettings/GRAE5Z.ini diff --git a/Data/Sys/GameConfig/GRBE6S.ini b/Data/Sys/GameSettings/GRBE6S.ini similarity index 100% rename from Data/Sys/GameConfig/GRBE6S.ini rename to Data/Sys/GameSettings/GRBE6S.ini diff --git a/Data/Sys/GameConfig/GRBP6S.ini b/Data/Sys/GameSettings/GRBP6S.ini similarity index 100% rename from Data/Sys/GameConfig/GRBP6S.ini rename to Data/Sys/GameSettings/GRBP6S.ini diff --git a/Data/Sys/GameConfig/GREE08.ini b/Data/Sys/GameSettings/GREE08.ini similarity index 100% rename from Data/Sys/GameConfig/GREE08.ini rename to Data/Sys/GameSettings/GREE08.ini diff --git a/Data/Sys/GameConfig/GREP08.ini b/Data/Sys/GameSettings/GREP08.ini similarity index 100% rename from Data/Sys/GameConfig/GREP08.ini rename to Data/Sys/GameSettings/GREP08.ini diff --git a/Data/Sys/GameConfig/GRFE78.ini b/Data/Sys/GameSettings/GRFE78.ini similarity index 100% rename from Data/Sys/GameConfig/GRFE78.ini rename to Data/Sys/GameSettings/GRFE78.ini diff --git a/Data/Sys/GameConfig/GRHE41.ini b/Data/Sys/GameSettings/GRHE41.ini similarity index 100% rename from Data/Sys/GameConfig/GRHE41.ini rename to Data/Sys/GameSettings/GRHE41.ini diff --git a/Data/Sys/GameConfig/GRHP41.ini b/Data/Sys/GameSettings/GRHP41.ini similarity index 100% rename from Data/Sys/GameConfig/GRHP41.ini rename to Data/Sys/GameSettings/GRHP41.ini diff --git a/Data/Sys/GameConfig/GRJEAF.ini b/Data/Sys/GameSettings/GRJEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GRJEAF.ini rename to Data/Sys/GameSettings/GRJEAF.ini diff --git a/Data/Sys/GameConfig/GRKE41.ini b/Data/Sys/GameSettings/GRKE41.ini similarity index 100% rename from Data/Sys/GameConfig/GRKE41.ini rename to Data/Sys/GameSettings/GRKE41.ini diff --git a/Data/Sys/GameConfig/GRKP7G.ini b/Data/Sys/GameSettings/GRKP7G.ini similarity index 100% rename from Data/Sys/GameConfig/GRKP7G.ini rename to Data/Sys/GameSettings/GRKP7G.ini diff --git a/Data/Sys/GameConfig/GRLE41.ini b/Data/Sys/GameSettings/GRLE41.ini similarity index 100% rename from Data/Sys/GameConfig/GRLE41.ini rename to Data/Sys/GameSettings/GRLE41.ini diff --git a/Data/Sys/GameConfig/GRNE52.ini b/Data/Sys/GameSettings/GRNE52.ini similarity index 100% rename from Data/Sys/GameConfig/GRNE52.ini rename to Data/Sys/GameSettings/GRNE52.ini diff --git a/Data/Sys/GameConfig/GROP7J.ini b/Data/Sys/GameSettings/GROP7J.ini similarity index 100% rename from Data/Sys/GameConfig/GROP7J.ini rename to Data/Sys/GameSettings/GROP7J.ini diff --git a/Data/Sys/GameConfig/GRQE41.ini b/Data/Sys/GameSettings/GRQE41.ini similarity index 100% rename from Data/Sys/GameConfig/GRQE41.ini rename to Data/Sys/GameSettings/GRQE41.ini diff --git a/Data/Sys/GameConfig/GRSEAF.ini b/Data/Sys/GameSettings/GRSEAF.ini similarity index 100% rename from Data/Sys/GameConfig/GRSEAF.ini rename to Data/Sys/GameSettings/GRSEAF.ini diff --git a/Data/Sys/GameConfig/GRSPAF.ini b/Data/Sys/GameSettings/GRSPAF.ini similarity index 100% rename from Data/Sys/GameConfig/GRSPAF.ini rename to Data/Sys/GameSettings/GRSPAF.ini diff --git a/Data/Sys/GameConfig/GRUE78.ini b/Data/Sys/GameSettings/GRUE78.ini similarity index 100% rename from Data/Sys/GameConfig/GRUE78.ini rename to Data/Sys/GameSettings/GRUE78.ini diff --git a/Data/Sys/GameConfig/GRVEA4.ini b/Data/Sys/GameSettings/GRVEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GRVEA4.ini rename to Data/Sys/GameSettings/GRVEA4.ini diff --git a/Data/Sys/GameConfig/GRYE41.ini b/Data/Sys/GameSettings/GRYE41.ini similarity index 100% rename from Data/Sys/GameConfig/GRYE41.ini rename to Data/Sys/GameSettings/GRYE41.ini diff --git a/Data/Sys/GameConfig/GS2D78.ini b/Data/Sys/GameSettings/GS2D78.ini similarity index 100% rename from Data/Sys/GameConfig/GS2D78.ini rename to Data/Sys/GameSettings/GS2D78.ini diff --git a/Data/Sys/GameConfig/GS2E78.ini b/Data/Sys/GameSettings/GS2E78.ini similarity index 100% rename from Data/Sys/GameConfig/GS2E78.ini rename to Data/Sys/GameSettings/GS2E78.ini diff --git a/Data/Sys/GameConfig/GS2F78.ini b/Data/Sys/GameSettings/GS2F78.ini similarity index 100% rename from Data/Sys/GameConfig/GS2F78.ini rename to Data/Sys/GameSettings/GS2F78.ini diff --git a/Data/Sys/GameConfig/GS2P78.ini b/Data/Sys/GameSettings/GS2P78.ini similarity index 100% rename from Data/Sys/GameConfig/GS2P78.ini rename to Data/Sys/GameSettings/GS2P78.ini diff --git a/Data/Sys/GameConfig/GS8P7D.ini b/Data/Sys/GameSettings/GS8P7D.ini similarity index 100% rename from Data/Sys/GameConfig/GS8P7D.ini rename to Data/Sys/GameSettings/GS8P7D.ini diff --git a/Data/Sys/GameConfig/GSAE01.ini b/Data/Sys/GameSettings/GSAE01.ini similarity index 100% rename from Data/Sys/GameConfig/GSAE01.ini rename to Data/Sys/GameSettings/GSAE01.ini diff --git a/Data/Sys/GameConfig/GSAP01.ini b/Data/Sys/GameSettings/GSAP01.ini similarity index 100% rename from Data/Sys/GameConfig/GSAP01.ini rename to Data/Sys/GameSettings/GSAP01.ini diff --git a/Data/Sys/GameConfig/GSCE51.ini b/Data/Sys/GameSettings/GSCE51.ini similarity index 100% rename from Data/Sys/GameConfig/GSCE51.ini rename to Data/Sys/GameSettings/GSCE51.ini diff --git a/Data/Sys/GameConfig/GSEJB2.ini b/Data/Sys/GameSettings/GSEJB2.ini similarity index 100% rename from Data/Sys/GameConfig/GSEJB2.ini rename to Data/Sys/GameSettings/GSEJB2.ini diff --git a/Data/Sys/GameConfig/GSMP52.ini b/Data/Sys/GameSettings/GSMP52.ini similarity index 100% rename from Data/Sys/GameConfig/GSMP52.ini rename to Data/Sys/GameSettings/GSMP52.ini diff --git a/Data/Sys/GameConfig/GSNE8P.ini b/Data/Sys/GameSettings/GSNE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GSNE8P.ini rename to Data/Sys/GameSettings/GSNE8P.ini diff --git a/Data/Sys/GameConfig/GSNP8P.ini b/Data/Sys/GameSettings/GSNP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GSNP8P.ini rename to Data/Sys/GameSettings/GSNP8P.ini diff --git a/Data/Sys/GameConfig/GSOE8P.ini b/Data/Sys/GameSettings/GSOE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GSOE8P.ini rename to Data/Sys/GameSettings/GSOE8P.ini diff --git a/Data/Sys/GameConfig/GSOP8P.ini b/Data/Sys/GameSettings/GSOP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GSOP8P.ini rename to Data/Sys/GameSettings/GSOP8P.ini diff --git a/Data/Sys/GameConfig/GSPE69.ini b/Data/Sys/GameSettings/GSPE69.ini similarity index 100% rename from Data/Sys/GameConfig/GSPE69.ini rename to Data/Sys/GameSettings/GSPE69.ini diff --git a/Data/Sys/GameConfig/GSSE8P.ini b/Data/Sys/GameSettings/GSSE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GSSE8P.ini rename to Data/Sys/GameSettings/GSSE8P.ini diff --git a/Data/Sys/GameConfig/GSSJ8P.ini b/Data/Sys/GameSettings/GSSJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/GSSJ8P.ini rename to Data/Sys/GameSettings/GSSJ8P.ini diff --git a/Data/Sys/GameConfig/GSSP70.ini b/Data/Sys/GameSettings/GSSP70.ini similarity index 100% rename from Data/Sys/GameConfig/GSSP70.ini rename to Data/Sys/GameSettings/GSSP70.ini diff --git a/Data/Sys/GameConfig/GSSP8P.ini b/Data/Sys/GameSettings/GSSP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GSSP8P.ini rename to Data/Sys/GameSettings/GSSP8P.ini diff --git a/Data/Sys/GameConfig/GSTE69.ini b/Data/Sys/GameSettings/GSTE69.ini similarity index 100% rename from Data/Sys/GameConfig/GSTE69.ini rename to Data/Sys/GameSettings/GSTE69.ini diff --git a/Data/Sys/GameConfig/GSTP69.ini b/Data/Sys/GameSettings/GSTP69.ini similarity index 100% rename from Data/Sys/GameConfig/GSTP69.ini rename to Data/Sys/GameSettings/GSTP69.ini diff --git a/Data/Sys/GameConfig/GSWE64.ini b/Data/Sys/GameSettings/GSWE64.ini similarity index 100% rename from Data/Sys/GameConfig/GSWE64.ini rename to Data/Sys/GameSettings/GSWE64.ini diff --git a/Data/Sys/GameConfig/GSWP64.ini b/Data/Sys/GameSettings/GSWP64.ini similarity index 100% rename from Data/Sys/GameConfig/GSWP64.ini rename to Data/Sys/GameSettings/GSWP64.ini diff --git a/Data/Sys/GameConfig/GSWS64.ini b/Data/Sys/GameSettings/GSWS64.ini similarity index 100% rename from Data/Sys/GameConfig/GSWS64.ini rename to Data/Sys/GameSettings/GSWS64.ini diff --git a/Data/Sys/GameConfig/GSZP41.ini b/Data/Sys/GameSettings/GSZP41.ini similarity index 100% rename from Data/Sys/GameConfig/GSZP41.ini rename to Data/Sys/GameSettings/GSZP41.ini diff --git a/Data/Sys/GameConfig/GT3D52.ini b/Data/Sys/GameSettings/GT3D52.ini similarity index 100% rename from Data/Sys/GameConfig/GT3D52.ini rename to Data/Sys/GameSettings/GT3D52.ini diff --git a/Data/Sys/GameConfig/GT3E52.ini b/Data/Sys/GameSettings/GT3E52.ini similarity index 100% rename from Data/Sys/GameConfig/GT3E52.ini rename to Data/Sys/GameSettings/GT3E52.ini diff --git a/Data/Sys/GameConfig/GT3F52.ini b/Data/Sys/GameSettings/GT3F52.ini similarity index 100% rename from Data/Sys/GameConfig/GT3F52.ini rename to Data/Sys/GameSettings/GT3F52.ini diff --git a/Data/Sys/GameConfig/GT3P52.ini b/Data/Sys/GameSettings/GT3P52.ini similarity index 100% rename from Data/Sys/GameConfig/GT3P52.ini rename to Data/Sys/GameSettings/GT3P52.ini diff --git a/Data/Sys/GameConfig/GT6E70.ini b/Data/Sys/GameSettings/GT6E70.ini similarity index 100% rename from Data/Sys/GameConfig/GT6E70.ini rename to Data/Sys/GameSettings/GT6E70.ini diff --git a/Data/Sys/GameConfig/GT7E41.ini b/Data/Sys/GameSettings/GT7E41.ini similarity index 100% rename from Data/Sys/GameConfig/GT7E41.ini rename to Data/Sys/GameSettings/GT7E41.ini diff --git a/Data/Sys/GameConfig/GT7P41.ini b/Data/Sys/GameSettings/GT7P41.ini similarity index 100% rename from Data/Sys/GameConfig/GT7P41.ini rename to Data/Sys/GameSettings/GT7P41.ini diff --git a/Data/Sys/GameConfig/GT7X41.ini b/Data/Sys/GameSettings/GT7X41.ini similarity index 100% rename from Data/Sys/GameConfig/GT7X41.ini rename to Data/Sys/GameSettings/GT7X41.ini diff --git a/Data/Sys/GameConfig/GT8E78.ini b/Data/Sys/GameSettings/GT8E78.ini similarity index 100% rename from Data/Sys/GameConfig/GT8E78.ini rename to Data/Sys/GameSettings/GT8E78.ini diff --git a/Data/Sys/GameConfig/GTCJBL.ini b/Data/Sys/GameSettings/GTCJBL.ini similarity index 100% rename from Data/Sys/GameConfig/GTCJBL.ini rename to Data/Sys/GameSettings/GTCJBL.ini diff --git a/Data/Sys/GameConfig/GTEE01.ini b/Data/Sys/GameSettings/GTEE01.ini similarity index 100% rename from Data/Sys/GameConfig/GTEE01.ini rename to Data/Sys/GameSettings/GTEE01.ini diff --git a/Data/Sys/GameConfig/GTEP01.ini b/Data/Sys/GameSettings/GTEP01.ini similarity index 100% rename from Data/Sys/GameConfig/GTEP01.ini rename to Data/Sys/GameSettings/GTEP01.ini diff --git a/Data/Sys/GameConfig/GTFEA4.ini b/Data/Sys/GameSettings/GTFEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GTFEA4.ini rename to Data/Sys/GameSettings/GTFEA4.ini diff --git a/Data/Sys/GameConfig/GTKE51.ini b/Data/Sys/GameSettings/GTKE51.ini similarity index 100% rename from Data/Sys/GameConfig/GTKE51.ini rename to Data/Sys/GameSettings/GTKE51.ini diff --git a/Data/Sys/GameConfig/GTKP51.ini b/Data/Sys/GameSettings/GTKP51.ini similarity index 100% rename from Data/Sys/GameConfig/GTKP51.ini rename to Data/Sys/GameSettings/GTKP51.ini diff --git a/Data/Sys/GameConfig/GTLE52.ini b/Data/Sys/GameSettings/GTLE52.ini similarity index 100% rename from Data/Sys/GameConfig/GTLE52.ini rename to Data/Sys/GameSettings/GTLE52.ini diff --git a/Data/Sys/GameConfig/GTLP52.ini b/Data/Sys/GameSettings/GTLP52.ini similarity index 100% rename from Data/Sys/GameConfig/GTLP52.ini rename to Data/Sys/GameSettings/GTLP52.ini diff --git a/Data/Sys/GameConfig/GTLX52.ini b/Data/Sys/GameSettings/GTLX52.ini similarity index 100% rename from Data/Sys/GameConfig/GTLX52.ini rename to Data/Sys/GameSettings/GTLX52.ini diff --git a/Data/Sys/GameConfig/GTSE4F.ini b/Data/Sys/GameSettings/GTSE4F.ini similarity index 100% rename from Data/Sys/GameConfig/GTSE4F.ini rename to Data/Sys/GameSettings/GTSE4F.ini diff --git a/Data/Sys/GameConfig/GTSP4F.ini b/Data/Sys/GameSettings/GTSP4F.ini similarity index 100% rename from Data/Sys/GameConfig/GTSP4F.ini rename to Data/Sys/GameSettings/GTSP4F.ini diff --git a/Data/Sys/GameConfig/GTUE8G.ini b/Data/Sys/GameSettings/GTUE8G.ini similarity index 100% rename from Data/Sys/GameConfig/GTUE8G.ini rename to Data/Sys/GameSettings/GTUE8G.ini diff --git a/Data/Sys/GameConfig/GTWE70.ini b/Data/Sys/GameSettings/GTWE70.ini similarity index 100% rename from Data/Sys/GameConfig/GTWE70.ini rename to Data/Sys/GameSettings/GTWE70.ini diff --git a/Data/Sys/GameConfig/GTWP70.ini b/Data/Sys/GameSettings/GTWP70.ini similarity index 100% rename from Data/Sys/GameConfig/GTWP70.ini rename to Data/Sys/GameSettings/GTWP70.ini diff --git a/Data/Sys/GameConfig/GTYE69.ini b/Data/Sys/GameSettings/GTYE69.ini similarity index 100% rename from Data/Sys/GameConfig/GTYE69.ini rename to Data/Sys/GameSettings/GTYE69.ini diff --git a/Data/Sys/GameConfig/GTYP69.ini b/Data/Sys/GameSettings/GTYP69.ini similarity index 100% rename from Data/Sys/GameConfig/GTYP69.ini rename to Data/Sys/GameSettings/GTYP69.ini diff --git a/Data/Sys/GameConfig/GTZE41.ini b/Data/Sys/GameSettings/GTZE41.ini similarity index 100% rename from Data/Sys/GameConfig/GTZE41.ini rename to Data/Sys/GameSettings/GTZE41.ini diff --git a/Data/Sys/GameConfig/GTZP41.ini b/Data/Sys/GameSettings/GTZP41.ini similarity index 100% rename from Data/Sys/GameConfig/GTZP41.ini rename to Data/Sys/GameSettings/GTZP41.ini diff --git a/Data/Sys/GameConfig/GUBE69.ini b/Data/Sys/GameSettings/GUBE69.ini similarity index 100% rename from Data/Sys/GameConfig/GUBE69.ini rename to Data/Sys/GameSettings/GUBE69.ini diff --git a/Data/Sys/GameConfig/GUBP69.ini b/Data/Sys/GameSettings/GUBP69.ini similarity index 100% rename from Data/Sys/GameConfig/GUBP69.ini rename to Data/Sys/GameSettings/GUBP69.ini diff --git a/Data/Sys/GameConfig/GUCP69.ini b/Data/Sys/GameSettings/GUCP69.ini similarity index 100% rename from Data/Sys/GameConfig/GUCP69.ini rename to Data/Sys/GameSettings/GUCP69.ini diff --git a/Data/Sys/GameConfig/GUFE4Z.ini b/Data/Sys/GameSettings/GUFE4Z.ini similarity index 100% rename from Data/Sys/GameConfig/GUFE4Z.ini rename to Data/Sys/GameSettings/GUFE4Z.ini diff --git a/Data/Sys/GameConfig/GUGE69.ini b/Data/Sys/GameSettings/GUGE69.ini similarity index 100% rename from Data/Sys/GameConfig/GUGE69.ini rename to Data/Sys/GameSettings/GUGE69.ini diff --git a/Data/Sys/GameConfig/GUME52.ini b/Data/Sys/GameSettings/GUME52.ini similarity index 100% rename from Data/Sys/GameConfig/GUME52.ini rename to Data/Sys/GameSettings/GUME52.ini diff --git a/Data/Sys/GameConfig/GUMP52.ini b/Data/Sys/GameSettings/GUMP52.ini similarity index 100% rename from Data/Sys/GameConfig/GUMP52.ini rename to Data/Sys/GameSettings/GUMP52.ini diff --git a/Data/Sys/GameConfig/GUNE5D.ini b/Data/Sys/GameSettings/GUNE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GUNE5D.ini rename to Data/Sys/GameSettings/GUNE5D.ini diff --git a/Data/Sys/GameConfig/GUPE8P.ini b/Data/Sys/GameSettings/GUPE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GUPE8P.ini rename to Data/Sys/GameSettings/GUPE8P.ini diff --git a/Data/Sys/GameConfig/GUPP8P.ini b/Data/Sys/GameSettings/GUPP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GUPP8P.ini rename to Data/Sys/GameSettings/GUPP8P.ini diff --git a/Data/Sys/GameConfig/GUTE52.ini b/Data/Sys/GameSettings/GUTE52.ini similarity index 100% rename from Data/Sys/GameConfig/GUTE52.ini rename to Data/Sys/GameSettings/GUTE52.ini diff --git a/Data/Sys/GameConfig/GUVE51.ini b/Data/Sys/GameSettings/GUVE51.ini similarity index 100% rename from Data/Sys/GameConfig/GUVE51.ini rename to Data/Sys/GameSettings/GUVE51.ini diff --git a/Data/Sys/GameConfig/GUZE41.ini b/Data/Sys/GameSettings/GUZE41.ini similarity index 100% rename from Data/Sys/GameConfig/GUZE41.ini rename to Data/Sys/GameSettings/GUZE41.ini diff --git a/Data/Sys/GameConfig/GUZP41.ini b/Data/Sys/GameSettings/GUZP41.ini similarity index 100% rename from Data/Sys/GameConfig/GUZP41.ini rename to Data/Sys/GameSettings/GUZP41.ini diff --git a/Data/Sys/GameConfig/GV3E70.ini b/Data/Sys/GameSettings/GV3E70.ini similarity index 100% rename from Data/Sys/GameConfig/GV3E70.ini rename to Data/Sys/GameSettings/GV3E70.ini diff --git a/Data/Sys/GameConfig/GV3P70.ini b/Data/Sys/GameSettings/GV3P70.ini similarity index 100% rename from Data/Sys/GameConfig/GV3P70.ini rename to Data/Sys/GameSettings/GV3P70.ini diff --git a/Data/Sys/GameConfig/GVCE08.ini b/Data/Sys/GameSettings/GVCE08.ini similarity index 100% rename from Data/Sys/GameConfig/GVCE08.ini rename to Data/Sys/GameSettings/GVCE08.ini diff --git a/Data/Sys/GameConfig/GVCP08.ini b/Data/Sys/GameSettings/GVCP08.ini similarity index 100% rename from Data/Sys/GameConfig/GVCP08.ini rename to Data/Sys/GameSettings/GVCP08.ini diff --git a/Data/Sys/GameConfig/GVDE78.ini b/Data/Sys/GameSettings/GVDE78.ini similarity index 100% rename from Data/Sys/GameConfig/GVDE78.ini rename to Data/Sys/GameSettings/GVDE78.ini diff --git a/Data/Sys/GameConfig/GVHE4F.ini b/Data/Sys/GameSettings/GVHE4F.ini similarity index 100% rename from Data/Sys/GameConfig/GVHE4F.ini rename to Data/Sys/GameSettings/GVHE4F.ini diff --git a/Data/Sys/GameConfig/GVJE08.ini b/Data/Sys/GameSettings/GVJE08.ini similarity index 100% rename from Data/Sys/GameConfig/GVJE08.ini rename to Data/Sys/GameSettings/GVJE08.ini diff --git a/Data/Sys/GameConfig/GVJJ08.ini b/Data/Sys/GameSettings/GVJJ08.ini similarity index 100% rename from Data/Sys/GameConfig/GVJJ08.ini rename to Data/Sys/GameSettings/GVJJ08.ini diff --git a/Data/Sys/GameConfig/GVJP08.ini b/Data/Sys/GameSettings/GVJP08.ini similarity index 100% rename from Data/Sys/GameConfig/GVJP08.ini rename to Data/Sys/GameSettings/GVJP08.ini diff --git a/Data/Sys/GameConfig/GVKE52.ini b/Data/Sys/GameSettings/GVKE52.ini similarity index 100% rename from Data/Sys/GameConfig/GVKE52.ini rename to Data/Sys/GameSettings/GVKE52.ini diff --git a/Data/Sys/GameConfig/GVLD69.ini b/Data/Sys/GameSettings/GVLD69.ini similarity index 100% rename from Data/Sys/GameConfig/GVLD69.ini rename to Data/Sys/GameSettings/GVLD69.ini diff --git a/Data/Sys/GameConfig/GVLE69.ini b/Data/Sys/GameSettings/GVLE69.ini similarity index 100% rename from Data/Sys/GameConfig/GVLE69.ini rename to Data/Sys/GameSettings/GVLE69.ini diff --git a/Data/Sys/GameConfig/GVLF69.ini b/Data/Sys/GameSettings/GVLF69.ini similarity index 100% rename from Data/Sys/GameConfig/GVLF69.ini rename to Data/Sys/GameSettings/GVLF69.ini diff --git a/Data/Sys/GameConfig/GVLP69.ini b/Data/Sys/GameSettings/GVLP69.ini similarity index 100% rename from Data/Sys/GameConfig/GVLP69.ini rename to Data/Sys/GameSettings/GVLP69.ini diff --git a/Data/Sys/GameConfig/GVRE7H.ini b/Data/Sys/GameSettings/GVRE7H.ini similarity index 100% rename from Data/Sys/GameConfig/GVRE7H.ini rename to Data/Sys/GameSettings/GVRE7H.ini diff --git a/Data/Sys/GameConfig/GVSE8P.ini b/Data/Sys/GameSettings/GVSE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GVSE8P.ini rename to Data/Sys/GameSettings/GVSE8P.ini diff --git a/Data/Sys/GameConfig/GVSP8P.ini b/Data/Sys/GameSettings/GVSP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GVSP8P.ini rename to Data/Sys/GameSettings/GVSP8P.ini diff --git a/Data/Sys/GameConfig/GW2E78.ini b/Data/Sys/GameSettings/GW2E78.ini similarity index 100% rename from Data/Sys/GameConfig/GW2E78.ini rename to Data/Sys/GameSettings/GW2E78.ini diff --git a/Data/Sys/GameConfig/GW2P78.ini b/Data/Sys/GameSettings/GW2P78.ini similarity index 100% rename from Data/Sys/GameConfig/GW2P78.ini rename to Data/Sys/GameSettings/GW2P78.ini diff --git a/Data/Sys/GameConfig/GW3E78.ini b/Data/Sys/GameSettings/GW3E78.ini similarity index 100% rename from Data/Sys/GameConfig/GW3E78.ini rename to Data/Sys/GameSettings/GW3E78.ini diff --git a/Data/Sys/GameConfig/GW3P78.ini b/Data/Sys/GameSettings/GW3P78.ini similarity index 100% rename from Data/Sys/GameConfig/GW3P78.ini rename to Data/Sys/GameSettings/GW3P78.ini diff --git a/Data/Sys/GameConfig/GW5E69.ini b/Data/Sys/GameSettings/GW5E69.ini similarity index 100% rename from Data/Sys/GameConfig/GW5E69.ini rename to Data/Sys/GameSettings/GW5E69.ini diff --git a/Data/Sys/GameConfig/GW7E69.ini b/Data/Sys/GameSettings/GW7E69.ini similarity index 100% rename from Data/Sys/GameConfig/GW7E69.ini rename to Data/Sys/GameSettings/GW7E69.ini diff --git a/Data/Sys/GameConfig/GW7P69.ini b/Data/Sys/GameSettings/GW7P69.ini similarity index 100% rename from Data/Sys/GameConfig/GW7P69.ini rename to Data/Sys/GameSettings/GW7P69.ini diff --git a/Data/Sys/GameConfig/GW8E52.ini b/Data/Sys/GameSettings/GW8E52.ini similarity index 100% rename from Data/Sys/GameConfig/GW8E52.ini rename to Data/Sys/GameSettings/GW8E52.ini diff --git a/Data/Sys/GameConfig/GW9E78.ini b/Data/Sys/GameSettings/GW9E78.ini similarity index 100% rename from Data/Sys/GameConfig/GW9E78.ini rename to Data/Sys/GameSettings/GW9E78.ini diff --git a/Data/Sys/GameConfig/GWAE8P.ini b/Data/Sys/GameSettings/GWAE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GWAE8P.ini rename to Data/Sys/GameSettings/GWAE8P.ini diff --git a/Data/Sys/GameConfig/GWAF8P.ini b/Data/Sys/GameSettings/GWAF8P.ini similarity index 100% rename from Data/Sys/GameConfig/GWAF8P.ini rename to Data/Sys/GameSettings/GWAF8P.ini diff --git a/Data/Sys/GameConfig/GWAP8P.ini b/Data/Sys/GameSettings/GWAP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GWAP8P.ini rename to Data/Sys/GameSettings/GWAP8P.ini diff --git a/Data/Sys/GameConfig/GWBP41.ini b/Data/Sys/GameSettings/GWBP41.ini similarity index 100% rename from Data/Sys/GameConfig/GWBP41.ini rename to Data/Sys/GameSettings/GWBP41.ini diff --git a/Data/Sys/GameConfig/GWEE51.ini b/Data/Sys/GameSettings/GWEE51.ini similarity index 100% rename from Data/Sys/GameConfig/GWEE51.ini rename to Data/Sys/GameSettings/GWEE51.ini diff --git a/Data/Sys/GameConfig/GWEJB0.ini b/Data/Sys/GameSettings/GWEJB0.ini similarity index 100% rename from Data/Sys/GameConfig/GWEJB0.ini rename to Data/Sys/GameSettings/GWEJB0.ini diff --git a/Data/Sys/GameConfig/GWEP8P.ini b/Data/Sys/GameSettings/GWEP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GWEP8P.ini rename to Data/Sys/GameSettings/GWEP8P.ini diff --git a/Data/Sys/GameConfig/GWGP4F.ini b/Data/Sys/GameSettings/GWGP4F.ini similarity index 100% rename from Data/Sys/GameConfig/GWGP4F.ini rename to Data/Sys/GameSettings/GWGP4F.ini diff --git a/Data/Sys/GameConfig/GWJE52.ini b/Data/Sys/GameSettings/GWJE52.ini similarity index 98% rename from Data/Sys/GameConfig/GWJE52.ini rename to Data/Sys/GameSettings/GWJE52.ini index 02db0d617d..a00c124b47 100644 --- a/Data/Sys/GameConfig/GWJE52.ini +++ b/Data/Sys/GameSettings/GWJE52.ini @@ -18,4 +18,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/GWKE41.ini b/Data/Sys/GameSettings/GWKE41.ini similarity index 100% rename from Data/Sys/GameConfig/GWKE41.ini rename to Data/Sys/GameSettings/GWKE41.ini diff --git a/Data/Sys/GameConfig/GWKP41.ini b/Data/Sys/GameSettings/GWKP41.ini similarity index 100% rename from Data/Sys/GameConfig/GWKP41.ini rename to Data/Sys/GameSettings/GWKP41.ini diff --git a/Data/Sys/GameConfig/GWLE6L.ini b/Data/Sys/GameSettings/GWLE6L.ini similarity index 96% rename from Data/Sys/GameConfig/GWLE6L.ini rename to Data/Sys/GameSettings/GWLE6L.ini index 9b7610a605..1c0d8321e2 100644 --- a/Data/Sys/GameConfig/GWLE6L.ini +++ b/Data/Sys/GameSettings/GWLE6L.ini @@ -14,7 +14,7 @@ EmulationIssues = [OnFrame] # Add memory patches to be applied every frame here. -+$Bypass FIFO reset +$Bypass FIFO reset 0x8028EF00:dword:0x48000638 [ActionReplay] diff --git a/Data/Sys/GameConfig/GWLX6L.ini b/Data/Sys/GameSettings/GWLX6L.ini similarity index 95% rename from Data/Sys/GameConfig/GWLX6L.ini rename to Data/Sys/GameSettings/GWLX6L.ini index 835182b36f..45f0910d95 100644 --- a/Data/Sys/GameConfig/GWLX6L.ini +++ b/Data/Sys/GameSettings/GWLX6L.ini @@ -14,7 +14,7 @@ EmulationIssues = [OnFrame] # Add memory patches to be applied every frame here. -+$Bypass FIFO reset +$Bypass FIFO reset 0x8028EE80:dword:0x48000638 [ActionReplay] diff --git a/Data/Sys/GameConfig/GWME51.ini b/Data/Sys/GameSettings/GWME51.ini similarity index 100% rename from Data/Sys/GameConfig/GWME51.ini rename to Data/Sys/GameSettings/GWME51.ini diff --git a/Data/Sys/GameConfig/GWOE5G.ini b/Data/Sys/GameSettings/GWOE5G.ini similarity index 100% rename from Data/Sys/GameConfig/GWOE5G.ini rename to Data/Sys/GameSettings/GWOE5G.ini diff --git a/Data/Sys/GameConfig/GWPE78.ini b/Data/Sys/GameSettings/GWPE78.ini similarity index 100% rename from Data/Sys/GameConfig/GWPE78.ini rename to Data/Sys/GameSettings/GWPE78.ini diff --git a/Data/Sys/GameConfig/GWPJG2.ini b/Data/Sys/GameSettings/GWPJG2.ini similarity index 100% rename from Data/Sys/GameConfig/GWPJG2.ini rename to Data/Sys/GameSettings/GWPJG2.ini diff --git a/Data/Sys/GameConfig/GWPP78.ini b/Data/Sys/GameSettings/GWPP78.ini similarity index 100% rename from Data/Sys/GameConfig/GWPP78.ini rename to Data/Sys/GameSettings/GWPP78.ini diff --git a/Data/Sys/GameConfig/GWQE52.ini b/Data/Sys/GameSettings/GWQE52.ini similarity index 100% rename from Data/Sys/GameConfig/GWQE52.ini rename to Data/Sys/GameSettings/GWQE52.ini diff --git a/Data/Sys/GameConfig/GWRE01.ini b/Data/Sys/GameSettings/GWRE01.ini similarity index 100% rename from Data/Sys/GameConfig/GWRE01.ini rename to Data/Sys/GameSettings/GWRE01.ini diff --git a/Data/Sys/GameConfig/GWRP01.ini b/Data/Sys/GameSettings/GWRP01.ini similarity index 100% rename from Data/Sys/GameConfig/GWRP01.ini rename to Data/Sys/GameSettings/GWRP01.ini diff --git a/Data/Sys/GameConfig/GWSEA4.ini b/Data/Sys/GameSettings/GWSEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GWSEA4.ini rename to Data/Sys/GameSettings/GWSEA4.ini diff --git a/Data/Sys/GameConfig/GWTEA4.ini b/Data/Sys/GameSettings/GWTEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GWTEA4.ini rename to Data/Sys/GameSettings/GWTEA4.ini diff --git a/Data/Sys/GameConfig/GWVE52.ini b/Data/Sys/GameSettings/GWVE52.ini similarity index 100% rename from Data/Sys/GameConfig/GWVE52.ini rename to Data/Sys/GameSettings/GWVE52.ini diff --git a/Data/Sys/GameConfig/GWWE01.ini b/Data/Sys/GameSettings/GWWE01.ini similarity index 100% rename from Data/Sys/GameConfig/GWWE01.ini rename to Data/Sys/GameSettings/GWWE01.ini diff --git a/Data/Sys/GameConfig/GWWP01.ini b/Data/Sys/GameSettings/GWWP01.ini similarity index 100% rename from Data/Sys/GameConfig/GWWP01.ini rename to Data/Sys/GameSettings/GWWP01.ini diff --git a/Data/Sys/GameConfig/GWYE41.ini b/Data/Sys/GameSettings/GWYE41.ini similarity index 100% rename from Data/Sys/GameConfig/GWYE41.ini rename to Data/Sys/GameSettings/GWYE41.ini diff --git a/Data/Sys/GameConfig/GWYX41.ini b/Data/Sys/GameSettings/GWYX41.ini similarity index 100% rename from Data/Sys/GameConfig/GWYX41.ini rename to Data/Sys/GameSettings/GWYX41.ini diff --git a/Data/Sys/GameConfig/GWZE01.ini b/Data/Sys/GameSettings/GWZE01.ini similarity index 100% rename from Data/Sys/GameConfig/GWZE01.ini rename to Data/Sys/GameSettings/GWZE01.ini diff --git a/Data/Sys/GameConfig/GWZP01.ini b/Data/Sys/GameSettings/GWZP01.ini similarity index 100% rename from Data/Sys/GameConfig/GWZP01.ini rename to Data/Sys/GameSettings/GWZP01.ini diff --git a/Data/Sys/GameConfig/GX2E52.ini b/Data/Sys/GameSettings/GX2E52.ini similarity index 100% rename from Data/Sys/GameConfig/GX2E52.ini rename to Data/Sys/GameSettings/GX2E52.ini diff --git a/Data/Sys/GameConfig/GX2P52.ini b/Data/Sys/GameSettings/GX2P52.ini similarity index 100% rename from Data/Sys/GameConfig/GX2P52.ini rename to Data/Sys/GameSettings/GX2P52.ini diff --git a/Data/Sys/GameConfig/GX3E41.ini b/Data/Sys/GameSettings/GX3E41.ini similarity index 100% rename from Data/Sys/GameConfig/GX3E41.ini rename to Data/Sys/GameSettings/GX3E41.ini diff --git a/Data/Sys/GameConfig/GX3P41.ini b/Data/Sys/GameSettings/GX3P41.ini similarity index 100% rename from Data/Sys/GameConfig/GX3P41.ini rename to Data/Sys/GameSettings/GX3P41.ini diff --git a/Data/Sys/GameConfig/GX3X41.ini b/Data/Sys/GameSettings/GX3X41.ini similarity index 100% rename from Data/Sys/GameConfig/GX3X41.ini rename to Data/Sys/GameSettings/GX3X41.ini diff --git a/Data/Sys/GameConfig/GXBE69.ini b/Data/Sys/GameSettings/GXBE69.ini similarity index 100% rename from Data/Sys/GameConfig/GXBE69.ini rename to Data/Sys/GameSettings/GXBE69.ini diff --git a/Data/Sys/GameConfig/GXBP69.ini b/Data/Sys/GameSettings/GXBP69.ini similarity index 100% rename from Data/Sys/GameConfig/GXBP69.ini rename to Data/Sys/GameSettings/GXBP69.ini diff --git a/Data/Sys/GameConfig/GXCE01.ini b/Data/Sys/GameSettings/GXCE01.ini similarity index 100% rename from Data/Sys/GameConfig/GXCE01.ini rename to Data/Sys/GameSettings/GXCE01.ini diff --git a/Data/Sys/GameConfig/GXEE8P.ini b/Data/Sys/GameSettings/GXEE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GXEE8P.ini rename to Data/Sys/GameSettings/GXEE8P.ini diff --git a/Data/Sys/GameConfig/GXEP8P.ini b/Data/Sys/GameSettings/GXEP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GXEP8P.ini rename to Data/Sys/GameSettings/GXEP8P.ini diff --git a/Data/Sys/GameConfig/GXFE69.ini b/Data/Sys/GameSettings/GXFE69.ini similarity index 100% rename from Data/Sys/GameConfig/GXFE69.ini rename to Data/Sys/GameSettings/GXFE69.ini diff --git a/Data/Sys/GameConfig/GXFF69.ini b/Data/Sys/GameSettings/GXFF69.ini similarity index 100% rename from Data/Sys/GameConfig/GXFF69.ini rename to Data/Sys/GameSettings/GXFF69.ini diff --git a/Data/Sys/GameConfig/GXFP69.ini b/Data/Sys/GameSettings/GXFP69.ini similarity index 100% rename from Data/Sys/GameConfig/GXFP69.ini rename to Data/Sys/GameSettings/GXFP69.ini diff --git a/Data/Sys/GameConfig/GXGE08.ini b/Data/Sys/GameSettings/GXGE08.ini similarity index 98% rename from Data/Sys/GameConfig/GXGE08.ini rename to Data/Sys/GameSettings/GXGE08.ini index 8c65c67c22..b5d46d19f4 100644 --- a/Data/Sys/GameConfig/GXGE08.ini +++ b/Data/Sys/GameSettings/GXGE08.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameConfig/GXLE52.ini b/Data/Sys/GameSettings/GXLE52.ini similarity index 100% rename from Data/Sys/GameConfig/GXLE52.ini rename to Data/Sys/GameSettings/GXLE52.ini diff --git a/Data/Sys/GameConfig/GXLP52.ini b/Data/Sys/GameSettings/GXLP52.ini similarity index 100% rename from Data/Sys/GameConfig/GXLP52.ini rename to Data/Sys/GameSettings/GXLP52.ini diff --git a/Data/Sys/GameConfig/GXME52.ini b/Data/Sys/GameSettings/GXME52.ini similarity index 100% rename from Data/Sys/GameConfig/GXME52.ini rename to Data/Sys/GameSettings/GXME52.ini diff --git a/Data/Sys/GameConfig/GXNE5D.ini b/Data/Sys/GameSettings/GXNE5D.ini similarity index 100% rename from Data/Sys/GameConfig/GXNE5D.ini rename to Data/Sys/GameSettings/GXNE5D.ini diff --git a/Data/Sys/GameConfig/GXOE69.ini b/Data/Sys/GameSettings/GXOE69.ini similarity index 100% rename from Data/Sys/GameConfig/GXOE69.ini rename to Data/Sys/GameSettings/GXOE69.ini diff --git a/Data/Sys/GameConfig/GXOX69.ini b/Data/Sys/GameSettings/GXOX69.ini similarity index 100% rename from Data/Sys/GameConfig/GXOX69.ini rename to Data/Sys/GameSettings/GXOX69.ini diff --git a/Data/Sys/GameConfig/GXRE08.ini b/Data/Sys/GameSettings/GXRE08.ini similarity index 100% rename from Data/Sys/GameConfig/GXRE08.ini rename to Data/Sys/GameSettings/GXRE08.ini diff --git a/Data/Sys/GameConfig/GXSE8P.ini b/Data/Sys/GameSettings/GXSE8P.ini similarity index 100% rename from Data/Sys/GameConfig/GXSE8P.ini rename to Data/Sys/GameSettings/GXSE8P.ini diff --git a/Data/Sys/GameConfig/GXSP8P.ini b/Data/Sys/GameSettings/GXSP8P.ini similarity index 100% rename from Data/Sys/GameConfig/GXSP8P.ini rename to Data/Sys/GameSettings/GXSP8P.ini diff --git a/Data/Sys/GameConfig/GXXE01.ini b/Data/Sys/GameSettings/GXXE01.ini similarity index 100% rename from Data/Sys/GameConfig/GXXE01.ini rename to Data/Sys/GameSettings/GXXE01.ini diff --git a/Data/Sys/GameConfig/GXXP01.ini b/Data/Sys/GameSettings/GXXP01.ini similarity index 100% rename from Data/Sys/GameConfig/GXXP01.ini rename to Data/Sys/GameSettings/GXXP01.ini diff --git a/Data/Sys/GameConfig/GY2E01.ini b/Data/Sys/GameSettings/GY2E01.ini similarity index 100% rename from Data/Sys/GameConfig/GY2E01.ini rename to Data/Sys/GameSettings/GY2E01.ini diff --git a/Data/Sys/GameConfig/GYAE78.ini b/Data/Sys/GameSettings/GYAE78.ini similarity index 100% rename from Data/Sys/GameConfig/GYAE78.ini rename to Data/Sys/GameSettings/GYAE78.ini diff --git a/Data/Sys/GameConfig/GYBP01.ini b/Data/Sys/GameSettings/GYBP01.ini similarity index 100% rename from Data/Sys/GameConfig/GYBP01.ini rename to Data/Sys/GameSettings/GYBP01.ini diff --git a/Data/Sys/GameConfig/GYFEA4.ini b/Data/Sys/GameSettings/GYFEA4.ini similarity index 100% rename from Data/Sys/GameConfig/GYFEA4.ini rename to Data/Sys/GameSettings/GYFEA4.ini diff --git a/Data/Sys/GameConfig/GYKEB2.ini b/Data/Sys/GameSettings/GYKEB2.ini similarity index 100% rename from Data/Sys/GameConfig/GYKEB2.ini rename to Data/Sys/GameSettings/GYKEB2.ini diff --git a/Data/Sys/GameConfig/GYQP01.ini b/Data/Sys/GameSettings/GYQP01.ini similarity index 100% rename from Data/Sys/GameConfig/GYQP01.ini rename to Data/Sys/GameSettings/GYQP01.ini diff --git a/Data/Sys/GameConfig/GYRE41.ini b/Data/Sys/GameSettings/GYRE41.ini similarity index 100% rename from Data/Sys/GameConfig/GYRE41.ini rename to Data/Sys/GameSettings/GYRE41.ini diff --git a/Data/Sys/GameConfig/GYWD41.ini b/Data/Sys/GameSettings/GYWD41.ini similarity index 100% rename from Data/Sys/GameConfig/GYWD41.ini rename to Data/Sys/GameSettings/GYWD41.ini diff --git a/Data/Sys/GameConfig/GYWEE9.ini b/Data/Sys/GameSettings/GYWEE9.ini similarity index 100% rename from Data/Sys/GameConfig/GYWEE9.ini rename to Data/Sys/GameSettings/GYWEE9.ini diff --git a/Data/Sys/GameConfig/GYWP41.ini b/Data/Sys/GameSettings/GYWP41.ini similarity index 100% rename from Data/Sys/GameConfig/GYWP41.ini rename to Data/Sys/GameSettings/GYWP41.ini diff --git a/Data/Sys/GameConfig/GZ2E01.ini b/Data/Sys/GameSettings/GZ2E01.ini similarity index 100% rename from Data/Sys/GameConfig/GZ2E01.ini rename to Data/Sys/GameSettings/GZ2E01.ini diff --git a/Data/Sys/GameConfig/GZ2J01.ini b/Data/Sys/GameSettings/GZ2J01.ini similarity index 100% rename from Data/Sys/GameConfig/GZ2J01.ini rename to Data/Sys/GameSettings/GZ2J01.ini diff --git a/Data/Sys/GameConfig/GZ2P01.ini b/Data/Sys/GameSettings/GZ2P01.ini similarity index 100% rename from Data/Sys/GameConfig/GZ2P01.ini rename to Data/Sys/GameSettings/GZ2P01.ini diff --git a/Data/Sys/GameConfig/GZ3E70.ini b/Data/Sys/GameSettings/GZ3E70.ini similarity index 100% rename from Data/Sys/GameConfig/GZ3E70.ini rename to Data/Sys/GameSettings/GZ3E70.ini diff --git a/Data/Sys/GameConfig/GZ3PB2.ini b/Data/Sys/GameSettings/GZ3PB2.ini similarity index 100% rename from Data/Sys/GameConfig/GZ3PB2.ini rename to Data/Sys/GameSettings/GZ3PB2.ini diff --git a/Data/Sys/GameConfig/GZEE70.ini b/Data/Sys/GameSettings/GZEE70.ini similarity index 100% rename from Data/Sys/GameConfig/GZEE70.ini rename to Data/Sys/GameSettings/GZEE70.ini diff --git a/Data/Sys/GameConfig/GZLE01.ini b/Data/Sys/GameSettings/GZLE01.ini similarity index 100% rename from Data/Sys/GameConfig/GZLE01.ini rename to Data/Sys/GameSettings/GZLE01.ini diff --git a/Data/Sys/GameConfig/GZLJ01.ini b/Data/Sys/GameSettings/GZLJ01.ini similarity index 100% rename from Data/Sys/GameConfig/GZLJ01.ini rename to Data/Sys/GameSettings/GZLJ01.ini diff --git a/Data/Sys/GameConfig/GZLP01.ini b/Data/Sys/GameSettings/GZLP01.ini similarity index 100% rename from Data/Sys/GameConfig/GZLP01.ini rename to Data/Sys/GameSettings/GZLP01.ini diff --git a/Data/Sys/GameConfig/GZMP7D.ini b/Data/Sys/GameSettings/GZMP7D.ini similarity index 100% rename from Data/Sys/GameConfig/GZMP7D.ini rename to Data/Sys/GameSettings/GZMP7D.ini diff --git a/Data/Sys/GameConfig/GZPE70.ini b/Data/Sys/GameSettings/GZPE70.ini similarity index 100% rename from Data/Sys/GameConfig/GZPE70.ini rename to Data/Sys/GameSettings/GZPE70.ini diff --git a/Data/Sys/GameConfig/GZPP70.ini b/Data/Sys/GameSettings/GZPP70.ini similarity index 100% rename from Data/Sys/GameConfig/GZPP70.ini rename to Data/Sys/GameSettings/GZPP70.ini diff --git a/Data/Sys/GameConfig/GZSE70.ini b/Data/Sys/GameSettings/GZSE70.ini similarity index 100% rename from Data/Sys/GameConfig/GZSE70.ini rename to Data/Sys/GameSettings/GZSE70.ini diff --git a/Data/Sys/GameConfig/GZWE01.ini b/Data/Sys/GameSettings/GZWE01.ini similarity index 100% rename from Data/Sys/GameConfig/GZWE01.ini rename to Data/Sys/GameSettings/GZWE01.ini diff --git a/Data/Sys/GameConfig/GZWP01.ini b/Data/Sys/GameSettings/GZWP01.ini similarity index 100% rename from Data/Sys/GameConfig/GZWP01.ini rename to Data/Sys/GameSettings/GZWP01.ini diff --git a/Data/Sys/GameConfig/HAAA01.ini b/Data/Sys/GameSettings/HAAA01.ini similarity index 100% rename from Data/Sys/GameConfig/HAAA01.ini rename to Data/Sys/GameSettings/HAAA01.ini diff --git a/Data/Sys/GameConfig/HACA01.ini b/Data/Sys/GameSettings/HACA01.ini similarity index 100% rename from Data/Sys/GameConfig/HACA01.ini rename to Data/Sys/GameSettings/HACA01.ini diff --git a/Data/Sys/GameConfig/HADE01.ini b/Data/Sys/GameSettings/HADE01.ini similarity index 100% rename from Data/Sys/GameConfig/HADE01.ini rename to Data/Sys/GameSettings/HADE01.ini diff --git a/Data/Sys/GameConfig/HAXXHB.ini b/Data/Sys/GameSettings/HAXXHB.ini similarity index 100% rename from Data/Sys/GameConfig/HAXXHB.ini rename to Data/Sys/GameSettings/HAXXHB.ini diff --git a/Data/Sys/GameConfig/HAYA01.ini b/Data/Sys/GameSettings/HAYA01.ini similarity index 100% rename from Data/Sys/GameConfig/HAYA01.ini rename to Data/Sys/GameSettings/HAYA01.ini diff --git a/Data/Sys/GameConfig/HCFE01.ini b/Data/Sys/GameSettings/HCFE01.ini similarity index 100% rename from Data/Sys/GameConfig/HCFE01.ini rename to Data/Sys/GameSettings/HCFE01.ini diff --git a/Data/Sys/GameConfig/JAAE01.ini b/Data/Sys/GameSettings/JAAE01.ini similarity index 100% rename from Data/Sys/GameConfig/JAAE01.ini rename to Data/Sys/GameSettings/JAAE01.ini diff --git a/Data/Sys/GameConfig/JACP01.ini b/Data/Sys/GameSettings/JACP01.ini similarity index 100% rename from Data/Sys/GameConfig/JACP01.ini rename to Data/Sys/GameSettings/JACP01.ini diff --git a/Data/Sys/GameConfig/JADE01.ini b/Data/Sys/GameSettings/JADE01.ini similarity index 100% rename from Data/Sys/GameConfig/JADE01.ini rename to Data/Sys/GameSettings/JADE01.ini diff --git a/Data/Sys/GameConfig/JAEE01.ini b/Data/Sys/GameSettings/JAEE01.ini similarity index 98% rename from Data/Sys/GameConfig/JAEE01.ini rename to Data/Sys/GameSettings/JAEE01.ini index d5cab7b346..405011ff35 100644 --- a/Data/Sys/GameConfig/JAEE01.ini +++ b/Data/Sys/GameSettings/JAEE01.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameConfig/JBKE01.ini b/Data/Sys/GameSettings/JBKE01.ini similarity index 97% rename from Data/Sys/GameConfig/JBKE01.ini rename to Data/Sys/GameSettings/JBKE01.ini index 84f693cf41..17841b583d 100644 --- a/Data/Sys/GameConfig/JBKE01.ini +++ b/Data/Sys/GameSettings/JBKE01.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 [Video_Hacks] diff --git a/Data/Sys/GameConfig/JBKP01.ini b/Data/Sys/GameSettings/JBKP01.ini similarity index 100% rename from Data/Sys/GameConfig/JBKP01.ini rename to Data/Sys/GameSettings/JBKP01.ini diff --git a/Data/Sys/GameConfig/JCBE01.ini b/Data/Sys/GameSettings/JCBE01.ini similarity index 97% rename from Data/Sys/GameConfig/JCBE01.ini rename to Data/Sys/GameSettings/JCBE01.ini index d50d7125b1..fefd63b950 100644 --- a/Data/Sys/GameConfig/JCBE01.ini +++ b/Data/Sys/GameSettings/JCBE01.ini @@ -12,6 +12,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameConfig/JCWE01.ini b/Data/Sys/GameSettings/JCWE01.ini similarity index 96% rename from Data/Sys/GameConfig/JCWE01.ini rename to Data/Sys/GameSettings/JCWE01.ini index d2cc9084f5..cf0410c0be 100644 --- a/Data/Sys/GameConfig/JCWE01.ini +++ b/Data/Sys/GameSettings/JCWE01.ini @@ -12,4 +12,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/JODIHB.ini b/Data/Sys/GameSettings/JODIHB.ini similarity index 100% rename from Data/Sys/GameConfig/JODIHB.ini rename to Data/Sys/GameSettings/JODIHB.ini diff --git a/Data/Sys/GameConfig/NAAE01.ini b/Data/Sys/GameSettings/NAAE01.ini similarity index 100% rename from Data/Sys/GameConfig/NAAE01.ini rename to Data/Sys/GameSettings/NAAE01.ini diff --git a/Data/Sys/GameConfig/NAAP01.ini b/Data/Sys/GameSettings/NAAP01.ini similarity index 100% rename from Data/Sys/GameConfig/NAAP01.ini rename to Data/Sys/GameSettings/NAAP01.ini diff --git a/Data/Sys/GameConfig/NABE01.ini b/Data/Sys/GameSettings/NABE01.ini similarity index 98% rename from Data/Sys/GameConfig/NABE01.ini rename to Data/Sys/GameSettings/NABE01.ini index aeb4d2fd8e..400b022798 100644 --- a/Data/Sys/GameConfig/NABE01.ini +++ b/Data/Sys/GameSettings/NABE01.ini @@ -17,7 +17,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/NACE01.ini b/Data/Sys/GameSettings/NACE01.ini similarity index 100% rename from Data/Sys/GameConfig/NACE01.ini rename to Data/Sys/GameSettings/NACE01.ini diff --git a/Data/Sys/GameConfig/NAEE01.ini b/Data/Sys/GameSettings/NAEE01.ini similarity index 100% rename from Data/Sys/GameConfig/NAEE01.ini rename to Data/Sys/GameSettings/NAEE01.ini diff --git a/Data/Sys/GameConfig/NAFP01.ini b/Data/Sys/GameSettings/NAFP01.ini similarity index 100% rename from Data/Sys/GameConfig/NAFP01.ini rename to Data/Sys/GameSettings/NAFP01.ini diff --git a/Data/Sys/GameConfig/NAHE01.ini b/Data/Sys/GameSettings/NAHE01.ini similarity index 96% rename from Data/Sys/GameConfig/NAHE01.ini rename to Data/Sys/GameSettings/NAHE01.ini index 413d20a790..cb50d481dd 100644 --- a/Data/Sys/GameConfig/NAHE01.ini +++ b/Data/Sys/GameSettings/NAHE01.ini @@ -12,6 +12,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameConfig/NAKE01.ini b/Data/Sys/GameSettings/NAKE01.ini similarity index 97% rename from Data/Sys/GameConfig/NAKE01.ini rename to Data/Sys/GameSettings/NAKE01.ini index d169bc28f6..7ce4540355 100644 --- a/Data/Sys/GameConfig/NAKE01.ini +++ b/Data/Sys/GameSettings/NAKE01.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/NAKP01.ini b/Data/Sys/GameSettings/NAKP01.ini similarity index 100% rename from Data/Sys/GameConfig/NAKP01.ini rename to Data/Sys/GameSettings/NAKP01.ini diff --git a/Data/Sys/GameConfig/NANE01.ini b/Data/Sys/GameSettings/NANE01.ini similarity index 100% rename from Data/Sys/GameConfig/NANE01.ini rename to Data/Sys/GameSettings/NANE01.ini diff --git a/Data/Sys/GameConfig/NARP01.ini b/Data/Sys/GameSettings/NARP01.ini similarity index 100% rename from Data/Sys/GameConfig/NARP01.ini rename to Data/Sys/GameSettings/NARP01.ini diff --git a/Data/Sys/GameConfig/PC6E01.ini b/Data/Sys/GameSettings/PC6E01.ini similarity index 100% rename from Data/Sys/GameConfig/PC6E01.ini rename to Data/Sys/GameSettings/PC6E01.ini diff --git a/Data/Sys/GameConfig/PH_PRESETS.ini b/Data/Sys/GameSettings/PH_PRESETS.ini similarity index 100% rename from Data/Sys/GameConfig/PH_PRESETS.ini rename to Data/Sys/GameSettings/PH_PRESETS.ini diff --git a/Data/Sys/GameConfig/PM4E01.ini b/Data/Sys/GameSettings/PM4E01.ini similarity index 100% rename from Data/Sys/GameConfig/PM4E01.ini rename to Data/Sys/GameSettings/PM4E01.ini diff --git a/Data/Sys/GameConfig/PRJE01.ini b/Data/Sys/GameSettings/PRJE01.ini similarity index 100% rename from Data/Sys/GameConfig/PRJE01.ini rename to Data/Sys/GameSettings/PRJE01.ini diff --git a/Data/Sys/GameConfig/PZLE01.ini b/Data/Sys/GameSettings/PZLE01.ini similarity index 100% rename from Data/Sys/GameConfig/PZLE01.ini rename to Data/Sys/GameSettings/PZLE01.ini diff --git a/Data/Sys/GameConfig/PZLJ01.ini b/Data/Sys/GameSettings/PZLJ01.ini similarity index 100% rename from Data/Sys/GameConfig/PZLJ01.ini rename to Data/Sys/GameSettings/PZLJ01.ini diff --git a/Data/Sys/GameConfig/PZLP01.ini b/Data/Sys/GameSettings/PZLP01.ini similarity index 100% rename from Data/Sys/GameConfig/PZLP01.ini rename to Data/Sys/GameSettings/PZLP01.ini diff --git a/Data/Sys/GameConfig/R22E01.ini b/Data/Sys/GameSettings/R22E01.ini similarity index 100% rename from Data/Sys/GameConfig/R22E01.ini rename to Data/Sys/GameSettings/R22E01.ini diff --git a/Data/Sys/GameConfig/R22J01.ini b/Data/Sys/GameSettings/R22J01.ini similarity index 100% rename from Data/Sys/GameConfig/R22J01.ini rename to Data/Sys/GameSettings/R22J01.ini diff --git a/Data/Sys/GameConfig/R22P01.ini b/Data/Sys/GameSettings/R22P01.ini similarity index 100% rename from Data/Sys/GameConfig/R22P01.ini rename to Data/Sys/GameSettings/R22P01.ini diff --git a/Data/Sys/GameConfig/R29P52.ini b/Data/Sys/GameSettings/R29P52.ini similarity index 100% rename from Data/Sys/GameConfig/R29P52.ini rename to Data/Sys/GameSettings/R29P52.ini diff --git a/Data/Sys/GameConfig/R2GEXJ.ini b/Data/Sys/GameSettings/R2GEXJ.ini similarity index 100% rename from Data/Sys/GameConfig/R2GEXJ.ini rename to Data/Sys/GameSettings/R2GEXJ.ini diff --git a/Data/Sys/GameConfig/R2GJAF.ini b/Data/Sys/GameSettings/R2GJAF.ini similarity index 100% rename from Data/Sys/GameConfig/R2GJAF.ini rename to Data/Sys/GameSettings/R2GJAF.ini diff --git a/Data/Sys/GameConfig/R2GP99.ini b/Data/Sys/GameSettings/R2GP99.ini similarity index 100% rename from Data/Sys/GameConfig/R2GP99.ini rename to Data/Sys/GameSettings/R2GP99.ini diff --git a/Data/Sys/GameConfig/R2JJAF.ini b/Data/Sys/GameSettings/R2JJAF.ini similarity index 100% rename from Data/Sys/GameConfig/R2JJAF.ini rename to Data/Sys/GameSettings/R2JJAF.ini diff --git a/Data/Sys/GameConfig/R2KP54.ini b/Data/Sys/GameSettings/R2KP54.ini similarity index 100% rename from Data/Sys/GameConfig/R2KP54.ini rename to Data/Sys/GameSettings/R2KP54.ini diff --git a/Data/Sys/GameConfig/R2TE41.ini b/Data/Sys/GameSettings/R2TE41.ini similarity index 100% rename from Data/Sys/GameConfig/R2TE41.ini rename to Data/Sys/GameSettings/R2TE41.ini diff --git a/Data/Sys/GameConfig/R2UE8P.ini b/Data/Sys/GameSettings/R2UE8P.ini similarity index 100% rename from Data/Sys/GameConfig/R2UE8P.ini rename to Data/Sys/GameSettings/R2UE8P.ini diff --git a/Data/Sys/GameConfig/R2VJ01.ini b/Data/Sys/GameSettings/R2VJ01.ini similarity index 100% rename from Data/Sys/GameConfig/R2VJ01.ini rename to Data/Sys/GameSettings/R2VJ01.ini diff --git a/Data/Sys/GameConfig/R2VP01.ini b/Data/Sys/GameSettings/R2VP01.ini similarity index 100% rename from Data/Sys/GameConfig/R2VP01.ini rename to Data/Sys/GameSettings/R2VP01.ini diff --git a/Data/Sys/GameConfig/R3BE8P.ini b/Data/Sys/GameSettings/R3BE8P.ini similarity index 100% rename from Data/Sys/GameConfig/R3BE8P.ini rename to Data/Sys/GameSettings/R3BE8P.ini diff --git a/Data/Sys/GameConfig/R3BJ8P.ini b/Data/Sys/GameSettings/R3BJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/R3BJ8P.ini rename to Data/Sys/GameSettings/R3BJ8P.ini diff --git a/Data/Sys/GameConfig/R3BP8P.ini b/Data/Sys/GameSettings/R3BP8P.ini similarity index 100% rename from Data/Sys/GameConfig/R3BP8P.ini rename to Data/Sys/GameSettings/R3BP8P.ini diff --git a/Data/Sys/GameConfig/R3CE20.ini b/Data/Sys/GameSettings/R3CE20.ini similarity index 100% rename from Data/Sys/GameConfig/R3CE20.ini rename to Data/Sys/GameSettings/R3CE20.ini diff --git a/Data/Sys/GameConfig/R3DES5.ini b/Data/Sys/GameSettings/R3DES5.ini similarity index 100% rename from Data/Sys/GameConfig/R3DES5.ini rename to Data/Sys/GameSettings/R3DES5.ini diff --git a/Data/Sys/GameConfig/R3DPS5.ini b/Data/Sys/GameSettings/R3DPS5.ini similarity index 100% rename from Data/Sys/GameConfig/R3DPS5.ini rename to Data/Sys/GameSettings/R3DPS5.ini diff --git a/Data/Sys/GameConfig/R3GXUG.ini b/Data/Sys/GameSettings/R3GXUG.ini similarity index 100% rename from Data/Sys/GameConfig/R3GXUG.ini rename to Data/Sys/GameSettings/R3GXUG.ini diff --git a/Data/Sys/GameConfig/R3ME01.ini b/Data/Sys/GameSettings/R3ME01.ini similarity index 100% rename from Data/Sys/GameConfig/R3ME01.ini rename to Data/Sys/GameSettings/R3ME01.ini diff --git a/Data/Sys/GameConfig/R3MP01.ini b/Data/Sys/GameSettings/R3MP01.ini similarity index 100% rename from Data/Sys/GameConfig/R3MP01.ini rename to Data/Sys/GameSettings/R3MP01.ini diff --git a/Data/Sys/GameConfig/R3NEXS.ini b/Data/Sys/GameSettings/R3NEXS.ini similarity index 100% rename from Data/Sys/GameConfig/R3NEXS.ini rename to Data/Sys/GameSettings/R3NEXS.ini diff --git a/Data/Sys/GameConfig/R3NPH3.ini b/Data/Sys/GameSettings/R3NPH3.ini similarity index 100% rename from Data/Sys/GameConfig/R3NPH3.ini rename to Data/Sys/GameSettings/R3NPH3.ini diff --git a/Data/Sys/GameConfig/R3OE01.ini b/Data/Sys/GameSettings/R3OE01.ini similarity index 100% rename from Data/Sys/GameConfig/R3OE01.ini rename to Data/Sys/GameSettings/R3OE01.ini diff --git a/Data/Sys/GameConfig/R3OJ01.ini b/Data/Sys/GameSettings/R3OJ01.ini similarity index 100% rename from Data/Sys/GameConfig/R3OJ01.ini rename to Data/Sys/GameSettings/R3OJ01.ini diff --git a/Data/Sys/GameConfig/R3OP01.ini b/Data/Sys/GameSettings/R3OP01.ini similarity index 100% rename from Data/Sys/GameConfig/R3OP01.ini rename to Data/Sys/GameSettings/R3OP01.ini diff --git a/Data/Sys/GameConfig/R3RE8P.ini b/Data/Sys/GameSettings/R3RE8P.ini similarity index 98% rename from Data/Sys/GameConfig/R3RE8P.ini rename to Data/Sys/GameSettings/R3RE8P.ini index 92146e50c6..422735babf 100644 --- a/Data/Sys/GameConfig/R3RE8P.ini +++ b/Data/Sys/GameSettings/R3RE8P.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/R3RP8P.ini b/Data/Sys/GameSettings/R3RP8P.ini similarity index 98% rename from Data/Sys/GameConfig/R3RP8P.ini rename to Data/Sys/GameSettings/R3RP8P.ini index c32c9bc7cf..b49762b0f4 100644 --- a/Data/Sys/GameConfig/R3RP8P.ini +++ b/Data/Sys/GameSettings/R3RP8P.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/R3SP52.ini b/Data/Sys/GameSettings/R3SP52.ini similarity index 100% rename from Data/Sys/GameConfig/R3SP52.ini rename to Data/Sys/GameSettings/R3SP52.ini diff --git a/Data/Sys/GameConfig/R3TP54.ini b/Data/Sys/GameSettings/R3TP54.ini similarity index 100% rename from Data/Sys/GameConfig/R3TP54.ini rename to Data/Sys/GameSettings/R3TP54.ini diff --git a/Data/Sys/GameConfig/R46ENS.ini b/Data/Sys/GameSettings/R46ENS.ini similarity index 100% rename from Data/Sys/GameConfig/R46ENS.ini rename to Data/Sys/GameSettings/R46ENS.ini diff --git a/Data/Sys/GameConfig/R49P01.ini b/Data/Sys/GameSettings/R49P01.ini similarity index 100% rename from Data/Sys/GameConfig/R49P01.ini rename to Data/Sys/GameSettings/R49P01.ini diff --git a/Data/Sys/GameConfig/R4BPGT.ini b/Data/Sys/GameSettings/R4BPGT.ini similarity index 100% rename from Data/Sys/GameConfig/R4BPGT.ini rename to Data/Sys/GameSettings/R4BPGT.ini diff --git a/Data/Sys/GameConfig/R4EE01.ini b/Data/Sys/GameSettings/R4EE01.ini similarity index 100% rename from Data/Sys/GameConfig/R4EE01.ini rename to Data/Sys/GameSettings/R4EE01.ini diff --git a/Data/Sys/GameConfig/R4EJ01.ini b/Data/Sys/GameSettings/R4EJ01.ini similarity index 100% rename from Data/Sys/GameConfig/R4EJ01.ini rename to Data/Sys/GameSettings/R4EJ01.ini diff --git a/Data/Sys/GameConfig/R4EP01.ini b/Data/Sys/GameSettings/R4EP01.ini similarity index 100% rename from Data/Sys/GameConfig/R4EP01.ini rename to Data/Sys/GameSettings/R4EP01.ini diff --git a/Data/Sys/GameConfig/R4QE01.ini b/Data/Sys/GameSettings/R4QE01.ini similarity index 100% rename from Data/Sys/GameConfig/R4QE01.ini rename to Data/Sys/GameSettings/R4QE01.ini diff --git a/Data/Sys/GameConfig/R4QJ01.ini b/Data/Sys/GameSettings/R4QJ01.ini similarity index 100% rename from Data/Sys/GameConfig/R4QJ01.ini rename to Data/Sys/GameSettings/R4QJ01.ini diff --git a/Data/Sys/GameConfig/R4QK01.ini b/Data/Sys/GameSettings/R4QK01.ini similarity index 100% rename from Data/Sys/GameConfig/R4QK01.ini rename to Data/Sys/GameSettings/R4QK01.ini diff --git a/Data/Sys/GameConfig/R4QP01.ini b/Data/Sys/GameSettings/R4QP01.ini similarity index 100% rename from Data/Sys/GameConfig/R4QP01.ini rename to Data/Sys/GameSettings/R4QP01.ini diff --git a/Data/Sys/GameConfig/R4RP69.ini b/Data/Sys/GameSettings/R4RP69.ini similarity index 100% rename from Data/Sys/GameConfig/R4RP69.ini rename to Data/Sys/GameSettings/R4RP69.ini diff --git a/Data/Sys/GameConfig/R4ZJ01.ini b/Data/Sys/GameSettings/R4ZJ01.ini similarity index 100% rename from Data/Sys/GameConfig/R4ZJ01.ini rename to Data/Sys/GameSettings/R4ZJ01.ini diff --git a/Data/Sys/GameConfig/R5DE5G.ini b/Data/Sys/GameSettings/R5DE5G.ini similarity index 100% rename from Data/Sys/GameConfig/R5DE5G.ini rename to Data/Sys/GameSettings/R5DE5G.ini diff --git a/Data/Sys/GameConfig/R5IE4Q.ini b/Data/Sys/GameSettings/R5IE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/R5IE4Q.ini rename to Data/Sys/GameSettings/R5IE4Q.ini diff --git a/Data/Sys/GameConfig/R5IP4Q.ini b/Data/Sys/GameSettings/R5IP4Q.ini similarity index 100% rename from Data/Sys/GameConfig/R5IP4Q.ini rename to Data/Sys/GameSettings/R5IP4Q.ini diff --git a/Data/Sys/GameConfig/R5IX4Q.ini b/Data/Sys/GameSettings/R5IX4Q.ini similarity index 100% rename from Data/Sys/GameConfig/R5IX4Q.ini rename to Data/Sys/GameSettings/R5IX4Q.ini diff --git a/Data/Sys/GameConfig/R5VE41.ini b/Data/Sys/GameSettings/R5VE41.ini similarity index 100% rename from Data/Sys/GameConfig/R5VE41.ini rename to Data/Sys/GameSettings/R5VE41.ini diff --git a/Data/Sys/GameConfig/R5VP41.ini b/Data/Sys/GameSettings/R5VP41.ini similarity index 100% rename from Data/Sys/GameConfig/R5VP41.ini rename to Data/Sys/GameSettings/R5VP41.ini diff --git a/Data/Sys/GameConfig/R5VX41.ini b/Data/Sys/GameSettings/R5VX41.ini similarity index 100% rename from Data/Sys/GameConfig/R5VX41.ini rename to Data/Sys/GameSettings/R5VX41.ini diff --git a/Data/Sys/GameConfig/R5WEA4.ini b/Data/Sys/GameSettings/R5WEA4.ini similarity index 100% rename from Data/Sys/GameConfig/R5WEA4.ini rename to Data/Sys/GameSettings/R5WEA4.ini diff --git a/Data/Sys/GameConfig/R5WJA4.ini b/Data/Sys/GameSettings/R5WJA4.ini similarity index 100% rename from Data/Sys/GameConfig/R5WJA4.ini rename to Data/Sys/GameSettings/R5WJA4.ini diff --git a/Data/Sys/GameConfig/R64E01.ini b/Data/Sys/GameSettings/R64E01.ini similarity index 100% rename from Data/Sys/GameConfig/R64E01.ini rename to Data/Sys/GameSettings/R64E01.ini diff --git a/Data/Sys/GameConfig/R64J01.ini b/Data/Sys/GameSettings/R64J01.ini similarity index 100% rename from Data/Sys/GameConfig/R64J01.ini rename to Data/Sys/GameSettings/R64J01.ini diff --git a/Data/Sys/GameConfig/R64K01.ini b/Data/Sys/GameSettings/R64K01.ini similarity index 100% rename from Data/Sys/GameConfig/R64K01.ini rename to Data/Sys/GameSettings/R64K01.ini diff --git a/Data/Sys/GameConfig/R64P01.ini b/Data/Sys/GameSettings/R64P01.ini similarity index 100% rename from Data/Sys/GameConfig/R64P01.ini rename to Data/Sys/GameSettings/R64P01.ini diff --git a/Data/Sys/GameConfig/R69E36.ini b/Data/Sys/GameSettings/R69E36.ini similarity index 100% rename from Data/Sys/GameConfig/R69E36.ini rename to Data/Sys/GameSettings/R69E36.ini diff --git a/Data/Sys/GameConfig/R6BE78.ini b/Data/Sys/GameSettings/R6BE78.ini similarity index 100% rename from Data/Sys/GameConfig/R6BE78.ini rename to Data/Sys/GameSettings/R6BE78.ini diff --git a/Data/Sys/GameConfig/R6BJ78.ini b/Data/Sys/GameSettings/R6BJ78.ini similarity index 100% rename from Data/Sys/GameConfig/R6BJ78.ini rename to Data/Sys/GameSettings/R6BJ78.ini diff --git a/Data/Sys/GameConfig/R6BK78.ini b/Data/Sys/GameSettings/R6BK78.ini similarity index 100% rename from Data/Sys/GameConfig/R6BK78.ini rename to Data/Sys/GameSettings/R6BK78.ini diff --git a/Data/Sys/GameConfig/R6BP78.ini b/Data/Sys/GameSettings/R6BP78.ini similarity index 100% rename from Data/Sys/GameConfig/R6BP78.ini rename to Data/Sys/GameSettings/R6BP78.ini diff --git a/Data/Sys/GameConfig/R6BX78.ini b/Data/Sys/GameSettings/R6BX78.ini similarity index 100% rename from Data/Sys/GameConfig/R6BX78.ini rename to Data/Sys/GameSettings/R6BX78.ini diff --git a/Data/Sys/GameConfig/R6NY41.ini b/Data/Sys/GameSettings/R6NY41.ini similarity index 100% rename from Data/Sys/GameConfig/R6NY41.ini rename to Data/Sys/GameSettings/R6NY41.ini diff --git a/Data/Sys/GameConfig/R6TEA4.ini b/Data/Sys/GameSettings/R6TEA4.ini similarity index 100% rename from Data/Sys/GameConfig/R6TEA4.ini rename to Data/Sys/GameSettings/R6TEA4.ini diff --git a/Data/Sys/GameConfig/R6YEXS.ini b/Data/Sys/GameSettings/R6YEXS.ini similarity index 100% rename from Data/Sys/GameConfig/R6YEXS.ini rename to Data/Sys/GameSettings/R6YEXS.ini diff --git a/Data/Sys/GameConfig/R6YPH3.ini b/Data/Sys/GameSettings/R6YPH3.ini similarity index 100% rename from Data/Sys/GameConfig/R6YPH3.ini rename to Data/Sys/GameSettings/R6YPH3.ini diff --git a/Data/Sys/GameConfig/R7EE8P.ini b/Data/Sys/GameSettings/R7EE8P.ini similarity index 100% rename from Data/Sys/GameConfig/R7EE8P.ini rename to Data/Sys/GameSettings/R7EE8P.ini diff --git a/Data/Sys/GameConfig/R7EJ8P.ini b/Data/Sys/GameSettings/R7EJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/R7EJ8P.ini rename to Data/Sys/GameSettings/R7EJ8P.ini diff --git a/Data/Sys/GameConfig/R7EP8P.ini b/Data/Sys/GameSettings/R7EP8P.ini similarity index 100% rename from Data/Sys/GameConfig/R7EP8P.ini rename to Data/Sys/GameSettings/R7EP8P.ini diff --git a/Data/Sys/GameConfig/R7FEGD.ini b/Data/Sys/GameSettings/R7FEGD.ini similarity index 100% rename from Data/Sys/GameConfig/R7FEGD.ini rename to Data/Sys/GameSettings/R7FEGD.ini diff --git a/Data/Sys/GameConfig/R7FJGD.ini b/Data/Sys/GameSettings/R7FJGD.ini similarity index 100% rename from Data/Sys/GameConfig/R7FJGD.ini rename to Data/Sys/GameSettings/R7FJGD.ini diff --git a/Data/Sys/GameConfig/R7FPGD.ini b/Data/Sys/GameSettings/R7FPGD.ini similarity index 100% rename from Data/Sys/GameConfig/R7FPGD.ini rename to Data/Sys/GameSettings/R7FPGD.ini diff --git a/Data/Sys/GameConfig/R7GEAF.ini b/Data/Sys/GameSettings/R7GEAF.ini similarity index 100% rename from Data/Sys/GameConfig/R7GEAF.ini rename to Data/Sys/GameSettings/R7GEAF.ini diff --git a/Data/Sys/GameConfig/R7GJAF.ini b/Data/Sys/GameSettings/R7GJAF.ini similarity index 100% rename from Data/Sys/GameConfig/R7GJAF.ini rename to Data/Sys/GameSettings/R7GJAF.ini diff --git a/Data/Sys/GameConfig/R7GPAF.ini b/Data/Sys/GameSettings/R7GPAF.ini similarity index 100% rename from Data/Sys/GameConfig/R7GPAF.ini rename to Data/Sys/GameSettings/R7GPAF.ini diff --git a/Data/Sys/GameConfig/R7PE01.ini b/Data/Sys/GameSettings/R7PE01.ini similarity index 98% rename from Data/Sys/GameConfig/R7PE01.ini rename to Data/Sys/GameSettings/R7PE01.ini index 61af3f2c24..55e049a612 100644 --- a/Data/Sys/GameConfig/R7PE01.ini +++ b/Data/Sys/GameSettings/R7PE01.ini @@ -13,7 +13,7 @@ EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration ta [OnFrame] # Add memory patches to be applied every frame here. -+$Patch +$Patch 0x8011E0F8:dword:0x4E800020 [ActionReplay] diff --git a/Data/Sys/GameConfig/R7PP01.ini b/Data/Sys/GameSettings/R7PP01.ini similarity index 98% rename from Data/Sys/GameConfig/R7PP01.ini rename to Data/Sys/GameSettings/R7PP01.ini index dcd66b20f5..ee000f624d 100644 --- a/Data/Sys/GameConfig/R7PP01.ini +++ b/Data/Sys/GameSettings/R7PP01.ini @@ -13,7 +13,7 @@ EmulationStateId = 4 [OnFrame] # Add memory patches to be applied every frame here. -+$Patch +$Patch 0x8011F1CC:dword:0x4E800020 [ActionReplay] diff --git a/Data/Sys/GameConfig/R7XE69.ini b/Data/Sys/GameSettings/R7XE69.ini similarity index 100% rename from Data/Sys/GameConfig/R7XE69.ini rename to Data/Sys/GameSettings/R7XE69.ini diff --git a/Data/Sys/GameConfig/R7XJ13.ini b/Data/Sys/GameSettings/R7XJ13.ini similarity index 100% rename from Data/Sys/GameConfig/R7XJ13.ini rename to Data/Sys/GameSettings/R7XJ13.ini diff --git a/Data/Sys/GameConfig/R7XP69.ini b/Data/Sys/GameSettings/R7XP69.ini similarity index 100% rename from Data/Sys/GameConfig/R7XP69.ini rename to Data/Sys/GameSettings/R7XP69.ini diff --git a/Data/Sys/GameConfig/R84EE9.ini b/Data/Sys/GameSettings/R84EE9.ini similarity index 100% rename from Data/Sys/GameConfig/R84EE9.ini rename to Data/Sys/GameSettings/R84EE9.ini diff --git a/Data/Sys/GameConfig/R84J99.ini b/Data/Sys/GameSettings/R84J99.ini similarity index 100% rename from Data/Sys/GameConfig/R84J99.ini rename to Data/Sys/GameSettings/R84J99.ini diff --git a/Data/Sys/GameConfig/R84P99.ini b/Data/Sys/GameSettings/R84P99.ini similarity index 100% rename from Data/Sys/GameConfig/R84P99.ini rename to Data/Sys/GameSettings/R84P99.ini diff --git a/Data/Sys/GameConfig/R8AE01.ini b/Data/Sys/GameSettings/R8AE01.ini similarity index 100% rename from Data/Sys/GameConfig/R8AE01.ini rename to Data/Sys/GameSettings/R8AE01.ini diff --git a/Data/Sys/GameConfig/R8AJ01.ini b/Data/Sys/GameSettings/R8AJ01.ini similarity index 100% rename from Data/Sys/GameConfig/R8AJ01.ini rename to Data/Sys/GameSettings/R8AJ01.ini diff --git a/Data/Sys/GameConfig/R8AP01.ini b/Data/Sys/GameSettings/R8AP01.ini similarity index 100% rename from Data/Sys/GameConfig/R8AP01.ini rename to Data/Sys/GameSettings/R8AP01.ini diff --git a/Data/Sys/GameConfig/R8DEA4.ini b/Data/Sys/GameSettings/R8DEA4.ini similarity index 100% rename from Data/Sys/GameConfig/R8DEA4.ini rename to Data/Sys/GameSettings/R8DEA4.ini diff --git a/Data/Sys/GameConfig/R8DJA4.ini b/Data/Sys/GameSettings/R8DJA4.ini similarity index 100% rename from Data/Sys/GameConfig/R8DJA4.ini rename to Data/Sys/GameSettings/R8DJA4.ini diff --git a/Data/Sys/GameConfig/R8DPA4.ini b/Data/Sys/GameSettings/R8DPA4.ini similarity index 100% rename from Data/Sys/GameConfig/R8DPA4.ini rename to Data/Sys/GameSettings/R8DPA4.ini diff --git a/Data/Sys/GameConfig/R8JEWR.ini b/Data/Sys/GameSettings/R8JEWR.ini similarity index 100% rename from Data/Sys/GameConfig/R8JEWR.ini rename to Data/Sys/GameSettings/R8JEWR.ini diff --git a/Data/Sys/GameConfig/R8JPWR.ini b/Data/Sys/GameSettings/R8JPWR.ini similarity index 100% rename from Data/Sys/GameConfig/R8JPWR.ini rename to Data/Sys/GameSettings/R8JPWR.ini diff --git a/Data/Sys/GameConfig/R8LE20.ini b/Data/Sys/GameSettings/R8LE20.ini similarity index 100% rename from Data/Sys/GameConfig/R8LE20.ini rename to Data/Sys/GameSettings/R8LE20.ini diff --git a/Data/Sys/GameConfig/R8LP7J.ini b/Data/Sys/GameSettings/R8LP7J.ini similarity index 100% rename from Data/Sys/GameConfig/R8LP7J.ini rename to Data/Sys/GameSettings/R8LP7J.ini diff --git a/Data/Sys/GameConfig/R8PE01.ini b/Data/Sys/GameSettings/R8PE01.ini similarity index 100% rename from Data/Sys/GameConfig/R8PE01.ini rename to Data/Sys/GameSettings/R8PE01.ini diff --git a/Data/Sys/GameConfig/R8PJ01.ini b/Data/Sys/GameSettings/R8PJ01.ini similarity index 100% rename from Data/Sys/GameConfig/R8PJ01.ini rename to Data/Sys/GameSettings/R8PJ01.ini diff --git a/Data/Sys/GameConfig/R8PK01.ini b/Data/Sys/GameSettings/R8PK01.ini similarity index 100% rename from Data/Sys/GameConfig/R8PK01.ini rename to Data/Sys/GameSettings/R8PK01.ini diff --git a/Data/Sys/GameConfig/R8PP01.ini b/Data/Sys/GameSettings/R8PP01.ini similarity index 100% rename from Data/Sys/GameConfig/R8PP01.ini rename to Data/Sys/GameSettings/R8PP01.ini diff --git a/Data/Sys/GameConfig/R8XE52.ini b/Data/Sys/GameSettings/R8XE52.ini similarity index 100% rename from Data/Sys/GameConfig/R8XE52.ini rename to Data/Sys/GameSettings/R8XE52.ini diff --git a/Data/Sys/GameConfig/R96EAF.ini b/Data/Sys/GameSettings/R96EAF.ini similarity index 100% rename from Data/Sys/GameConfig/R96EAF.ini rename to Data/Sys/GameSettings/R96EAF.ini diff --git a/Data/Sys/GameConfig/R9FP36.ini b/Data/Sys/GameSettings/R9FP36.ini similarity index 100% rename from Data/Sys/GameConfig/R9FP36.ini rename to Data/Sys/GameSettings/R9FP36.ini diff --git a/Data/Sys/GameConfig/R9IE01.ini b/Data/Sys/GameSettings/R9IE01.ini similarity index 100% rename from Data/Sys/GameConfig/R9IE01.ini rename to Data/Sys/GameSettings/R9IE01.ini diff --git a/Data/Sys/GameConfig/RB4E08.ini b/Data/Sys/GameSettings/RB4E08.ini similarity index 100% rename from Data/Sys/GameConfig/RB4E08.ini rename to Data/Sys/GameSettings/RB4E08.ini diff --git a/Data/Sys/GameConfig/RB4P08.ini b/Data/Sys/GameSettings/RB4P08.ini similarity index 100% rename from Data/Sys/GameConfig/RB4P08.ini rename to Data/Sys/GameSettings/RB4P08.ini diff --git a/Data/Sys/GameConfig/RBBE18.ini b/Data/Sys/GameSettings/RBBE18.ini similarity index 100% rename from Data/Sys/GameConfig/RBBE18.ini rename to Data/Sys/GameSettings/RBBE18.ini diff --git a/Data/Sys/GameConfig/RBBJ18.ini b/Data/Sys/GameSettings/RBBJ18.ini similarity index 100% rename from Data/Sys/GameConfig/RBBJ18.ini rename to Data/Sys/GameSettings/RBBJ18.ini diff --git a/Data/Sys/GameConfig/RBBP99.ini b/Data/Sys/GameSettings/RBBP99.ini similarity index 100% rename from Data/Sys/GameConfig/RBBP99.ini rename to Data/Sys/GameSettings/RBBP99.ini diff --git a/Data/Sys/GameConfig/RBHE08.ini b/Data/Sys/GameSettings/RBHE08.ini similarity index 100% rename from Data/Sys/GameConfig/RBHE08.ini rename to Data/Sys/GameSettings/RBHE08.ini diff --git a/Data/Sys/GameConfig/RBHJ08.ini b/Data/Sys/GameSettings/RBHJ08.ini similarity index 100% rename from Data/Sys/GameConfig/RBHJ08.ini rename to Data/Sys/GameSettings/RBHJ08.ini diff --git a/Data/Sys/GameConfig/RBHP08.ini b/Data/Sys/GameSettings/RBHP08.ini similarity index 100% rename from Data/Sys/GameConfig/RBHP08.ini rename to Data/Sys/GameSettings/RBHP08.ini diff --git a/Data/Sys/GameConfig/RBIEE9.ini b/Data/Sys/GameSettings/RBIEE9.ini similarity index 100% rename from Data/Sys/GameConfig/RBIEE9.ini rename to Data/Sys/GameSettings/RBIEE9.ini diff --git a/Data/Sys/GameConfig/RBIJ99.ini b/Data/Sys/GameSettings/RBIJ99.ini similarity index 100% rename from Data/Sys/GameConfig/RBIJ99.ini rename to Data/Sys/GameSettings/RBIJ99.ini diff --git a/Data/Sys/GameConfig/RBIP99.ini b/Data/Sys/GameSettings/RBIP99.ini similarity index 100% rename from Data/Sys/GameConfig/RBIP99.ini rename to Data/Sys/GameSettings/RBIP99.ini diff --git a/Data/Sys/GameConfig/RBKE69.ini b/Data/Sys/GameSettings/RBKE69.ini similarity index 100% rename from Data/Sys/GameConfig/RBKE69.ini rename to Data/Sys/GameSettings/RBKE69.ini diff --git a/Data/Sys/GameConfig/RBME5G.ini b/Data/Sys/GameSettings/RBME5G.ini similarity index 100% rename from Data/Sys/GameConfig/RBME5G.ini rename to Data/Sys/GameSettings/RBME5G.ini diff --git a/Data/Sys/GameConfig/RBQPUG.ini b/Data/Sys/GameSettings/RBQPUG.ini similarity index 100% rename from Data/Sys/GameConfig/RBQPUG.ini rename to Data/Sys/GameSettings/RBQPUG.ini diff --git a/Data/Sys/GameConfig/RBTP8P.ini b/Data/Sys/GameSettings/RBTP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RBTP8P.ini rename to Data/Sys/GameSettings/RBTP8P.ini diff --git a/Data/Sys/GameConfig/RBUE08.ini b/Data/Sys/GameSettings/RBUE08.ini similarity index 100% rename from Data/Sys/GameConfig/RBUE08.ini rename to Data/Sys/GameSettings/RBUE08.ini diff --git a/Data/Sys/GameConfig/RBUP08.ini b/Data/Sys/GameSettings/RBUP08.ini similarity index 100% rename from Data/Sys/GameConfig/RBUP08.ini rename to Data/Sys/GameSettings/RBUP08.ini diff --git a/Data/Sys/GameConfig/RBWE01.ini b/Data/Sys/GameSettings/RBWE01.ini similarity index 100% rename from Data/Sys/GameConfig/RBWE01.ini rename to Data/Sys/GameSettings/RBWE01.ini diff --git a/Data/Sys/GameConfig/RBWJ01.ini b/Data/Sys/GameSettings/RBWJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RBWJ01.ini rename to Data/Sys/GameSettings/RBWJ01.ini diff --git a/Data/Sys/GameConfig/RBWP01.ini b/Data/Sys/GameSettings/RBWP01.ini similarity index 100% rename from Data/Sys/GameConfig/RBWP01.ini rename to Data/Sys/GameSettings/RBWP01.ini diff --git a/Data/Sys/GameConfig/RBXJ8P.ini b/Data/Sys/GameSettings/RBXJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/RBXJ8P.ini rename to Data/Sys/GameSettings/RBXJ8P.ini diff --git a/Data/Sys/GameConfig/RBZXUG.ini b/Data/Sys/GameSettings/RBZXUG.ini similarity index 100% rename from Data/Sys/GameConfig/RBZXUG.ini rename to Data/Sys/GameSettings/RBZXUG.ini diff --git a/Data/Sys/GameConfig/RCJE8P.ini b/Data/Sys/GameSettings/RCJE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RCJE8P.ini rename to Data/Sys/GameSettings/RCJE8P.ini diff --git a/Data/Sys/GameConfig/RCJP8P.ini b/Data/Sys/GameSettings/RCJP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RCJP8P.ini rename to Data/Sys/GameSettings/RCJP8P.ini diff --git a/Data/Sys/GameConfig/RCKPGN.ini b/Data/Sys/GameSettings/RCKPGN.ini similarity index 100% rename from Data/Sys/GameConfig/RCKPGN.ini rename to Data/Sys/GameSettings/RCKPGN.ini diff --git a/Data/Sys/GameConfig/RCPE18.ini b/Data/Sys/GameSettings/RCPE18.ini similarity index 100% rename from Data/Sys/GameConfig/RCPE18.ini rename to Data/Sys/GameSettings/RCPE18.ini diff --git a/Data/Sys/GameConfig/RD2E41.ini b/Data/Sys/GameSettings/RD2E41.ini similarity index 100% rename from Data/Sys/GameConfig/RD2E41.ini rename to Data/Sys/GameSettings/RD2E41.ini diff --git a/Data/Sys/GameConfig/RD2J41.ini b/Data/Sys/GameSettings/RD2J41.ini similarity index 100% rename from Data/Sys/GameConfig/RD2J41.ini rename to Data/Sys/GameSettings/RD2J41.ini diff --git a/Data/Sys/GameConfig/RD2K41.ini b/Data/Sys/GameSettings/RD2K41.ini similarity index 100% rename from Data/Sys/GameConfig/RD2K41.ini rename to Data/Sys/GameSettings/RD2K41.ini diff --git a/Data/Sys/GameConfig/RD2P41.ini b/Data/Sys/GameSettings/RD2P41.ini similarity index 100% rename from Data/Sys/GameConfig/RD2P41.ini rename to Data/Sys/GameSettings/RD2P41.ini diff --git a/Data/Sys/GameConfig/RD2X41.ini b/Data/Sys/GameSettings/RD2X41.ini similarity index 100% rename from Data/Sys/GameConfig/RD2X41.ini rename to Data/Sys/GameSettings/RD2X41.ini diff --git a/Data/Sys/GameConfig/RDBPAF.ini b/Data/Sys/GameSettings/RDBPAF.ini similarity index 100% rename from Data/Sys/GameConfig/RDBPAF.ini rename to Data/Sys/GameSettings/RDBPAF.ini diff --git a/Data/Sys/GameConfig/RDFP41.ini b/Data/Sys/GameSettings/RDFP41.ini similarity index 100% rename from Data/Sys/GameConfig/RDFP41.ini rename to Data/Sys/GameSettings/RDFP41.ini diff --git a/Data/Sys/GameConfig/RDGPA4.ini b/Data/Sys/GameSettings/RDGPA4.ini similarity index 100% rename from Data/Sys/GameConfig/RDGPA4.ini rename to Data/Sys/GameSettings/RDGPA4.ini diff --git a/Data/Sys/GameConfig/RDHP78.ini b/Data/Sys/GameSettings/RDHP78.ini similarity index 100% rename from Data/Sys/GameConfig/RDHP78.ini rename to Data/Sys/GameSettings/RDHP78.ini diff --git a/Data/Sys/GameConfig/RDIE41.ini b/Data/Sys/GameSettings/RDIE41.ini similarity index 100% rename from Data/Sys/GameConfig/RDIE41.ini rename to Data/Sys/GameSettings/RDIE41.ini diff --git a/Data/Sys/GameConfig/RDKE01.ini b/Data/Sys/GameSettings/RDKE01.ini similarity index 100% rename from Data/Sys/GameConfig/RDKE01.ini rename to Data/Sys/GameSettings/RDKE01.ini diff --git a/Data/Sys/GameConfig/RDQEGD.ini b/Data/Sys/GameSettings/RDQEGD.ini similarity index 100% rename from Data/Sys/GameConfig/RDQEGD.ini rename to Data/Sys/GameSettings/RDQEGD.ini diff --git a/Data/Sys/GameConfig/RDSE70.ini b/Data/Sys/GameSettings/RDSE70.ini similarity index 100% rename from Data/Sys/GameConfig/RDSE70.ini rename to Data/Sys/GameSettings/RDSE70.ini diff --git a/Data/Sys/GameConfig/RDSJAF.ini b/Data/Sys/GameSettings/RDSJAF.ini similarity index 100% rename from Data/Sys/GameConfig/RDSJAF.ini rename to Data/Sys/GameSettings/RDSJAF.ini diff --git a/Data/Sys/GameConfig/RDSPAF.ini b/Data/Sys/GameSettings/RDSPAF.ini similarity index 100% rename from Data/Sys/GameConfig/RDSPAF.ini rename to Data/Sys/GameSettings/RDSPAF.ini diff --git a/Data/Sys/GameConfig/RDVE41.ini b/Data/Sys/GameSettings/RDVE41.ini similarity index 100% rename from Data/Sys/GameConfig/RDVE41.ini rename to Data/Sys/GameSettings/RDVE41.ini diff --git a/Data/Sys/GameConfig/RDXP18.ini b/Data/Sys/GameSettings/RDXP18.ini similarity index 100% rename from Data/Sys/GameConfig/RDXP18.ini rename to Data/Sys/GameSettings/RDXP18.ini diff --git a/Data/Sys/GameConfig/RDZJ01.ini b/Data/Sys/GameSettings/RDZJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RDZJ01.ini rename to Data/Sys/GameSettings/RDZJ01.ini diff --git a/Data/Sys/GameConfig/RDZP01.ini b/Data/Sys/GameSettings/RDZP01.ini similarity index 100% rename from Data/Sys/GameConfig/RDZP01.ini rename to Data/Sys/GameSettings/RDZP01.ini diff --git a/Data/Sys/GameConfig/RE4E08.ini b/Data/Sys/GameSettings/RE4E08.ini similarity index 100% rename from Data/Sys/GameConfig/RE4E08.ini rename to Data/Sys/GameSettings/RE4E08.ini diff --git a/Data/Sys/GameConfig/RE4J08.ini b/Data/Sys/GameSettings/RE4J08.ini similarity index 100% rename from Data/Sys/GameConfig/RE4J08.ini rename to Data/Sys/GameSettings/RE4J08.ini diff --git a/Data/Sys/GameConfig/RE4P08.ini b/Data/Sys/GameSettings/RE4P08.ini similarity index 100% rename from Data/Sys/GameConfig/RE4P08.ini rename to Data/Sys/GameSettings/RE4P08.ini diff --git a/Data/Sys/GameConfig/REDE41.ini b/Data/Sys/GameSettings/REDE41.ini similarity index 100% rename from Data/Sys/GameConfig/REDE41.ini rename to Data/Sys/GameSettings/REDE41.ini diff --git a/Data/Sys/GameConfig/REDJ41.ini b/Data/Sys/GameSettings/REDJ41.ini similarity index 100% rename from Data/Sys/GameConfig/REDJ41.ini rename to Data/Sys/GameSettings/REDJ41.ini diff --git a/Data/Sys/GameConfig/REDP41.ini b/Data/Sys/GameSettings/REDP41.ini similarity index 100% rename from Data/Sys/GameConfig/REDP41.ini rename to Data/Sys/GameSettings/REDP41.ini diff --git a/Data/Sys/GameConfig/RELJAB.ini b/Data/Sys/GameSettings/RELJAB.ini similarity index 96% rename from Data/Sys/GameConfig/RELJAB.ini rename to Data/Sys/GameSettings/RELJAB.ini index d8ad85b990..08e0560eb5 100644 --- a/Data/Sys/GameConfig/RELJAB.ini +++ b/Data/Sys/GameSettings/RELJAB.ini @@ -12,7 +12,7 @@ EmulationIssues = [OnFrame] # Add memory patches to be applied every frame here. -+$DI Seed Blanker +$DI Seed Blanker 0x80000000:dword:0x00000000 0x80000004:dword:0x00000000 0x80000008:dword:0x00000000 diff --git a/Data/Sys/GameConfig/RELS01.ini b/Data/Sys/GameSettings/RELS01.ini similarity index 97% rename from Data/Sys/GameConfig/RELS01.ini rename to Data/Sys/GameSettings/RELS01.ini index 43ee5a4c01..32d3a27c07 100644 --- a/Data/Sys/GameConfig/RELS01.ini +++ b/Data/Sys/GameSettings/RELS01.ini @@ -14,7 +14,7 @@ EmulationIssues = [OnFrame] # Add memory patches to be applied every frame here. -+$loophack_ZOOT +$loophack_ZOOT 0x80683804:word:0x60000000 $loophack_ZMM 0x8068C324:word:0x60000000 diff --git a/Data/Sys/GameConfig/RENE8P.ini b/Data/Sys/GameSettings/RENE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RENE8P.ini rename to Data/Sys/GameSettings/RENE8P.ini diff --git a/Data/Sys/GameConfig/RENJ8P.ini b/Data/Sys/GameSettings/RENJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/RENJ8P.ini rename to Data/Sys/GameSettings/RENJ8P.ini diff --git a/Data/Sys/GameConfig/RENP8P.ini b/Data/Sys/GameSettings/RENP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RENP8P.ini rename to Data/Sys/GameSettings/RENP8P.ini diff --git a/Data/Sys/GameConfig/REXP01.ini b/Data/Sys/GameSettings/REXP01.ini similarity index 100% rename from Data/Sys/GameConfig/REXP01.ini rename to Data/Sys/GameSettings/REXP01.ini diff --git a/Data/Sys/GameConfig/RF4P6M.ini b/Data/Sys/GameSettings/RF4P6M.ini similarity index 100% rename from Data/Sys/GameConfig/RF4P6M.ini rename to Data/Sys/GameSettings/RF4P6M.ini diff --git a/Data/Sys/GameConfig/RF7J08.ini b/Data/Sys/GameSettings/RF7J08.ini similarity index 100% rename from Data/Sys/GameConfig/RF7J08.ini rename to Data/Sys/GameSettings/RF7J08.ini diff --git a/Data/Sys/GameConfig/RFBE01.ini b/Data/Sys/GameSettings/RFBE01.ini similarity index 100% rename from Data/Sys/GameConfig/RFBE01.ini rename to Data/Sys/GameSettings/RFBE01.ini diff --git a/Data/Sys/GameConfig/RFBJ01.ini b/Data/Sys/GameSettings/RFBJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RFBJ01.ini rename to Data/Sys/GameSettings/RFBJ01.ini diff --git a/Data/Sys/GameConfig/RFBP01.ini b/Data/Sys/GameSettings/RFBP01.ini similarity index 100% rename from Data/Sys/GameConfig/RFBP01.ini rename to Data/Sys/GameSettings/RFBP01.ini diff --git a/Data/Sys/GameConfig/RFCEGD.ini b/Data/Sys/GameSettings/RFCEGD.ini similarity index 100% rename from Data/Sys/GameConfig/RFCEGD.ini rename to Data/Sys/GameSettings/RFCEGD.ini diff --git a/Data/Sys/GameConfig/RFCJGD.ini b/Data/Sys/GameSettings/RFCJGD.ini similarity index 100% rename from Data/Sys/GameConfig/RFCJGD.ini rename to Data/Sys/GameSettings/RFCJGD.ini diff --git a/Data/Sys/GameConfig/RFCPGD.ini b/Data/Sys/GameSettings/RFCPGD.ini similarity index 100% rename from Data/Sys/GameConfig/RFCPGD.ini rename to Data/Sys/GameSettings/RFCPGD.ini diff --git a/Data/Sys/GameConfig/RFEE01.ini b/Data/Sys/GameSettings/RFEE01.ini similarity index 100% rename from Data/Sys/GameConfig/RFEE01.ini rename to Data/Sys/GameSettings/RFEE01.ini diff --git a/Data/Sys/GameConfig/RFEJ01.ini b/Data/Sys/GameSettings/RFEJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RFEJ01.ini rename to Data/Sys/GameSettings/RFEJ01.ini diff --git a/Data/Sys/GameConfig/RFEP01.ini b/Data/Sys/GameSettings/RFEP01.ini similarity index 100% rename from Data/Sys/GameConfig/RFEP01.ini rename to Data/Sys/GameSettings/RFEP01.ini diff --git a/Data/Sys/GameConfig/RFFEGD.ini b/Data/Sys/GameSettings/RFFEGD.ini similarity index 100% rename from Data/Sys/GameConfig/RFFEGD.ini rename to Data/Sys/GameSettings/RFFEGD.ini diff --git a/Data/Sys/GameConfig/RFFJGD.ini b/Data/Sys/GameSettings/RFFJGD.ini similarity index 100% rename from Data/Sys/GameConfig/RFFJGD.ini rename to Data/Sys/GameSettings/RFFJGD.ini diff --git a/Data/Sys/GameConfig/RFFPGD.ini b/Data/Sys/GameSettings/RFFPGD.ini similarity index 100% rename from Data/Sys/GameConfig/RFFPGD.ini rename to Data/Sys/GameSettings/RFFPGD.ini diff --git a/Data/Sys/GameConfig/RFQP69.ini b/Data/Sys/GameSettings/RFQP69.ini similarity index 100% rename from Data/Sys/GameConfig/RFQP69.ini rename to Data/Sys/GameSettings/RFQP69.ini diff --git a/Data/Sys/GameConfig/RFSEEB.ini b/Data/Sys/GameSettings/RFSEEB.ini similarity index 100% rename from Data/Sys/GameConfig/RFSEEB.ini rename to Data/Sys/GameSettings/RFSEEB.ini diff --git a/Data/Sys/GameConfig/RFSJ8P.ini b/Data/Sys/GameSettings/RFSJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/RFSJ8P.ini rename to Data/Sys/GameSettings/RFSJ8P.ini diff --git a/Data/Sys/GameConfig/RG5PWR.ini b/Data/Sys/GameSettings/RG5PWR.ini similarity index 100% rename from Data/Sys/GameConfig/RG5PWR.ini rename to Data/Sys/GameSettings/RG5PWR.ini diff --git a/Data/Sys/GameConfig/RGAE8P.ini b/Data/Sys/GameSettings/RGAE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RGAE8P.ini rename to Data/Sys/GameSettings/RGAE8P.ini diff --git a/Data/Sys/GameConfig/RGHE52.ini b/Data/Sys/GameSettings/RGHE52.ini similarity index 100% rename from Data/Sys/GameConfig/RGHE52.ini rename to Data/Sys/GameSettings/RGHE52.ini diff --git a/Data/Sys/GameConfig/RGLE7D.ini b/Data/Sys/GameSettings/RGLE7D.ini similarity index 100% rename from Data/Sys/GameConfig/RGLE7D.ini rename to Data/Sys/GameSettings/RGLE7D.ini diff --git a/Data/Sys/GameConfig/RGQE70.ini b/Data/Sys/GameSettings/RGQE70.ini similarity index 97% rename from Data/Sys/GameConfig/RGQE70.ini rename to Data/Sys/GameSettings/RGQE70.ini index 1a0fa42946..15954f207f 100644 --- a/Data/Sys/GameConfig/RGQE70.ini +++ b/Data/Sys/GameSettings/RGQE70.ini @@ -13,7 +13,7 @@ EmulationStateId = 4 [OnFrame] # Add memory patches to be applied every frame here. -+$crashfix +$crashfix 0x8006935C:dword:0x60000000 [ActionReplay] diff --git a/Data/Sys/GameConfig/RGVP52.ini b/Data/Sys/GameSettings/RGVP52.ini similarity index 100% rename from Data/Sys/GameConfig/RGVP52.ini rename to Data/Sys/GameSettings/RGVP52.ini diff --git a/Data/Sys/GameConfig/RH2P41.ini b/Data/Sys/GameSettings/RH2P41.ini similarity index 100% rename from Data/Sys/GameConfig/RH2P41.ini rename to Data/Sys/GameSettings/RH2P41.ini diff --git a/Data/Sys/GameConfig/RH8E4F.ini b/Data/Sys/GameSettings/RH8E4F.ini similarity index 100% rename from Data/Sys/GameConfig/RH8E4F.ini rename to Data/Sys/GameSettings/RH8E4F.ini diff --git a/Data/Sys/GameConfig/RH8JEL.ini b/Data/Sys/GameSettings/RH8JEL.ini similarity index 100% rename from Data/Sys/GameConfig/RH8JEL.ini rename to Data/Sys/GameSettings/RH8JEL.ini diff --git a/Data/Sys/GameConfig/RH8P4F.ini b/Data/Sys/GameSettings/RH8P4F.ini similarity index 100% rename from Data/Sys/GameConfig/RH8P4F.ini rename to Data/Sys/GameSettings/RH8P4F.ini diff --git a/Data/Sys/GameConfig/RH8X4F.ini b/Data/Sys/GameSettings/RH8X4F.ini similarity index 100% rename from Data/Sys/GameConfig/RH8X4F.ini rename to Data/Sys/GameSettings/RH8X4F.ini diff --git a/Data/Sys/GameConfig/RHAE01.ini b/Data/Sys/GameSettings/RHAE01.ini similarity index 100% rename from Data/Sys/GameConfig/RHAE01.ini rename to Data/Sys/GameSettings/RHAE01.ini diff --git a/Data/Sys/GameConfig/RHAJ01.ini b/Data/Sys/GameSettings/RHAJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RHAJ01.ini rename to Data/Sys/GameSettings/RHAJ01.ini diff --git a/Data/Sys/GameConfig/RHAK01.ini b/Data/Sys/GameSettings/RHAK01.ini similarity index 100% rename from Data/Sys/GameConfig/RHAK01.ini rename to Data/Sys/GameSettings/RHAK01.ini diff --git a/Data/Sys/GameConfig/RHAP01.ini b/Data/Sys/GameSettings/RHAP01.ini similarity index 100% rename from Data/Sys/GameConfig/RHAP01.ini rename to Data/Sys/GameSettings/RHAP01.ini diff --git a/Data/Sys/GameConfig/RHAW01.ini b/Data/Sys/GameSettings/RHAW01.ini similarity index 100% rename from Data/Sys/GameConfig/RHAW01.ini rename to Data/Sys/GameSettings/RHAW01.ini diff --git a/Data/Sys/GameConfig/RHDE8P.ini b/Data/Sys/GameSettings/RHDE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RHDE8P.ini rename to Data/Sys/GameSettings/RHDE8P.ini diff --git a/Data/Sys/GameConfig/RHDJ8P.ini b/Data/Sys/GameSettings/RHDJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/RHDJ8P.ini rename to Data/Sys/GameSettings/RHDJ8P.ini diff --git a/Data/Sys/GameConfig/RHDP8P.ini b/Data/Sys/GameSettings/RHDP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RHDP8P.ini rename to Data/Sys/GameSettings/RHDP8P.ini diff --git a/Data/Sys/GameConfig/RHMEE9.ini b/Data/Sys/GameSettings/RHMEE9.ini similarity index 100% rename from Data/Sys/GameConfig/RHMEE9.ini rename to Data/Sys/GameSettings/RHMEE9.ini diff --git a/Data/Sys/GameConfig/RHMP99.ini b/Data/Sys/GameSettings/RHMP99.ini similarity index 100% rename from Data/Sys/GameConfig/RHMP99.ini rename to Data/Sys/GameSettings/RHMP99.ini diff --git a/Data/Sys/GameConfig/RHOE8P.ini b/Data/Sys/GameSettings/RHOE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RHOE8P.ini rename to Data/Sys/GameSettings/RHOE8P.ini diff --git a/Data/Sys/GameConfig/RHOJ8P.ini b/Data/Sys/GameSettings/RHOJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/RHOJ8P.ini rename to Data/Sys/GameSettings/RHOJ8P.ini diff --git a/Data/Sys/GameConfig/RHOP8P.ini b/Data/Sys/GameSettings/RHOP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RHOP8P.ini rename to Data/Sys/GameSettings/RHOP8P.ini diff --git a/Data/Sys/GameConfig/RHTP54.ini b/Data/Sys/GameSettings/RHTP54.ini similarity index 100% rename from Data/Sys/GameConfig/RHTP54.ini rename to Data/Sys/GameSettings/RHTP54.ini diff --git a/Data/Sys/GameConfig/RHUP7J.ini b/Data/Sys/GameSettings/RHUP7J.ini similarity index 100% rename from Data/Sys/GameConfig/RHUP7J.ini rename to Data/Sys/GameSettings/RHUP7J.ini diff --git a/Data/Sys/GameConfig/RIBPKM.ini b/Data/Sys/GameSettings/RIBPKM.ini similarity index 100% rename from Data/Sys/GameConfig/RIBPKM.ini rename to Data/Sys/GameSettings/RIBPKM.ini diff --git a/Data/Sys/GameConfig/RIHP8P.ini b/Data/Sys/GameSettings/RIHP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RIHP8P.ini rename to Data/Sys/GameSettings/RIHP8P.ini diff --git a/Data/Sys/GameConfig/RIJE69.ini b/Data/Sys/GameSettings/RIJE69.ini similarity index 100% rename from Data/Sys/GameConfig/RIJE69.ini rename to Data/Sys/GameSettings/RIJE69.ini diff --git a/Data/Sys/GameConfig/RINE08.ini b/Data/Sys/GameSettings/RINE08.ini similarity index 100% rename from Data/Sys/GameConfig/RINE08.ini rename to Data/Sys/GameSettings/RINE08.ini diff --git a/Data/Sys/GameConfig/RINP08.ini b/Data/Sys/GameSettings/RINP08.ini similarity index 100% rename from Data/Sys/GameConfig/RINP08.ini rename to Data/Sys/GameSettings/RINP08.ini diff --git a/Data/Sys/GameConfig/RIPEAF.ini b/Data/Sys/GameSettings/RIPEAF.ini similarity index 100% rename from Data/Sys/GameConfig/RIPEAF.ini rename to Data/Sys/GameSettings/RIPEAF.ini diff --git a/Data/Sys/GameConfig/RIPJAF.ini b/Data/Sys/GameSettings/RIPJAF.ini similarity index 100% rename from Data/Sys/GameConfig/RIPJAF.ini rename to Data/Sys/GameSettings/RIPJAF.ini diff --git a/Data/Sys/GameConfig/RIPPAF.ini b/Data/Sys/GameSettings/RIPPAF.ini similarity index 100% rename from Data/Sys/GameConfig/RIPPAF.ini rename to Data/Sys/GameSettings/RIPPAF.ini diff --git a/Data/Sys/GameConfig/RIUJAF.ini b/Data/Sys/GameSettings/RIUJAF.ini similarity index 100% rename from Data/Sys/GameConfig/RIUJAF.ini rename to Data/Sys/GameSettings/RIUJAF.ini diff --git a/Data/Sys/GameConfig/RIUPAF.ini b/Data/Sys/GameSettings/RIUPAF.ini similarity index 100% rename from Data/Sys/GameConfig/RIUPAF.ini rename to Data/Sys/GameSettings/RIUPAF.ini diff --git a/Data/Sys/GameConfig/RIVEXJ.ini b/Data/Sys/GameSettings/RIVEXJ.ini similarity index 100% rename from Data/Sys/GameConfig/RIVEXJ.ini rename to Data/Sys/GameSettings/RIVEXJ.ini diff --git a/Data/Sys/GameConfig/RJ3P7J.ini b/Data/Sys/GameSettings/RJ3P7J.ini similarity index 100% rename from Data/Sys/GameConfig/RJ3P7J.ini rename to Data/Sys/GameSettings/RJ3P7J.ini diff --git a/Data/Sys/GameConfig/RJAP52.ini b/Data/Sys/GameSettings/RJAP52.ini similarity index 100% rename from Data/Sys/GameConfig/RJAP52.ini rename to Data/Sys/GameSettings/RJAP52.ini diff --git a/Data/Sys/GameConfig/RJCP52.ini b/Data/Sys/GameSettings/RJCP52.ini similarity index 100% rename from Data/Sys/GameConfig/RJCP52.ini rename to Data/Sys/GameSettings/RJCP52.ini diff --git a/Data/Sys/GameConfig/RJSXUG.ini b/Data/Sys/GameSettings/RJSXUG.ini similarity index 100% rename from Data/Sys/GameConfig/RJSXUG.ini rename to Data/Sys/GameSettings/RJSXUG.ini diff --git a/Data/Sys/GameConfig/RK2EEB.ini b/Data/Sys/GameSettings/RK2EEB.ini similarity index 100% rename from Data/Sys/GameConfig/RK2EEB.ini rename to Data/Sys/GameSettings/RK2EEB.ini diff --git a/Data/Sys/GameConfig/RK2JEB.ini b/Data/Sys/GameSettings/RK2JEB.ini similarity index 100% rename from Data/Sys/GameConfig/RK2JEB.ini rename to Data/Sys/GameSettings/RK2JEB.ini diff --git a/Data/Sys/GameConfig/RK2P01.ini b/Data/Sys/GameSettings/RK2P01.ini similarity index 100% rename from Data/Sys/GameConfig/RK2P01.ini rename to Data/Sys/GameSettings/RK2P01.ini diff --git a/Data/Sys/GameConfig/RK5E01.ini b/Data/Sys/GameSettings/RK5E01.ini similarity index 100% rename from Data/Sys/GameConfig/RK5E01.ini rename to Data/Sys/GameSettings/RK5E01.ini diff --git a/Data/Sys/GameConfig/RKDEEB.ini b/Data/Sys/GameSettings/RKDEEB.ini similarity index 100% rename from Data/Sys/GameConfig/RKDEEB.ini rename to Data/Sys/GameSettings/RKDEEB.ini diff --git a/Data/Sys/GameConfig/RKDJEB.ini b/Data/Sys/GameSettings/RKDJEB.ini similarity index 100% rename from Data/Sys/GameConfig/RKDJEB.ini rename to Data/Sys/GameSettings/RKDJEB.ini diff --git a/Data/Sys/GameConfig/RKDP01.ini b/Data/Sys/GameSettings/RKDP01.ini similarity index 100% rename from Data/Sys/GameConfig/RKDP01.ini rename to Data/Sys/GameSettings/RKDP01.ini diff --git a/Data/Sys/GameConfig/RKDPEB.ini b/Data/Sys/GameSettings/RKDPEB.ini similarity index 100% rename from Data/Sys/GameConfig/RKDPEB.ini rename to Data/Sys/GameSettings/RKDPEB.ini diff --git a/Data/Sys/GameConfig/RKIPUG.ini b/Data/Sys/GameSettings/RKIPUG.ini similarity index 100% rename from Data/Sys/GameConfig/RKIPUG.ini rename to Data/Sys/GameSettings/RKIPUG.ini diff --git a/Data/Sys/GameConfig/RKMP5D.ini b/Data/Sys/GameSettings/RKMP5D.ini similarity index 100% rename from Data/Sys/GameConfig/RKMP5D.ini rename to Data/Sys/GameSettings/RKMP5D.ini diff --git a/Data/Sys/GameConfig/RKSPUG.ini b/Data/Sys/GameSettings/RKSPUG.ini similarity index 100% rename from Data/Sys/GameConfig/RKSPUG.ini rename to Data/Sys/GameSettings/RKSPUG.ini diff --git a/Data/Sys/GameConfig/RLBEWR.ini b/Data/Sys/GameSettings/RLBEWR.ini similarity index 100% rename from Data/Sys/GameConfig/RLBEWR.ini rename to Data/Sys/GameSettings/RLBEWR.ini diff --git a/Data/Sys/GameConfig/RLEEFS.ini b/Data/Sys/GameSettings/RLEEFS.ini similarity index 100% rename from Data/Sys/GameConfig/RLEEFS.ini rename to Data/Sys/GameSettings/RLEEFS.ini diff --git a/Data/Sys/GameConfig/RLGE64.ini b/Data/Sys/GameSettings/RLGE64.ini similarity index 100% rename from Data/Sys/GameConfig/RLGE64.ini rename to Data/Sys/GameSettings/RLGE64.ini diff --git a/Data/Sys/GameConfig/RLGJ52.ini b/Data/Sys/GameSettings/RLGJ52.ini similarity index 100% rename from Data/Sys/GameConfig/RLGJ52.ini rename to Data/Sys/GameSettings/RLGJ52.ini diff --git a/Data/Sys/GameConfig/RLGP64.ini b/Data/Sys/GameSettings/RLGP64.ini similarity index 100% rename from Data/Sys/GameConfig/RLGP64.ini rename to Data/Sys/GameSettings/RLGP64.ini diff --git a/Data/Sys/GameConfig/RLJPKM.ini b/Data/Sys/GameSettings/RLJPKM.ini similarity index 100% rename from Data/Sys/GameConfig/RLJPKM.ini rename to Data/Sys/GameSettings/RLJPKM.ini diff --git a/Data/Sys/GameConfig/RLXEMJ.ini b/Data/Sys/GameSettings/RLXEMJ.ini similarity index 100% rename from Data/Sys/GameConfig/RLXEMJ.ini rename to Data/Sys/GameSettings/RLXEMJ.ini diff --git a/Data/Sys/GameConfig/RM2E69.ini b/Data/Sys/GameSettings/RM2E69.ini similarity index 100% rename from Data/Sys/GameConfig/RM2E69.ini rename to Data/Sys/GameSettings/RM2E69.ini diff --git a/Data/Sys/GameConfig/RM3E01.ini b/Data/Sys/GameSettings/RM3E01.ini similarity index 100% rename from Data/Sys/GameConfig/RM3E01.ini rename to Data/Sys/GameSettings/RM3E01.ini diff --git a/Data/Sys/GameConfig/RM3J01.ini b/Data/Sys/GameSettings/RM3J01.ini similarity index 100% rename from Data/Sys/GameConfig/RM3J01.ini rename to Data/Sys/GameSettings/RM3J01.ini diff --git a/Data/Sys/GameConfig/RM3P01.ini b/Data/Sys/GameSettings/RM3P01.ini similarity index 100% rename from Data/Sys/GameConfig/RM3P01.ini rename to Data/Sys/GameSettings/RM3P01.ini diff --git a/Data/Sys/GameConfig/RM6EEB.ini b/Data/Sys/GameSettings/RM6EEB.ini similarity index 100% rename from Data/Sys/GameConfig/RM6EEB.ini rename to Data/Sys/GameSettings/RM6EEB.ini diff --git a/Data/Sys/GameConfig/RM8E01.ini b/Data/Sys/GameSettings/RM8E01.ini similarity index 100% rename from Data/Sys/GameConfig/RM8E01.ini rename to Data/Sys/GameSettings/RM8E01.ini diff --git a/Data/Sys/GameConfig/RM8J01.ini b/Data/Sys/GameSettings/RM8J01.ini similarity index 100% rename from Data/Sys/GameConfig/RM8J01.ini rename to Data/Sys/GameSettings/RM8J01.ini diff --git a/Data/Sys/GameConfig/RM8K01.ini b/Data/Sys/GameSettings/RM8K01.ini similarity index 100% rename from Data/Sys/GameConfig/RM8K01.ini rename to Data/Sys/GameSettings/RM8K01.ini diff --git a/Data/Sys/GameConfig/RM8P01.ini b/Data/Sys/GameSettings/RM8P01.ini similarity index 100% rename from Data/Sys/GameConfig/RM8P01.ini rename to Data/Sys/GameSettings/RM8P01.ini diff --git a/Data/Sys/GameConfig/RMAE01.ini b/Data/Sys/GameSettings/RMAE01.ini similarity index 100% rename from Data/Sys/GameConfig/RMAE01.ini rename to Data/Sys/GameSettings/RMAE01.ini diff --git a/Data/Sys/GameConfig/RMAP01.ini b/Data/Sys/GameSettings/RMAP01.ini similarity index 100% rename from Data/Sys/GameConfig/RMAP01.ini rename to Data/Sys/GameSettings/RMAP01.ini diff --git a/Data/Sys/GameConfig/RMCE01.ini b/Data/Sys/GameSettings/RMCE01.ini similarity index 100% rename from Data/Sys/GameConfig/RMCE01.ini rename to Data/Sys/GameSettings/RMCE01.ini diff --git a/Data/Sys/GameConfig/RMCJ01.ini b/Data/Sys/GameSettings/RMCJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RMCJ01.ini rename to Data/Sys/GameSettings/RMCJ01.ini diff --git a/Data/Sys/GameConfig/RMCK01.ini b/Data/Sys/GameSettings/RMCK01.ini similarity index 100% rename from Data/Sys/GameConfig/RMCK01.ini rename to Data/Sys/GameSettings/RMCK01.ini diff --git a/Data/Sys/GameConfig/RMCP01.ini b/Data/Sys/GameSettings/RMCP01.ini similarity index 100% rename from Data/Sys/GameConfig/RMCP01.ini rename to Data/Sys/GameSettings/RMCP01.ini diff --git a/Data/Sys/GameConfig/RMGE01.ini b/Data/Sys/GameSettings/RMGE01.ini similarity index 100% rename from Data/Sys/GameConfig/RMGE01.ini rename to Data/Sys/GameSettings/RMGE01.ini diff --git a/Data/Sys/GameConfig/RMGJ01.ini b/Data/Sys/GameSettings/RMGJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RMGJ01.ini rename to Data/Sys/GameSettings/RMGJ01.ini diff --git a/Data/Sys/GameConfig/RMGK01.ini b/Data/Sys/GameSettings/RMGK01.ini similarity index 100% rename from Data/Sys/GameConfig/RMGK01.ini rename to Data/Sys/GameSettings/RMGK01.ini diff --git a/Data/Sys/GameConfig/RMGP01.ini b/Data/Sys/GameSettings/RMGP01.ini similarity index 100% rename from Data/Sys/GameConfig/RMGP01.ini rename to Data/Sys/GameSettings/RMGP01.ini diff --git a/Data/Sys/GameConfig/RMHE08.ini b/Data/Sys/GameSettings/RMHE08.ini similarity index 98% rename from Data/Sys/GameConfig/RMHE08.ini rename to Data/Sys/GameSettings/RMHE08.ini index 98bbab0d30..e968f2045d 100644 --- a/Data/Sys/GameConfig/RMHE08.ini +++ b/Data/Sys/GameSettings/RMHE08.ini @@ -14,7 +14,7 @@ EmulationStateId = 4 [OnFrame] # Add memory patches to be applied every frame here. -+$Bloom OFF +$Bloom OFF 0x04056FF4:dword:0xC022FFE4 0x0479DA84:dword:0x3F800000 diff --git a/Data/Sys/GameConfig/RMHJ08.ini b/Data/Sys/GameSettings/RMHJ08.ini similarity index 100% rename from Data/Sys/GameConfig/RMHJ08.ini rename to Data/Sys/GameSettings/RMHJ08.ini diff --git a/Data/Sys/GameConfig/RMHP08.ini b/Data/Sys/GameSettings/RMHP08.ini similarity index 100% rename from Data/Sys/GameConfig/RMHP08.ini rename to Data/Sys/GameSettings/RMHP08.ini diff --git a/Data/Sys/GameConfig/RMKE01.ini b/Data/Sys/GameSettings/RMKE01.ini similarity index 100% rename from Data/Sys/GameConfig/RMKE01.ini rename to Data/Sys/GameSettings/RMKE01.ini diff --git a/Data/Sys/GameConfig/RMKJ01.ini b/Data/Sys/GameSettings/RMKJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RMKJ01.ini rename to Data/Sys/GameSettings/RMKJ01.ini diff --git a/Data/Sys/GameConfig/RMKP01.ini b/Data/Sys/GameSettings/RMKP01.ini similarity index 100% rename from Data/Sys/GameConfig/RMKP01.ini rename to Data/Sys/GameSettings/RMKP01.ini diff --git a/Data/Sys/GameConfig/RMLEH4.ini b/Data/Sys/GameSettings/RMLEH4.ini similarity index 100% rename from Data/Sys/GameConfig/RMLEH4.ini rename to Data/Sys/GameSettings/RMLEH4.ini diff --git a/Data/Sys/GameConfig/RMLJH4.ini b/Data/Sys/GameSettings/RMLJH4.ini similarity index 100% rename from Data/Sys/GameConfig/RMLJH4.ini rename to Data/Sys/GameSettings/RMLJH4.ini diff --git a/Data/Sys/GameConfig/RMLK52.ini b/Data/Sys/GameSettings/RMLK52.ini similarity index 100% rename from Data/Sys/GameConfig/RMLK52.ini rename to Data/Sys/GameSettings/RMLK52.ini diff --git a/Data/Sys/GameConfig/RMLP7U.ini b/Data/Sys/GameSettings/RMLP7U.ini similarity index 100% rename from Data/Sys/GameConfig/RMLP7U.ini rename to Data/Sys/GameSettings/RMLP7U.ini diff --git a/Data/Sys/GameConfig/RMLPH4.ini b/Data/Sys/GameSettings/RMLPH4.ini similarity index 100% rename from Data/Sys/GameConfig/RMLPH4.ini rename to Data/Sys/GameSettings/RMLPH4.ini diff --git a/Data/Sys/GameConfig/RMSE52.ini b/Data/Sys/GameSettings/RMSE52.ini similarity index 100% rename from Data/Sys/GameConfig/RMSE52.ini rename to Data/Sys/GameSettings/RMSE52.ini diff --git a/Data/Sys/GameConfig/RNEEDA.ini b/Data/Sys/GameSettings/RNEEDA.ini similarity index 100% rename from Data/Sys/GameConfig/RNEEDA.ini rename to Data/Sys/GameSettings/RNEEDA.ini diff --git a/Data/Sys/GameConfig/RNEJDA.ini b/Data/Sys/GameSettings/RNEJDA.ini similarity index 100% rename from Data/Sys/GameConfig/RNEJDA.ini rename to Data/Sys/GameSettings/RNEJDA.ini diff --git a/Data/Sys/GameConfig/RNEPDA.ini b/Data/Sys/GameSettings/RNEPDA.ini similarity index 100% rename from Data/Sys/GameConfig/RNEPDA.ini rename to Data/Sys/GameSettings/RNEPDA.ini diff --git a/Data/Sys/GameConfig/RNHE41.ini b/Data/Sys/GameSettings/RNHE41.ini similarity index 100% rename from Data/Sys/GameConfig/RNHE41.ini rename to Data/Sys/GameSettings/RNHE41.ini diff --git a/Data/Sys/GameConfig/RNMXUG.ini b/Data/Sys/GameSettings/RNMXUG.ini similarity index 100% rename from Data/Sys/GameConfig/RNMXUG.ini rename to Data/Sys/GameSettings/RNMXUG.ini diff --git a/Data/Sys/GameConfig/RNOJ01.ini b/Data/Sys/GameSettings/RNOJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RNOJ01.ini rename to Data/Sys/GameSettings/RNOJ01.ini diff --git a/Data/Sys/GameConfig/RNOP01.ini b/Data/Sys/GameSettings/RNOP01.ini similarity index 100% rename from Data/Sys/GameConfig/RNOP01.ini rename to Data/Sys/GameSettings/RNOP01.ini diff --git a/Data/Sys/GameConfig/RO2P7N.ini b/Data/Sys/GameSettings/RO2P7N.ini similarity index 97% rename from Data/Sys/GameConfig/RO2P7N.ini rename to Data/Sys/GameSettings/RO2P7N.ini index 5f84ef165b..2f26d6a6e3 100644 --- a/Data/Sys/GameConfig/RO2P7N.ini +++ b/Data/Sys/GameSettings/RO2P7N.ini @@ -13,7 +13,7 @@ EmulationIssues = [OnFrame] # Add memory patches to be applied every frame here. -+$Hangfix +$Hangfix 0x8007D340:byte:0x00000090 0x8007D344:byte:0x00000090 0x8007D348:byte:0x00000090 diff --git a/Data/Sys/GameConfig/RO3EXJ.ini b/Data/Sys/GameSettings/RO3EXJ.ini similarity index 100% rename from Data/Sys/GameConfig/RO3EXJ.ini rename to Data/Sys/GameSettings/RO3EXJ.ini diff --git a/Data/Sys/GameConfig/RO3J99.ini b/Data/Sys/GameSettings/RO3J99.ini similarity index 100% rename from Data/Sys/GameConfig/RO3J99.ini rename to Data/Sys/GameSettings/RO3J99.ini diff --git a/Data/Sys/GameConfig/RO3P99.ini b/Data/Sys/GameSettings/RO3P99.ini similarity index 100% rename from Data/Sys/GameConfig/RO3P99.ini rename to Data/Sys/GameSettings/RO3P99.ini diff --git a/Data/Sys/GameConfig/RO7P7D.ini b/Data/Sys/GameSettings/RO7P7D.ini similarity index 100% rename from Data/Sys/GameConfig/RO7P7D.ini rename to Data/Sys/GameSettings/RO7P7D.ini diff --git a/Data/Sys/GameConfig/RO8E7D.ini b/Data/Sys/GameSettings/RO8E7D.ini similarity index 100% rename from Data/Sys/GameConfig/RO8E7D.ini rename to Data/Sys/GameSettings/RO8E7D.ini diff --git a/Data/Sys/GameConfig/RO9EFS.ini b/Data/Sys/GameSettings/RO9EFS.ini similarity index 100% rename from Data/Sys/GameConfig/RO9EFS.ini rename to Data/Sys/GameSettings/RO9EFS.ini diff --git a/Data/Sys/GameConfig/RO9PNK.ini b/Data/Sys/GameSettings/RO9PNK.ini similarity index 100% rename from Data/Sys/GameConfig/RO9PNK.ini rename to Data/Sys/GameSettings/RO9PNK.ini diff --git a/Data/Sys/GameConfig/ROAE36.ini b/Data/Sys/GameSettings/ROAE36.ini similarity index 100% rename from Data/Sys/GameConfig/ROAE36.ini rename to Data/Sys/GameSettings/ROAE36.ini diff --git a/Data/Sys/GameConfig/ROAP36.ini b/Data/Sys/GameSettings/ROAP36.ini similarity index 100% rename from Data/Sys/GameConfig/ROAP36.ini rename to Data/Sys/GameSettings/ROAP36.ini diff --git a/Data/Sys/GameConfig/ROCPNK.ini b/Data/Sys/GameSettings/ROCPNK.ini similarity index 100% rename from Data/Sys/GameConfig/ROCPNK.ini rename to Data/Sys/GameSettings/ROCPNK.ini diff --git a/Data/Sys/GameConfig/RODE01.ini b/Data/Sys/GameSettings/RODE01.ini similarity index 100% rename from Data/Sys/GameConfig/RODE01.ini rename to Data/Sys/GameSettings/RODE01.ini diff --git a/Data/Sys/GameConfig/RODJ01.ini b/Data/Sys/GameSettings/RODJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RODJ01.ini rename to Data/Sys/GameSettings/RODJ01.ini diff --git a/Data/Sys/GameConfig/RODK01.ini b/Data/Sys/GameSettings/RODK01.ini similarity index 100% rename from Data/Sys/GameConfig/RODK01.ini rename to Data/Sys/GameSettings/RODK01.ini diff --git a/Data/Sys/GameConfig/RODP01.ini b/Data/Sys/GameSettings/RODP01.ini similarity index 100% rename from Data/Sys/GameConfig/RODP01.ini rename to Data/Sys/GameSettings/RODP01.ini diff --git a/Data/Sys/GameConfig/ROLE8P.ini b/Data/Sys/GameSettings/ROLE8P.ini similarity index 100% rename from Data/Sys/GameConfig/ROLE8P.ini rename to Data/Sys/GameSettings/ROLE8P.ini diff --git a/Data/Sys/GameConfig/ROLJ01.ini b/Data/Sys/GameSettings/ROLJ01.ini similarity index 100% rename from Data/Sys/GameConfig/ROLJ01.ini rename to Data/Sys/GameSettings/ROLJ01.ini diff --git a/Data/Sys/GameConfig/ROLK01.ini b/Data/Sys/GameSettings/ROLK01.ini similarity index 100% rename from Data/Sys/GameConfig/ROLK01.ini rename to Data/Sys/GameSettings/ROLK01.ini diff --git a/Data/Sys/GameConfig/ROLP8P.ini b/Data/Sys/GameSettings/ROLP8P.ini similarity index 100% rename from Data/Sys/GameConfig/ROLP8P.ini rename to Data/Sys/GameSettings/ROLP8P.ini diff --git a/Data/Sys/GameConfig/RONEG9.ini b/Data/Sys/GameSettings/RONEG9.ini similarity index 100% rename from Data/Sys/GameConfig/RONEG9.ini rename to Data/Sys/GameSettings/RONEG9.ini diff --git a/Data/Sys/GameConfig/RONJG9.ini b/Data/Sys/GameSettings/RONJG9.ini similarity index 100% rename from Data/Sys/GameConfig/RONJG9.ini rename to Data/Sys/GameSettings/RONJG9.ini diff --git a/Data/Sys/GameConfig/RONPG9.ini b/Data/Sys/GameSettings/RONPG9.ini similarity index 100% rename from Data/Sys/GameConfig/RONPG9.ini rename to Data/Sys/GameSettings/RONPG9.ini diff --git a/Data/Sys/GameConfig/ROUJAF.ini b/Data/Sys/GameSettings/ROUJAF.ini similarity index 100% rename from Data/Sys/GameConfig/ROUJAF.ini rename to Data/Sys/GameSettings/ROUJAF.ini diff --git a/Data/Sys/GameConfig/ROUPAF.ini b/Data/Sys/GameSettings/ROUPAF.ini similarity index 100% rename from Data/Sys/GameConfig/ROUPAF.ini rename to Data/Sys/GameSettings/ROUPAF.ini diff --git a/Data/Sys/GameConfig/ROWE08.ini b/Data/Sys/GameSettings/ROWE08.ini similarity index 100% rename from Data/Sys/GameConfig/ROWE08.ini rename to Data/Sys/GameSettings/ROWE08.ini diff --git a/Data/Sys/GameConfig/ROWJ08.ini b/Data/Sys/GameSettings/ROWJ08.ini similarity index 100% rename from Data/Sys/GameConfig/ROWJ08.ini rename to Data/Sys/GameSettings/ROWJ08.ini diff --git a/Data/Sys/GameConfig/ROWP08.ini b/Data/Sys/GameSettings/ROWP08.ini similarity index 100% rename from Data/Sys/GameConfig/ROWP08.ini rename to Data/Sys/GameSettings/ROWP08.ini diff --git a/Data/Sys/GameConfig/RP7P52.ini b/Data/Sys/GameSettings/RP7P52.ini similarity index 100% rename from Data/Sys/GameConfig/RP7P52.ini rename to Data/Sys/GameSettings/RP7P52.ini diff --git a/Data/Sys/GameConfig/RPBE01.ini b/Data/Sys/GameSettings/RPBE01.ini similarity index 100% rename from Data/Sys/GameConfig/RPBE01.ini rename to Data/Sys/GameSettings/RPBE01.ini diff --git a/Data/Sys/GameConfig/RPBJ01.ini b/Data/Sys/GameSettings/RPBJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RPBJ01.ini rename to Data/Sys/GameSettings/RPBJ01.ini diff --git a/Data/Sys/GameConfig/RPBP01.ini b/Data/Sys/GameSettings/RPBP01.ini similarity index 100% rename from Data/Sys/GameConfig/RPBP01.ini rename to Data/Sys/GameSettings/RPBP01.ini diff --git a/Data/Sys/GameConfig/RPDPGN.ini b/Data/Sys/GameSettings/RPDPGN.ini similarity index 100% rename from Data/Sys/GameConfig/RPDPGN.ini rename to Data/Sys/GameSettings/RPDPGN.ini diff --git a/Data/Sys/GameConfig/RPJE7U.ini b/Data/Sys/GameSettings/RPJE7U.ini similarity index 100% rename from Data/Sys/GameConfig/RPJE7U.ini rename to Data/Sys/GameSettings/RPJE7U.ini diff --git a/Data/Sys/GameConfig/RPJJ99.ini b/Data/Sys/GameSettings/RPJJ99.ini similarity index 100% rename from Data/Sys/GameConfig/RPJJ99.ini rename to Data/Sys/GameSettings/RPJJ99.ini diff --git a/Data/Sys/GameConfig/RPPE41.ini b/Data/Sys/GameSettings/RPPE41.ini similarity index 100% rename from Data/Sys/GameConfig/RPPE41.ini rename to Data/Sys/GameSettings/RPPE41.ini diff --git a/Data/Sys/GameConfig/RPWZ41.ini b/Data/Sys/GameSettings/RPWZ41.ini similarity index 100% rename from Data/Sys/GameConfig/RPWZ41.ini rename to Data/Sys/GameSettings/RPWZ41.ini diff --git a/Data/Sys/GameConfig/RPYP9B.ini b/Data/Sys/GameSettings/RPYP9B.ini similarity index 100% rename from Data/Sys/GameConfig/RPYP9B.ini rename to Data/Sys/GameSettings/RPYP9B.ini diff --git a/Data/Sys/GameConfig/RQ6EJJ.ini b/Data/Sys/GameSettings/RQ6EJJ.ini similarity index 100% rename from Data/Sys/GameConfig/RQ6EJJ.ini rename to Data/Sys/GameSettings/RQ6EJJ.ini diff --git a/Data/Sys/GameConfig/RQ6PKM.ini b/Data/Sys/GameSettings/RQ6PKM.ini similarity index 100% rename from Data/Sys/GameConfig/RQ6PKM.ini rename to Data/Sys/GameSettings/RQ6PKM.ini diff --git a/Data/Sys/GameConfig/RQ6XKM.ini b/Data/Sys/GameSettings/RQ6XKM.ini similarity index 100% rename from Data/Sys/GameConfig/RQ6XKM.ini rename to Data/Sys/GameSettings/RQ6XKM.ini diff --git a/Data/Sys/GameConfig/RQBENR.ini b/Data/Sys/GameSettings/RQBENR.ini similarity index 100% rename from Data/Sys/GameConfig/RQBENR.ini rename to Data/Sys/GameSettings/RQBENR.ini diff --git a/Data/Sys/GameConfig/RQLE64.ini b/Data/Sys/GameSettings/RQLE64.ini similarity index 100% rename from Data/Sys/GameConfig/RQLE64.ini rename to Data/Sys/GameSettings/RQLE64.ini diff --git a/Data/Sys/GameConfig/RQOP69.ini b/Data/Sys/GameSettings/RQOP69.ini similarity index 100% rename from Data/Sys/GameConfig/RQOP69.ini rename to Data/Sys/GameSettings/RQOP69.ini diff --git a/Data/Sys/GameConfig/RQREXJ.ini b/Data/Sys/GameSettings/RQREXJ.ini similarity index 100% rename from Data/Sys/GameConfig/RQREXJ.ini rename to Data/Sys/GameSettings/RQREXJ.ini diff --git a/Data/Sys/GameConfig/RQRJAF.ini b/Data/Sys/GameSettings/RQRJAF.ini similarity index 100% rename from Data/Sys/GameConfig/RQRJAF.ini rename to Data/Sys/GameSettings/RQRJAF.ini diff --git a/Data/Sys/GameConfig/RQRPAF.ini b/Data/Sys/GameSettings/RQRPAF.ini similarity index 100% rename from Data/Sys/GameConfig/RQRPAF.ini rename to Data/Sys/GameSettings/RQRPAF.ini diff --git a/Data/Sys/GameConfig/RR2PUG.ini b/Data/Sys/GameSettings/RR2PUG.ini similarity index 100% rename from Data/Sys/GameConfig/RR2PUG.ini rename to Data/Sys/GameSettings/RR2PUG.ini diff --git a/Data/Sys/GameConfig/RR5P70.ini b/Data/Sys/GameSettings/RR5P70.ini similarity index 100% rename from Data/Sys/GameConfig/RR5P70.ini rename to Data/Sys/GameSettings/RR5P70.ini diff --git a/Data/Sys/GameConfig/RRAXUG.ini b/Data/Sys/GameSettings/RRAXUG.ini similarity index 100% rename from Data/Sys/GameConfig/RRAXUG.ini rename to Data/Sys/GameSettings/RRAXUG.ini diff --git a/Data/Sys/GameConfig/RRBE41.ini b/Data/Sys/GameSettings/RRBE41.ini similarity index 100% rename from Data/Sys/GameConfig/RRBE41.ini rename to Data/Sys/GameSettings/RRBE41.ini diff --git a/Data/Sys/GameConfig/RRBJ41.ini b/Data/Sys/GameSettings/RRBJ41.ini similarity index 100% rename from Data/Sys/GameConfig/RRBJ41.ini rename to Data/Sys/GameSettings/RRBJ41.ini diff --git a/Data/Sys/GameConfig/RRBP41.ini b/Data/Sys/GameSettings/RRBP41.ini similarity index 100% rename from Data/Sys/GameConfig/RRBP41.ini rename to Data/Sys/GameSettings/RRBP41.ini diff --git a/Data/Sys/GameConfig/RRKE70.ini b/Data/Sys/GameSettings/RRKE70.ini similarity index 100% rename from Data/Sys/GameConfig/RRKE70.ini rename to Data/Sys/GameSettings/RRKE70.ini diff --git a/Data/Sys/GameConfig/RRKP70.ini b/Data/Sys/GameSettings/RRKP70.ini similarity index 100% rename from Data/Sys/GameConfig/RRKP70.ini rename to Data/Sys/GameSettings/RRKP70.ini diff --git a/Data/Sys/GameConfig/RRMX69.ini b/Data/Sys/GameSettings/RRMX69.ini similarity index 100% rename from Data/Sys/GameConfig/RRMX69.ini rename to Data/Sys/GameSettings/RRMX69.ini diff --git a/Data/Sys/GameConfig/RRXXUG.ini b/Data/Sys/GameSettings/RRXXUG.ini similarity index 100% rename from Data/Sys/GameConfig/RRXXUG.ini rename to Data/Sys/GameSettings/RRXXUG.ini diff --git a/Data/Sys/GameConfig/RRYPHY.ini b/Data/Sys/GameSettings/RRYPHY.ini similarity index 100% rename from Data/Sys/GameConfig/RRYPHY.ini rename to Data/Sys/GameSettings/RRYPHY.ini diff --git a/Data/Sys/GameConfig/RRZEGY.ini b/Data/Sys/GameSettings/RRZEGY.ini similarity index 100% rename from Data/Sys/GameConfig/RRZEGY.ini rename to Data/Sys/GameSettings/RRZEGY.ini diff --git a/Data/Sys/GameConfig/RRZPGY.ini b/Data/Sys/GameSettings/RRZPGY.ini similarity index 100% rename from Data/Sys/GameConfig/RRZPGY.ini rename to Data/Sys/GameSettings/RRZPGY.ini diff --git a/Data/Sys/GameConfig/RS5EC8.ini b/Data/Sys/GameSettings/RS5EC8.ini similarity index 100% rename from Data/Sys/GameConfig/RS5EC8.ini rename to Data/Sys/GameSettings/RS5EC8.ini diff --git a/Data/Sys/GameConfig/RS5JC8.ini b/Data/Sys/GameSettings/RS5JC8.ini similarity index 100% rename from Data/Sys/GameConfig/RS5JC8.ini rename to Data/Sys/GameSettings/RS5JC8.ini diff --git a/Data/Sys/GameConfig/RS5PC8.ini b/Data/Sys/GameSettings/RS5PC8.ini similarity index 100% rename from Data/Sys/GameConfig/RS5PC8.ini rename to Data/Sys/GameSettings/RS5PC8.ini diff --git a/Data/Sys/GameConfig/RS8J8N.ini b/Data/Sys/GameSettings/RS8J8N.ini similarity index 100% rename from Data/Sys/GameConfig/RS8J8N.ini rename to Data/Sys/GameSettings/RS8J8N.ini diff --git a/Data/Sys/GameConfig/RS9E8P.ini b/Data/Sys/GameSettings/RS9E8P.ini similarity index 100% rename from Data/Sys/GameConfig/RS9E8P.ini rename to Data/Sys/GameSettings/RS9E8P.ini diff --git a/Data/Sys/GameConfig/RS9P8P.ini b/Data/Sys/GameSettings/RS9P8P.ini similarity index 100% rename from Data/Sys/GameConfig/RS9P8P.ini rename to Data/Sys/GameSettings/RS9P8P.ini diff --git a/Data/Sys/GameConfig/RSBE01.ini b/Data/Sys/GameSettings/RSBE01.ini similarity index 100% rename from Data/Sys/GameConfig/RSBE01.ini rename to Data/Sys/GameSettings/RSBE01.ini diff --git a/Data/Sys/GameConfig/RSBJ01.ini b/Data/Sys/GameSettings/RSBJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RSBJ01.ini rename to Data/Sys/GameSettings/RSBJ01.ini diff --git a/Data/Sys/GameConfig/RSBP01.ini b/Data/Sys/GameSettings/RSBP01.ini similarity index 100% rename from Data/Sys/GameConfig/RSBP01.ini rename to Data/Sys/GameSettings/RSBP01.ini diff --git a/Data/Sys/GameConfig/RSFE7U.ini b/Data/Sys/GameSettings/RSFE7U.ini similarity index 100% rename from Data/Sys/GameConfig/RSFE7U.ini rename to Data/Sys/GameSettings/RSFE7U.ini diff --git a/Data/Sys/GameConfig/RSFJ99.ini b/Data/Sys/GameSettings/RSFJ99.ini similarity index 100% rename from Data/Sys/GameConfig/RSFJ99.ini rename to Data/Sys/GameSettings/RSFJ99.ini diff --git a/Data/Sys/GameConfig/RSFP99.ini b/Data/Sys/GameSettings/RSFP99.ini similarity index 100% rename from Data/Sys/GameConfig/RSFP99.ini rename to Data/Sys/GameSettings/RSFP99.ini diff --git a/Data/Sys/GameConfig/RSIE69.ini b/Data/Sys/GameSettings/RSIE69.ini similarity index 100% rename from Data/Sys/GameConfig/RSIE69.ini rename to Data/Sys/GameSettings/RSIE69.ini diff --git a/Data/Sys/GameConfig/RSIJ13.ini b/Data/Sys/GameSettings/RSIJ13.ini similarity index 100% rename from Data/Sys/GameConfig/RSIJ13.ini rename to Data/Sys/GameSettings/RSIJ13.ini diff --git a/Data/Sys/GameConfig/RSIP69.ini b/Data/Sys/GameSettings/RSIP69.ini similarity index 100% rename from Data/Sys/GameConfig/RSIP69.ini rename to Data/Sys/GameSettings/RSIP69.ini diff --git a/Data/Sys/GameConfig/RSLEAF.ini b/Data/Sys/GameSettings/RSLEAF.ini similarity index 100% rename from Data/Sys/GameConfig/RSLEAF.ini rename to Data/Sys/GameSettings/RSLEAF.ini diff --git a/Data/Sys/GameConfig/RSLJAF.ini b/Data/Sys/GameSettings/RSLJAF.ini similarity index 100% rename from Data/Sys/GameConfig/RSLJAF.ini rename to Data/Sys/GameSettings/RSLJAF.ini diff --git a/Data/Sys/GameConfig/RSLKAF.ini b/Data/Sys/GameSettings/RSLKAF.ini similarity index 100% rename from Data/Sys/GameConfig/RSLKAF.ini rename to Data/Sys/GameSettings/RSLKAF.ini diff --git a/Data/Sys/GameConfig/RSLPAF.ini b/Data/Sys/GameSettings/RSLPAF.ini similarity index 100% rename from Data/Sys/GameConfig/RSLPAF.ini rename to Data/Sys/GameSettings/RSLPAF.ini diff --git a/Data/Sys/GameConfig/RSME8P.ini b/Data/Sys/GameSettings/RSME8P.ini similarity index 100% rename from Data/Sys/GameConfig/RSME8P.ini rename to Data/Sys/GameSettings/RSME8P.ini diff --git a/Data/Sys/GameConfig/RSMP8P.ini b/Data/Sys/GameSettings/RSMP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RSMP8P.ini rename to Data/Sys/GameSettings/RSMP8P.ini diff --git a/Data/Sys/GameConfig/RSPE01.ini b/Data/Sys/GameSettings/RSPE01.ini similarity index 100% rename from Data/Sys/GameConfig/RSPE01.ini rename to Data/Sys/GameSettings/RSPE01.ini diff --git a/Data/Sys/GameConfig/RSPP01.ini b/Data/Sys/GameSettings/RSPP01.ini similarity index 100% rename from Data/Sys/GameConfig/RSPP01.ini rename to Data/Sys/GameSettings/RSPP01.ini diff --git a/Data/Sys/GameConfig/RSRE8P.ini b/Data/Sys/GameSettings/RSRE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RSRE8P.ini rename to Data/Sys/GameSettings/RSRE8P.ini diff --git a/Data/Sys/GameConfig/RSRP8P.ini b/Data/Sys/GameSettings/RSRP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RSRP8P.ini rename to Data/Sys/GameSettings/RSRP8P.ini diff --git a/Data/Sys/GameConfig/RSTP64.ini b/Data/Sys/GameSettings/RSTP64.ini similarity index 100% rename from Data/Sys/GameConfig/RSTP64.ini rename to Data/Sys/GameSettings/RSTP64.ini diff --git a/Data/Sys/GameConfig/RSUP41.ini b/Data/Sys/GameSettings/RSUP41.ini similarity index 100% rename from Data/Sys/GameConfig/RSUP41.ini rename to Data/Sys/GameSettings/RSUP41.ini diff --git a/Data/Sys/GameConfig/RSVE8P.ini b/Data/Sys/GameSettings/RSVE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RSVE8P.ini rename to Data/Sys/GameSettings/RSVE8P.ini diff --git a/Data/Sys/GameConfig/RSVJ8P.ini b/Data/Sys/GameSettings/RSVJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/RSVJ8P.ini rename to Data/Sys/GameSettings/RSVJ8P.ini diff --git a/Data/Sys/GameConfig/RSVP8P.ini b/Data/Sys/GameSettings/RSVP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RSVP8P.ini rename to Data/Sys/GameSettings/RSVP8P.ini diff --git a/Data/Sys/GameConfig/RSWP08.ini b/Data/Sys/GameSettings/RSWP08.ini similarity index 100% rename from Data/Sys/GameConfig/RSWP08.ini rename to Data/Sys/GameSettings/RSWP08.ini diff --git a/Data/Sys/GameConfig/RSXE69.ini b/Data/Sys/GameSettings/RSXE69.ini similarity index 100% rename from Data/Sys/GameConfig/RSXE69.ini rename to Data/Sys/GameSettings/RSXE69.ini diff --git a/Data/Sys/GameConfig/RSXJ13.ini b/Data/Sys/GameSettings/RSXJ13.ini similarity index 100% rename from Data/Sys/GameConfig/RSXJ13.ini rename to Data/Sys/GameSettings/RSXJ13.ini diff --git a/Data/Sys/GameConfig/RSXK69.ini b/Data/Sys/GameSettings/RSXK69.ini similarity index 100% rename from Data/Sys/GameConfig/RSXK69.ini rename to Data/Sys/GameSettings/RSXK69.ini diff --git a/Data/Sys/GameConfig/RSXP69.ini b/Data/Sys/GameSettings/RSXP69.ini similarity index 100% rename from Data/Sys/GameConfig/RSXP69.ini rename to Data/Sys/GameSettings/RSXP69.ini diff --git a/Data/Sys/GameConfig/RSZPGT.ini b/Data/Sys/GameSettings/RSZPGT.ini similarity index 100% rename from Data/Sys/GameConfig/RSZPGT.ini rename to Data/Sys/GameSettings/RSZPGT.ini diff --git a/Data/Sys/GameConfig/RT3E54.ini b/Data/Sys/GameSettings/RT3E54.ini similarity index 97% rename from Data/Sys/GameConfig/RT3E54.ini rename to Data/Sys/GameSettings/RT3E54.ini index d175a9bd39..8311ae7234 100644 --- a/Data/Sys/GameConfig/RT3E54.ini +++ b/Data/Sys/GameSettings/RT3E54.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/RT3JEL.ini b/Data/Sys/GameSettings/RT3JEL.ini similarity index 97% rename from Data/Sys/GameConfig/RT3JEL.ini rename to Data/Sys/GameSettings/RT3JEL.ini index 036f24c3fb..63007e740a 100644 --- a/Data/Sys/GameConfig/RT3JEL.ini +++ b/Data/Sys/GameSettings/RT3JEL.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/RT3P54.ini b/Data/Sys/GameSettings/RT3P54.ini similarity index 97% rename from Data/Sys/GameConfig/RT3P54.ini rename to Data/Sys/GameSettings/RT3P54.ini index f9b6824985..9a4a5c9402 100644 --- a/Data/Sys/GameConfig/RT3P54.ini +++ b/Data/Sys/GameSettings/RT3P54.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/RT4EAF.ini b/Data/Sys/GameSettings/RT4EAF.ini similarity index 100% rename from Data/Sys/GameConfig/RT4EAF.ini rename to Data/Sys/GameSettings/RT4EAF.ini diff --git a/Data/Sys/GameConfig/RT4JAF.ini b/Data/Sys/GameSettings/RT4JAF.ini similarity index 100% rename from Data/Sys/GameConfig/RT4JAF.ini rename to Data/Sys/GameSettings/RT4JAF.ini diff --git a/Data/Sys/GameConfig/RT4PAF.ini b/Data/Sys/GameSettings/RT4PAF.ini similarity index 100% rename from Data/Sys/GameConfig/RT4PAF.ini rename to Data/Sys/GameSettings/RT4PAF.ini diff --git a/Data/Sys/GameConfig/RT5E8P.ini b/Data/Sys/GameSettings/RT5E8P.ini similarity index 100% rename from Data/Sys/GameConfig/RT5E8P.ini rename to Data/Sys/GameSettings/RT5E8P.ini diff --git a/Data/Sys/GameConfig/RT5P8P.ini b/Data/Sys/GameSettings/RT5P8P.ini similarity index 100% rename from Data/Sys/GameConfig/RT5P8P.ini rename to Data/Sys/GameSettings/RT5P8P.ini diff --git a/Data/Sys/GameConfig/RT9E52.ini b/Data/Sys/GameSettings/RT9E52.ini similarity index 100% rename from Data/Sys/GameConfig/RT9E52.ini rename to Data/Sys/GameSettings/RT9E52.ini diff --git a/Data/Sys/GameConfig/RTBP52.ini b/Data/Sys/GameSettings/RTBP52.ini similarity index 100% rename from Data/Sys/GameConfig/RTBP52.ini rename to Data/Sys/GameSettings/RTBP52.ini diff --git a/Data/Sys/GameConfig/RTCP41.ini b/Data/Sys/GameSettings/RTCP41.ini similarity index 100% rename from Data/Sys/GameConfig/RTCP41.ini rename to Data/Sys/GameSettings/RTCP41.ini diff --git a/Data/Sys/GameConfig/RTHE52.ini b/Data/Sys/GameSettings/RTHE52.ini similarity index 100% rename from Data/Sys/GameConfig/RTHE52.ini rename to Data/Sys/GameSettings/RTHE52.ini diff --git a/Data/Sys/GameConfig/RTME41.ini b/Data/Sys/GameSettings/RTME41.ini similarity index 100% rename from Data/Sys/GameConfig/RTME41.ini rename to Data/Sys/GameSettings/RTME41.ini diff --git a/Data/Sys/GameConfig/RTMP41.ini b/Data/Sys/GameSettings/RTMP41.ini similarity index 100% rename from Data/Sys/GameConfig/RTMP41.ini rename to Data/Sys/GameSettings/RTMP41.ini diff --git a/Data/Sys/GameConfig/RTNE41.ini b/Data/Sys/GameSettings/RTNE41.ini similarity index 100% rename from Data/Sys/GameConfig/RTNE41.ini rename to Data/Sys/GameSettings/RTNE41.ini diff --git a/Data/Sys/GameConfig/RTNJCQ.ini b/Data/Sys/GameSettings/RTNJCQ.ini similarity index 100% rename from Data/Sys/GameConfig/RTNJCQ.ini rename to Data/Sys/GameSettings/RTNJCQ.ini diff --git a/Data/Sys/GameConfig/RTNP41.ini b/Data/Sys/GameSettings/RTNP41.ini similarity index 100% rename from Data/Sys/GameConfig/RTNP41.ini rename to Data/Sys/GameSettings/RTNP41.ini diff --git a/Data/Sys/GameConfig/RTZE08.ini b/Data/Sys/GameSettings/RTZE08.ini similarity index 100% rename from Data/Sys/GameConfig/RTZE08.ini rename to Data/Sys/GameSettings/RTZE08.ini diff --git a/Data/Sys/GameConfig/RTZJ08.ini b/Data/Sys/GameSettings/RTZJ08.ini similarity index 100% rename from Data/Sys/GameConfig/RTZJ08.ini rename to Data/Sys/GameSettings/RTZJ08.ini diff --git a/Data/Sys/GameConfig/RTZK08.ini b/Data/Sys/GameSettings/RTZK08.ini similarity index 100% rename from Data/Sys/GameConfig/RTZK08.ini rename to Data/Sys/GameSettings/RTZK08.ini diff --git a/Data/Sys/GameConfig/RTZP08.ini b/Data/Sys/GameSettings/RTZP08.ini similarity index 100% rename from Data/Sys/GameConfig/RTZP08.ini rename to Data/Sys/GameSettings/RTZP08.ini diff --git a/Data/Sys/GameConfig/RUCXRT.ini b/Data/Sys/GameSettings/RUCXRT.ini similarity index 100% rename from Data/Sys/GameConfig/RUCXRT.ini rename to Data/Sys/GameSettings/RUCXRT.ini diff --git a/Data/Sys/GameConfig/RUUE01.ini b/Data/Sys/GameSettings/RUUE01.ini similarity index 98% rename from Data/Sys/GameConfig/RUUE01.ini rename to Data/Sys/GameSettings/RUUE01.ini index e8e63f861c..1625ea981e 100644 --- a/Data/Sys/GameConfig/RUUE01.ini +++ b/Data/Sys/GameSettings/RUUE01.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/RUUJ01.ini b/Data/Sys/GameSettings/RUUJ01.ini similarity index 98% rename from Data/Sys/GameConfig/RUUJ01.ini rename to Data/Sys/GameSettings/RUUJ01.ini index fdeefb5003..294412f3d2 100644 --- a/Data/Sys/GameConfig/RUUJ01.ini +++ b/Data/Sys/GameSettings/RUUJ01.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/RUUK01.ini b/Data/Sys/GameSettings/RUUK01.ini similarity index 98% rename from Data/Sys/GameConfig/RUUK01.ini rename to Data/Sys/GameSettings/RUUK01.ini index 2bb3818a31..b12b52cfd2 100644 --- a/Data/Sys/GameConfig/RUUK01.ini +++ b/Data/Sys/GameSettings/RUUK01.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/RUUP01.ini b/Data/Sys/GameSettings/RUUP01.ini similarity index 98% rename from Data/Sys/GameConfig/RUUP01.ini rename to Data/Sys/GameSettings/RUUP01.ini index 4cb31371ef..b1c4cb4cde 100644 --- a/Data/Sys/GameConfig/RUUP01.ini +++ b/Data/Sys/GameSettings/RUUP01.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameConfig/RUYE41.ini b/Data/Sys/GameSettings/RUYE41.ini similarity index 100% rename from Data/Sys/GameConfig/RUYE41.ini rename to Data/Sys/GameSettings/RUYE41.ini diff --git a/Data/Sys/GameConfig/RVKEXJ.ini b/Data/Sys/GameSettings/RVKEXJ.ini similarity index 100% rename from Data/Sys/GameConfig/RVKEXJ.ini rename to Data/Sys/GameSettings/RVKEXJ.ini diff --git a/Data/Sys/GameConfig/RVKP99.ini b/Data/Sys/GameSettings/RVKP99.ini similarity index 100% rename from Data/Sys/GameConfig/RVKP99.ini rename to Data/Sys/GameSettings/RVKP99.ini diff --git a/Data/Sys/GameConfig/RVOPPL.ini b/Data/Sys/GameSettings/RVOPPL.ini similarity index 100% rename from Data/Sys/GameConfig/RVOPPL.ini rename to Data/Sys/GameSettings/RVOPPL.ini diff --git a/Data/Sys/GameConfig/RVQP41.ini b/Data/Sys/GameSettings/RVQP41.ini similarity index 100% rename from Data/Sys/GameConfig/RVQP41.ini rename to Data/Sys/GameSettings/RVQP41.ini diff --git a/Data/Sys/GameConfig/RVSE69.ini b/Data/Sys/GameSettings/RVSE69.ini similarity index 100% rename from Data/Sys/GameConfig/RVSE69.ini rename to Data/Sys/GameSettings/RVSE69.ini diff --git a/Data/Sys/GameConfig/RVSP69.ini b/Data/Sys/GameSettings/RVSP69.ini similarity index 100% rename from Data/Sys/GameConfig/RVSP69.ini rename to Data/Sys/GameSettings/RVSP69.ini diff --git a/Data/Sys/GameConfig/RVUP8P.ini b/Data/Sys/GameSettings/RVUP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RVUP8P.ini rename to Data/Sys/GameSettings/RVUP8P.ini diff --git a/Data/Sys/GameConfig/RVVP78.ini b/Data/Sys/GameSettings/RVVP78.ini similarity index 100% rename from Data/Sys/GameConfig/RVVP78.ini rename to Data/Sys/GameSettings/RVVP78.ini diff --git a/Data/Sys/GameConfig/RVZP52.ini b/Data/Sys/GameSettings/RVZP52.ini similarity index 100% rename from Data/Sys/GameConfig/RVZP52.ini rename to Data/Sys/GameSettings/RVZP52.ini diff --git a/Data/Sys/GameConfig/RW9X78.ini b/Data/Sys/GameSettings/RW9X78.ini similarity index 100% rename from Data/Sys/GameConfig/RW9X78.ini rename to Data/Sys/GameSettings/RW9X78.ini diff --git a/Data/Sys/GameConfig/RWBXUG.ini b/Data/Sys/GameSettings/RWBXUG.ini similarity index 100% rename from Data/Sys/GameConfig/RWBXUG.ini rename to Data/Sys/GameSettings/RWBXUG.ini diff --git a/Data/Sys/GameConfig/RWEPA4.ini b/Data/Sys/GameSettings/RWEPA4.ini similarity index 100% rename from Data/Sys/GameConfig/RWEPA4.ini rename to Data/Sys/GameSettings/RWEPA4.ini diff --git a/Data/Sys/GameConfig/RWLE01.ini b/Data/Sys/GameSettings/RWLE01.ini similarity index 100% rename from Data/Sys/GameConfig/RWLE01.ini rename to Data/Sys/GameSettings/RWLE01.ini diff --git a/Data/Sys/GameConfig/RWRE4F.ini b/Data/Sys/GameSettings/RWRE4F.ini similarity index 100% rename from Data/Sys/GameConfig/RWRE4F.ini rename to Data/Sys/GameSettings/RWRE4F.ini diff --git a/Data/Sys/GameConfig/RWRP4F.ini b/Data/Sys/GameSettings/RWRP4F.ini similarity index 100% rename from Data/Sys/GameConfig/RWRP4F.ini rename to Data/Sys/GameSettings/RWRP4F.ini diff --git a/Data/Sys/GameConfig/RWSE8P.ini b/Data/Sys/GameSettings/RWSE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RWSE8P.ini rename to Data/Sys/GameSettings/RWSE8P.ini diff --git a/Data/Sys/GameConfig/RWSJ01.ini b/Data/Sys/GameSettings/RWSJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RWSJ01.ini rename to Data/Sys/GameSettings/RWSJ01.ini diff --git a/Data/Sys/GameConfig/RWSK01.ini b/Data/Sys/GameSettings/RWSK01.ini similarity index 100% rename from Data/Sys/GameConfig/RWSK01.ini rename to Data/Sys/GameSettings/RWSK01.ini diff --git a/Data/Sys/GameConfig/RWSP8P.ini b/Data/Sys/GameSettings/RWSP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RWSP8P.ini rename to Data/Sys/GameSettings/RWSP8P.ini diff --git a/Data/Sys/GameConfig/RWUX52.ini b/Data/Sys/GameSettings/RWUX52.ini similarity index 100% rename from Data/Sys/GameConfig/RWUX52.ini rename to Data/Sys/GameSettings/RWUX52.ini diff --git a/Data/Sys/GameConfig/RX3E01.ini b/Data/Sys/GameSettings/RX3E01.ini similarity index 100% rename from Data/Sys/GameConfig/RX3E01.ini rename to Data/Sys/GameSettings/RX3E01.ini diff --git a/Data/Sys/GameConfig/RX9P69.ini b/Data/Sys/GameSettings/RX9P69.ini similarity index 100% rename from Data/Sys/GameConfig/RX9P69.ini rename to Data/Sys/GameSettings/RX9P69.ini diff --git a/Data/Sys/GameConfig/RX9Y69.ini b/Data/Sys/GameSettings/RX9Y69.ini similarity index 100% rename from Data/Sys/GameConfig/RX9Y69.ini rename to Data/Sys/GameSettings/RX9Y69.ini diff --git a/Data/Sys/GameConfig/RXXE4Q.ini b/Data/Sys/GameSettings/RXXE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/RXXE4Q.ini rename to Data/Sys/GameSettings/RXXE4Q.ini diff --git a/Data/Sys/GameConfig/RXXJ4Q.ini b/Data/Sys/GameSettings/RXXJ4Q.ini similarity index 100% rename from Data/Sys/GameConfig/RXXJ4Q.ini rename to Data/Sys/GameSettings/RXXJ4Q.ini diff --git a/Data/Sys/GameConfig/RXXP4Q.ini b/Data/Sys/GameSettings/RXXP4Q.ini similarity index 100% rename from Data/Sys/GameConfig/RXXP4Q.ini rename to Data/Sys/GameSettings/RXXP4Q.ini diff --git a/Data/Sys/GameConfig/RYBE69.ini b/Data/Sys/GameSettings/RYBE69.ini similarity index 100% rename from Data/Sys/GameConfig/RYBE69.ini rename to Data/Sys/GameSettings/RYBE69.ini diff --git a/Data/Sys/GameConfig/RYOEA4.ini b/Data/Sys/GameSettings/RYOEA4.ini similarity index 100% rename from Data/Sys/GameConfig/RYOEA4.ini rename to Data/Sys/GameSettings/RYOEA4.ini diff --git a/Data/Sys/GameConfig/RYQP69.ini b/Data/Sys/GameSettings/RYQP69.ini similarity index 100% rename from Data/Sys/GameConfig/RYQP69.ini rename to Data/Sys/GameSettings/RYQP69.ini diff --git a/Data/Sys/GameConfig/RYXP7J.ini b/Data/Sys/GameSettings/RYXP7J.ini similarity index 100% rename from Data/Sys/GameConfig/RYXP7J.ini rename to Data/Sys/GameSettings/RYXP7J.ini diff --git a/Data/Sys/GameConfig/RZ9PG9.ini b/Data/Sys/GameSettings/RZ9PG9.ini similarity index 100% rename from Data/Sys/GameConfig/RZ9PG9.ini rename to Data/Sys/GameSettings/RZ9PG9.ini diff --git a/Data/Sys/GameConfig/RZDE01.ini b/Data/Sys/GameSettings/RZDE01.ini similarity index 100% rename from Data/Sys/GameConfig/RZDE01.ini rename to Data/Sys/GameSettings/RZDE01.ini diff --git a/Data/Sys/GameConfig/RZDJ01.ini b/Data/Sys/GameSettings/RZDJ01.ini similarity index 100% rename from Data/Sys/GameConfig/RZDJ01.ini rename to Data/Sys/GameSettings/RZDJ01.ini diff --git a/Data/Sys/GameConfig/RZDK01.ini b/Data/Sys/GameSettings/RZDK01.ini similarity index 100% rename from Data/Sys/GameConfig/RZDK01.ini rename to Data/Sys/GameSettings/RZDK01.ini diff --git a/Data/Sys/GameConfig/RZDP01.ini b/Data/Sys/GameSettings/RZDP01.ini similarity index 100% rename from Data/Sys/GameConfig/RZDP01.ini rename to Data/Sys/GameSettings/RZDP01.ini diff --git a/Data/Sys/GameConfig/RZJD69.ini b/Data/Sys/GameSettings/RZJD69.ini similarity index 100% rename from Data/Sys/GameConfig/RZJD69.ini rename to Data/Sys/GameSettings/RZJD69.ini diff --git a/Data/Sys/GameConfig/RZJE69.ini b/Data/Sys/GameSettings/RZJE69.ini similarity index 100% rename from Data/Sys/GameConfig/RZJE69.ini rename to Data/Sys/GameSettings/RZJE69.ini diff --git a/Data/Sys/GameConfig/RZJJ13.ini b/Data/Sys/GameSettings/RZJJ13.ini similarity index 100% rename from Data/Sys/GameConfig/RZJJ13.ini rename to Data/Sys/GameSettings/RZJJ13.ini diff --git a/Data/Sys/GameConfig/RZJP69.ini b/Data/Sys/GameSettings/RZJP69.ini similarity index 100% rename from Data/Sys/GameConfig/RZJP69.ini rename to Data/Sys/GameSettings/RZJP69.ini diff --git a/Data/Sys/GameConfig/RZPE01.ini b/Data/Sys/GameSettings/RZPE01.ini similarity index 100% rename from Data/Sys/GameConfig/RZPE01.ini rename to Data/Sys/GameSettings/RZPE01.ini diff --git a/Data/Sys/GameConfig/RZTE01.ini b/Data/Sys/GameSettings/RZTE01.ini similarity index 98% rename from Data/Sys/GameConfig/RZTE01.ini rename to Data/Sys/GameSettings/RZTE01.ini index ef4e34f1f4..195c944cf4 100644 --- a/Data/Sys/GameConfig/RZTE01.ini +++ b/Data/Sys/GameSettings/RZTE01.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameConfig/RZTJ01.ini b/Data/Sys/GameSettings/RZTJ01.ini similarity index 98% rename from Data/Sys/GameConfig/RZTJ01.ini rename to Data/Sys/GameSettings/RZTJ01.ini index b416f639bd..5ac0a14309 100644 --- a/Data/Sys/GameConfig/RZTJ01.ini +++ b/Data/Sys/GameSettings/RZTJ01.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameConfig/RZTK01.ini b/Data/Sys/GameSettings/RZTK01.ini similarity index 98% rename from Data/Sys/GameConfig/RZTK01.ini rename to Data/Sys/GameSettings/RZTK01.ini index 2daa37448a..3a0d0e664f 100644 --- a/Data/Sys/GameConfig/RZTK01.ini +++ b/Data/Sys/GameSettings/RZTK01.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameConfig/RZTP01.ini b/Data/Sys/GameSettings/RZTP01.ini similarity index 98% rename from Data/Sys/GameConfig/RZTP01.ini rename to Data/Sys/GameSettings/RZTP01.ini index 393f8b637a..461edb24e7 100644 --- a/Data/Sys/GameConfig/RZTP01.ini +++ b/Data/Sys/GameSettings/RZTP01.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameConfig/RZTW01.ini b/Data/Sys/GameSettings/RZTW01.ini similarity index 98% rename from Data/Sys/GameConfig/RZTW01.ini rename to Data/Sys/GameSettings/RZTW01.ini index bf63686d79..d62c8f1919 100644 --- a/Data/Sys/GameConfig/RZTW01.ini +++ b/Data/Sys/GameSettings/RZTW01.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameConfig/RZZE8P.ini b/Data/Sys/GameSettings/RZZE8P.ini similarity index 100% rename from Data/Sys/GameConfig/RZZE8P.ini rename to Data/Sys/GameSettings/RZZE8P.ini diff --git a/Data/Sys/GameConfig/RZZJEL.ini b/Data/Sys/GameSettings/RZZJEL.ini similarity index 100% rename from Data/Sys/GameConfig/RZZJEL.ini rename to Data/Sys/GameSettings/RZZJEL.ini diff --git a/Data/Sys/GameConfig/RZZP8P.ini b/Data/Sys/GameSettings/RZZP8P.ini similarity index 100% rename from Data/Sys/GameConfig/RZZP8P.ini rename to Data/Sys/GameSettings/RZZP8P.ini diff --git a/Data/Sys/GameConfig/S2IP8P.ini b/Data/Sys/GameSettings/S2IP8P.ini similarity index 100% rename from Data/Sys/GameConfig/S2IP8P.ini rename to Data/Sys/GameSettings/S2IP8P.ini diff --git a/Data/Sys/GameConfig/S2LE01.ini b/Data/Sys/GameSettings/S2LE01.ini similarity index 100% rename from Data/Sys/GameConfig/S2LE01.ini rename to Data/Sys/GameSettings/S2LE01.ini diff --git a/Data/Sys/GameConfig/S2LJ01.ini b/Data/Sys/GameSettings/S2LJ01.ini similarity index 100% rename from Data/Sys/GameConfig/S2LJ01.ini rename to Data/Sys/GameSettings/S2LJ01.ini diff --git a/Data/Sys/GameConfig/S2LP01.ini b/Data/Sys/GameSettings/S2LP01.ini similarity index 100% rename from Data/Sys/GameConfig/S2LP01.ini rename to Data/Sys/GameSettings/S2LP01.ini diff --git a/Data/Sys/GameConfig/S2TJAF.ini b/Data/Sys/GameSettings/S2TJAF.ini similarity index 100% rename from Data/Sys/GameConfig/S2TJAF.ini rename to Data/Sys/GameSettings/S2TJAF.ini diff --git a/Data/Sys/GameConfig/S2WE78.ini b/Data/Sys/GameSettings/S2WE78.ini similarity index 100% rename from Data/Sys/GameConfig/S2WE78.ini rename to Data/Sys/GameSettings/S2WE78.ini diff --git a/Data/Sys/GameConfig/S2WP78.ini b/Data/Sys/GameSettings/S2WP78.ini similarity index 100% rename from Data/Sys/GameConfig/S2WP78.ini rename to Data/Sys/GameSettings/S2WP78.ini diff --git a/Data/Sys/GameConfig/S3BEWR.ini b/Data/Sys/GameSettings/S3BEWR.ini similarity index 100% rename from Data/Sys/GameConfig/S3BEWR.ini rename to Data/Sys/GameSettings/S3BEWR.ini diff --git a/Data/Sys/GameConfig/S3BPWR.ini b/Data/Sys/GameSettings/S3BPWR.ini similarity index 100% rename from Data/Sys/GameConfig/S3BPWR.ini rename to Data/Sys/GameSettings/S3BPWR.ini diff --git a/Data/Sys/GameConfig/S59E01.ini b/Data/Sys/GameSettings/S59E01.ini similarity index 100% rename from Data/Sys/GameConfig/S59E01.ini rename to Data/Sys/GameSettings/S59E01.ini diff --git a/Data/Sys/GameConfig/S59JC8.ini b/Data/Sys/GameSettings/S59JC8.ini similarity index 100% rename from Data/Sys/GameConfig/S59JC8.ini rename to Data/Sys/GameSettings/S59JC8.ini diff --git a/Data/Sys/GameConfig/S59P01.ini b/Data/Sys/GameSettings/S59P01.ini similarity index 100% rename from Data/Sys/GameConfig/S59P01.ini rename to Data/Sys/GameSettings/S59P01.ini diff --git a/Data/Sys/GameConfig/S72E01.ini b/Data/Sys/GameSettings/S72E01.ini similarity index 100% rename from Data/Sys/GameConfig/S72E01.ini rename to Data/Sys/GameSettings/S72E01.ini diff --git a/Data/Sys/GameConfig/S72J01.ini b/Data/Sys/GameSettings/S72J01.ini similarity index 100% rename from Data/Sys/GameConfig/S72J01.ini rename to Data/Sys/GameSettings/S72J01.ini diff --git a/Data/Sys/GameConfig/S75E69.ini b/Data/Sys/GameSettings/S75E69.ini similarity index 100% rename from Data/Sys/GameConfig/S75E69.ini rename to Data/Sys/GameSettings/S75E69.ini diff --git a/Data/Sys/GameConfig/S75P69.ini b/Data/Sys/GameSettings/S75P69.ini similarity index 100% rename from Data/Sys/GameConfig/S75P69.ini rename to Data/Sys/GameSettings/S75P69.ini diff --git a/Data/Sys/GameConfig/SAKENS.ini b/Data/Sys/GameSettings/SAKENS.ini similarity index 100% rename from Data/Sys/GameConfig/SAKENS.ini rename to Data/Sys/GameSettings/SAKENS.ini diff --git a/Data/Sys/GameConfig/SAKPNS.ini b/Data/Sys/GameSettings/SAKPNS.ini similarity index 100% rename from Data/Sys/GameConfig/SAKPNS.ini rename to Data/Sys/GameSettings/SAKPNS.ini diff --git a/Data/Sys/GameConfig/SB3E08.ini b/Data/Sys/GameSettings/SB3E08.ini similarity index 100% rename from Data/Sys/GameConfig/SB3E08.ini rename to Data/Sys/GameSettings/SB3E08.ini diff --git a/Data/Sys/GameConfig/SB3J08.ini b/Data/Sys/GameSettings/SB3J08.ini similarity index 100% rename from Data/Sys/GameConfig/SB3J08.ini rename to Data/Sys/GameSettings/SB3J08.ini diff --git a/Data/Sys/GameConfig/SB3P08.ini b/Data/Sys/GameSettings/SB3P08.ini similarity index 100% rename from Data/Sys/GameConfig/SB3P08.ini rename to Data/Sys/GameSettings/SB3P08.ini diff --git a/Data/Sys/GameConfig/SB4E01.ini b/Data/Sys/GameSettings/SB4E01.ini similarity index 100% rename from Data/Sys/GameConfig/SB4E01.ini rename to Data/Sys/GameSettings/SB4E01.ini diff --git a/Data/Sys/GameConfig/SB4J01.ini b/Data/Sys/GameSettings/SB4J01.ini similarity index 100% rename from Data/Sys/GameConfig/SB4J01.ini rename to Data/Sys/GameSettings/SB4J01.ini diff --git a/Data/Sys/GameConfig/SB4P01.ini b/Data/Sys/GameSettings/SB4P01.ini similarity index 100% rename from Data/Sys/GameConfig/SB4P01.ini rename to Data/Sys/GameSettings/SB4P01.ini diff --git a/Data/Sys/GameConfig/SBDE08.ini b/Data/Sys/GameSettings/SBDE08.ini similarity index 100% rename from Data/Sys/GameConfig/SBDE08.ini rename to Data/Sys/GameSettings/SBDE08.ini diff --git a/Data/Sys/GameConfig/SBDJ08.ini b/Data/Sys/GameSettings/SBDJ08.ini similarity index 100% rename from Data/Sys/GameConfig/SBDJ08.ini rename to Data/Sys/GameSettings/SBDJ08.ini diff --git a/Data/Sys/GameConfig/SBDK08.ini b/Data/Sys/GameSettings/SBDK08.ini similarity index 100% rename from Data/Sys/GameConfig/SBDK08.ini rename to Data/Sys/GameSettings/SBDK08.ini diff --git a/Data/Sys/GameConfig/SBDP08.ini b/Data/Sys/GameSettings/SBDP08.ini similarity index 100% rename from Data/Sys/GameConfig/SBDP08.ini rename to Data/Sys/GameSettings/SBDP08.ini diff --git a/Data/Sys/GameConfig/SBLE5G.ini b/Data/Sys/GameSettings/SBLE5G.ini similarity index 100% rename from Data/Sys/GameConfig/SBLE5G.ini rename to Data/Sys/GameSettings/SBLE5G.ini diff --git a/Data/Sys/GameConfig/SBNEG9.ini b/Data/Sys/GameSettings/SBNEG9.ini similarity index 100% rename from Data/Sys/GameConfig/SBNEG9.ini rename to Data/Sys/GameSettings/SBNEG9.ini diff --git a/Data/Sys/GameConfig/SBVE78.ini b/Data/Sys/GameSettings/SBVE78.ini similarity index 100% rename from Data/Sys/GameConfig/SBVE78.ini rename to Data/Sys/GameSettings/SBVE78.ini diff --git a/Data/Sys/GameConfig/SC2E8P.ini b/Data/Sys/GameSettings/SC2E8P.ini similarity index 100% rename from Data/Sys/GameConfig/SC2E8P.ini rename to Data/Sys/GameSettings/SC2E8P.ini diff --git a/Data/Sys/GameConfig/SC2P8P.ini b/Data/Sys/GameSettings/SC2P8P.ini similarity index 100% rename from Data/Sys/GameConfig/SC2P8P.ini rename to Data/Sys/GameSettings/SC2P8P.ini diff --git a/Data/Sys/GameConfig/SC4E64.ini b/Data/Sys/GameSettings/SC4E64.ini similarity index 100% rename from Data/Sys/GameConfig/SC4E64.ini rename to Data/Sys/GameSettings/SC4E64.ini diff --git a/Data/Sys/GameConfig/SC4P64.ini b/Data/Sys/GameSettings/SC4P64.ini similarity index 100% rename from Data/Sys/GameConfig/SC4P64.ini rename to Data/Sys/GameSettings/SC4P64.ini diff --git a/Data/Sys/GameConfig/SC7D52.ini b/Data/Sys/GameSettings/SC7D52.ini similarity index 100% rename from Data/Sys/GameConfig/SC7D52.ini rename to Data/Sys/GameSettings/SC7D52.ini diff --git a/Data/Sys/GameConfig/SC7E52.ini b/Data/Sys/GameSettings/SC7E52.ini similarity index 100% rename from Data/Sys/GameConfig/SC7E52.ini rename to Data/Sys/GameSettings/SC7E52.ini diff --git a/Data/Sys/GameConfig/SC7F52.ini b/Data/Sys/GameSettings/SC7F52.ini similarity index 100% rename from Data/Sys/GameConfig/SC7F52.ini rename to Data/Sys/GameSettings/SC7F52.ini diff --git a/Data/Sys/GameConfig/SC7I52.ini b/Data/Sys/GameSettings/SC7I52.ini similarity index 100% rename from Data/Sys/GameConfig/SC7I52.ini rename to Data/Sys/GameSettings/SC7I52.ini diff --git a/Data/Sys/GameConfig/SC7P52.ini b/Data/Sys/GameSettings/SC7P52.ini similarity index 100% rename from Data/Sys/GameConfig/SC7P52.ini rename to Data/Sys/GameSettings/SC7P52.ini diff --git a/Data/Sys/GameConfig/SC7S52.ini b/Data/Sys/GameSettings/SC7S52.ini similarity index 100% rename from Data/Sys/GameConfig/SC7S52.ini rename to Data/Sys/GameSettings/SC7S52.ini diff --git a/Data/Sys/GameConfig/SC8E01.ini b/Data/Sys/GameSettings/SC8E01.ini similarity index 100% rename from Data/Sys/GameConfig/SC8E01.ini rename to Data/Sys/GameSettings/SC8E01.ini diff --git a/Data/Sys/GameConfig/SC8J01.ini b/Data/Sys/GameSettings/SC8J01.ini similarity index 100% rename from Data/Sys/GameConfig/SC8J01.ini rename to Data/Sys/GameSettings/SC8J01.ini diff --git a/Data/Sys/GameConfig/SC8P01.ini b/Data/Sys/GameSettings/SC8P01.ini similarity index 100% rename from Data/Sys/GameConfig/SC8P01.ini rename to Data/Sys/GameSettings/SC8P01.ini diff --git a/Data/Sys/GameConfig/SCAE18.ini b/Data/Sys/GameSettings/SCAE18.ini similarity index 100% rename from Data/Sys/GameConfig/SCAE18.ini rename to Data/Sys/GameSettings/SCAE18.ini diff --git a/Data/Sys/GameConfig/SCAJ18.ini b/Data/Sys/GameSettings/SCAJ18.ini similarity index 100% rename from Data/Sys/GameConfig/SCAJ18.ini rename to Data/Sys/GameSettings/SCAJ18.ini diff --git a/Data/Sys/GameConfig/SCAP18.ini b/Data/Sys/GameSettings/SCAP18.ini similarity index 100% rename from Data/Sys/GameConfig/SCAP18.ini rename to Data/Sys/GameSettings/SCAP18.ini diff --git a/Data/Sys/GameConfig/SCYE4Q.ini b/Data/Sys/GameSettings/SCYE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SCYE4Q.ini rename to Data/Sys/GameSettings/SCYE4Q.ini diff --git a/Data/Sys/GameConfig/SCYP4Q.ini b/Data/Sys/GameSettings/SCYP4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SCYP4Q.ini rename to Data/Sys/GameSettings/SCYP4Q.ini diff --git a/Data/Sys/GameConfig/SCYX4Q.ini b/Data/Sys/GameSettings/SCYX4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SCYX4Q.ini rename to Data/Sys/GameSettings/SCYX4Q.ini diff --git a/Data/Sys/GameConfig/SCYY4Q.ini b/Data/Sys/GameSettings/SCYY4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SCYY4Q.ini rename to Data/Sys/GameSettings/SCYY4Q.ini diff --git a/Data/Sys/GameConfig/SCYZ4Q.ini b/Data/Sys/GameSettings/SCYZ4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SCYZ4Q.ini rename to Data/Sys/GameSettings/SCYZ4Q.ini diff --git a/Data/Sys/GameConfig/SD2E41.ini b/Data/Sys/GameSettings/SD2E41.ini similarity index 100% rename from Data/Sys/GameConfig/SD2E41.ini rename to Data/Sys/GameSettings/SD2E41.ini diff --git a/Data/Sys/GameConfig/SD2J01.ini b/Data/Sys/GameSettings/SD2J01.ini similarity index 100% rename from Data/Sys/GameConfig/SD2J01.ini rename to Data/Sys/GameSettings/SD2J01.ini diff --git a/Data/Sys/GameConfig/SD2P41.ini b/Data/Sys/GameSettings/SD2P41.ini similarity index 100% rename from Data/Sys/GameConfig/SD2P41.ini rename to Data/Sys/GameSettings/SD2P41.ini diff --git a/Data/Sys/GameConfig/SD2Y41.ini b/Data/Sys/GameSettings/SD2Y41.ini similarity index 100% rename from Data/Sys/GameConfig/SD2Y41.ini rename to Data/Sys/GameSettings/SD2Y41.ini diff --git a/Data/Sys/GameConfig/SDBE78.ini b/Data/Sys/GameSettings/SDBE78.ini similarity index 100% rename from Data/Sys/GameConfig/SDBE78.ini rename to Data/Sys/GameSettings/SDBE78.ini diff --git a/Data/Sys/GameConfig/SDBP78.ini b/Data/Sys/GameSettings/SDBP78.ini similarity index 100% rename from Data/Sys/GameConfig/SDBP78.ini rename to Data/Sys/GameSettings/SDBP78.ini diff --git a/Data/Sys/GameConfig/SDFE4Q.ini b/Data/Sys/GameSettings/SDFE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SDFE4Q.ini rename to Data/Sys/GameSettings/SDFE4Q.ini diff --git a/Data/Sys/GameConfig/SDNE41.ini b/Data/Sys/GameSettings/SDNE41.ini similarity index 100% rename from Data/Sys/GameConfig/SDNE41.ini rename to Data/Sys/GameSettings/SDNE41.ini diff --git a/Data/Sys/GameConfig/SDNP41.ini b/Data/Sys/GameSettings/SDNP41.ini similarity index 100% rename from Data/Sys/GameConfig/SDNP41.ini rename to Data/Sys/GameSettings/SDNP41.ini diff --git a/Data/Sys/GameConfig/SDWE18.ini b/Data/Sys/GameSettings/SDWE18.ini similarity index 100% rename from Data/Sys/GameConfig/SDWE18.ini rename to Data/Sys/GameSettings/SDWE18.ini diff --git a/Data/Sys/GameConfig/SDWJ18.ini b/Data/Sys/GameSettings/SDWJ18.ini similarity index 100% rename from Data/Sys/GameConfig/SDWJ18.ini rename to Data/Sys/GameSettings/SDWJ18.ini diff --git a/Data/Sys/GameConfig/SDWP18.ini b/Data/Sys/GameSettings/SDWP18.ini similarity index 100% rename from Data/Sys/GameConfig/SDWP18.ini rename to Data/Sys/GameSettings/SDWP18.ini diff --git a/Data/Sys/GameConfig/SE2P69.ini b/Data/Sys/GameSettings/SE2P69.ini similarity index 100% rename from Data/Sys/GameConfig/SE2P69.ini rename to Data/Sys/GameSettings/SE2P69.ini diff --git a/Data/Sys/GameConfig/SEAE69.ini b/Data/Sys/GameSettings/SEAE69.ini similarity index 100% rename from Data/Sys/GameConfig/SEAE69.ini rename to Data/Sys/GameSettings/SEAE69.ini diff --git a/Data/Sys/GameConfig/SEAJ13.ini b/Data/Sys/GameSettings/SEAJ13.ini similarity index 100% rename from Data/Sys/GameConfig/SEAJ13.ini rename to Data/Sys/GameSettings/SEAJ13.ini diff --git a/Data/Sys/GameConfig/SEAP69.ini b/Data/Sys/GameSettings/SEAP69.ini similarity index 100% rename from Data/Sys/GameConfig/SEAP69.ini rename to Data/Sys/GameSettings/SEAP69.ini diff --git a/Data/Sys/GameConfig/SEME4Q.ini b/Data/Sys/GameSettings/SEME4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SEME4Q.ini rename to Data/Sys/GameSettings/SEME4Q.ini diff --git a/Data/Sys/GameConfig/SEMJ01.ini b/Data/Sys/GameSettings/SEMJ01.ini similarity index 100% rename from Data/Sys/GameConfig/SEMJ01.ini rename to Data/Sys/GameSettings/SEMJ01.ini diff --git a/Data/Sys/GameConfig/SEMP4Q.ini b/Data/Sys/GameSettings/SEMP4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SEMP4Q.ini rename to Data/Sys/GameSettings/SEMP4Q.ini diff --git a/Data/Sys/GameConfig/SEMX4Q.ini b/Data/Sys/GameSettings/SEMX4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SEMX4Q.ini rename to Data/Sys/GameSettings/SEMX4Q.ini diff --git a/Data/Sys/GameConfig/SEMY4Q.ini b/Data/Sys/GameSettings/SEMY4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SEMY4Q.ini rename to Data/Sys/GameSettings/SEMY4Q.ini diff --git a/Data/Sys/GameConfig/SEMZ4Q.ini b/Data/Sys/GameSettings/SEMZ4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SEMZ4Q.ini rename to Data/Sys/GameSettings/SEMZ4Q.ini diff --git a/Data/Sys/GameConfig/SERE4Q.ini b/Data/Sys/GameSettings/SERE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SERE4Q.ini rename to Data/Sys/GameSettings/SERE4Q.ini diff --git a/Data/Sys/GameConfig/SERF4Q.ini b/Data/Sys/GameSettings/SERF4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SERF4Q.ini rename to Data/Sys/GameSettings/SERF4Q.ini diff --git a/Data/Sys/GameConfig/SERP4Q.ini b/Data/Sys/GameSettings/SERP4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SERP4Q.ini rename to Data/Sys/GameSettings/SERP4Q.ini diff --git a/Data/Sys/GameConfig/SF8E01.ini b/Data/Sys/GameSettings/SF8E01.ini similarity index 100% rename from Data/Sys/GameConfig/SF8E01.ini rename to Data/Sys/GameSettings/SF8E01.ini diff --git a/Data/Sys/GameConfig/SF8J01.ini b/Data/Sys/GameSettings/SF8J01.ini similarity index 100% rename from Data/Sys/GameConfig/SF8J01.ini rename to Data/Sys/GameSettings/SF8J01.ini diff --git a/Data/Sys/GameConfig/SF8P01.ini b/Data/Sys/GameSettings/SF8P01.ini similarity index 100% rename from Data/Sys/GameConfig/SF8P01.ini rename to Data/Sys/GameSettings/SF8P01.ini diff --git a/Data/Sys/GameConfig/SFIE01.ini b/Data/Sys/GameSettings/SFIE01.ini similarity index 100% rename from Data/Sys/GameConfig/SFIE01.ini rename to Data/Sys/GameSettings/SFIE01.ini diff --git a/Data/Sys/GameConfig/SFIP01.ini b/Data/Sys/GameSettings/SFIP01.ini similarity index 100% rename from Data/Sys/GameConfig/SFIP01.ini rename to Data/Sys/GameSettings/SFIP01.ini diff --git a/Data/Sys/GameConfig/SFWE69.ini b/Data/Sys/GameSettings/SFWE69.ini similarity index 100% rename from Data/Sys/GameConfig/SFWE69.ini rename to Data/Sys/GameSettings/SFWE69.ini diff --git a/Data/Sys/GameConfig/SFWP69.ini b/Data/Sys/GameSettings/SFWP69.ini similarity index 100% rename from Data/Sys/GameConfig/SFWP69.ini rename to Data/Sys/GameSettings/SFWP69.ini diff --git a/Data/Sys/GameConfig/SGAP8P.ini b/Data/Sys/GameSettings/SGAP8P.ini similarity index 100% rename from Data/Sys/GameConfig/SGAP8P.ini rename to Data/Sys/GameSettings/SGAP8P.ini diff --git a/Data/Sys/GameConfig/SH6E52.ini b/Data/Sys/GameSettings/SH6E52.ini similarity index 100% rename from Data/Sys/GameConfig/SH6E52.ini rename to Data/Sys/GameSettings/SH6E52.ini diff --git a/Data/Sys/GameConfig/SHDE52.ini b/Data/Sys/GameSettings/SHDE52.ini similarity index 100% rename from Data/Sys/GameConfig/SHDE52.ini rename to Data/Sys/GameSettings/SHDE52.ini diff --git a/Data/Sys/GameConfig/SHLPA4.ini b/Data/Sys/GameSettings/SHLPA4.ini similarity index 100% rename from Data/Sys/GameConfig/SHLPA4.ini rename to Data/Sys/GameSettings/SHLPA4.ini diff --git a/Data/Sys/GameConfig/SILE78.ini b/Data/Sys/GameSettings/SILE78.ini similarity index 100% rename from Data/Sys/GameConfig/SILE78.ini rename to Data/Sys/GameSettings/SILE78.ini diff --git a/Data/Sys/GameConfig/SILP78.ini b/Data/Sys/GameSettings/SILP78.ini similarity index 100% rename from Data/Sys/GameConfig/SILP78.ini rename to Data/Sys/GameSettings/SILP78.ini diff --git a/Data/Sys/GameConfig/SJBE52.ini b/Data/Sys/GameSettings/SJBE52.ini similarity index 100% rename from Data/Sys/GameConfig/SJBE52.ini rename to Data/Sys/GameSettings/SJBE52.ini diff --git a/Data/Sys/GameConfig/SJBP52.ini b/Data/Sys/GameSettings/SJBP52.ini similarity index 100% rename from Data/Sys/GameConfig/SJBP52.ini rename to Data/Sys/GameSettings/SJBP52.ini diff --git a/Data/Sys/GameConfig/SJDE41.ini b/Data/Sys/GameSettings/SJDE41.ini similarity index 100% rename from Data/Sys/GameConfig/SJDE41.ini rename to Data/Sys/GameSettings/SJDE41.ini diff --git a/Data/Sys/GameConfig/SJDP41.ini b/Data/Sys/GameSettings/SJDP41.ini similarity index 100% rename from Data/Sys/GameConfig/SJDP41.ini rename to Data/Sys/GameSettings/SJDP41.ini diff --git a/Data/Sys/GameConfig/SJDY41.ini b/Data/Sys/GameSettings/SJDY41.ini similarity index 100% rename from Data/Sys/GameConfig/SJDY41.ini rename to Data/Sys/GameSettings/SJDY41.ini diff --git a/Data/Sys/GameConfig/SJDZ41.ini b/Data/Sys/GameSettings/SJDZ41.ini similarity index 100% rename from Data/Sys/GameConfig/SJDZ41.ini rename to Data/Sys/GameSettings/SJDZ41.ini diff --git a/Data/Sys/GameConfig/SJXD41.ini b/Data/Sys/GameSettings/SJXD41.ini similarity index 98% rename from Data/Sys/GameConfig/SJXD41.ini rename to Data/Sys/GameSettings/SJXD41.ini index 10227122e8..31586b5e5d 100644 --- a/Data/Sys/GameConfig/SJXD41.ini +++ b/Data/Sys/GameSettings/SJXD41.ini @@ -18,4 +18,3 @@ PH_ZNear = PH_ZFar = [Video_Enhancements] MaxAnisotropy = 0 -[Gecko] diff --git a/Data/Sys/GameConfig/SJXE41.ini b/Data/Sys/GameSettings/SJXE41.ini similarity index 98% rename from Data/Sys/GameConfig/SJXE41.ini rename to Data/Sys/GameSettings/SJXE41.ini index db62d82610..5834e3e951 100644 --- a/Data/Sys/GameConfig/SJXE41.ini +++ b/Data/Sys/GameSettings/SJXE41.ini @@ -18,4 +18,3 @@ PH_ZNear = PH_ZFar = [Video_Enhancements] MaxAnisotropy = 0 -[Gecko] diff --git a/Data/Sys/GameConfig/SJXP41.ini b/Data/Sys/GameSettings/SJXP41.ini similarity index 98% rename from Data/Sys/GameConfig/SJXP41.ini rename to Data/Sys/GameSettings/SJXP41.ini index d88bb20622..abf0264ef6 100644 --- a/Data/Sys/GameConfig/SJXP41.ini +++ b/Data/Sys/GameSettings/SJXP41.ini @@ -18,4 +18,3 @@ PH_ZNear = PH_ZFar = [Video_Enhancements] MaxAnisotropy = 0 -[Gecko] diff --git a/Data/Sys/GameConfig/SK3EEB.ini b/Data/Sys/GameSettings/SK3EEB.ini similarity index 100% rename from Data/Sys/GameConfig/SK3EEB.ini rename to Data/Sys/GameSettings/SK3EEB.ini diff --git a/Data/Sys/GameConfig/SK4E52.ini b/Data/Sys/GameSettings/SK4E52.ini similarity index 100% rename from Data/Sys/GameConfig/SK4E52.ini rename to Data/Sys/GameSettings/SK4E52.ini diff --git a/Data/Sys/GameConfig/SKJE78.ini b/Data/Sys/GameSettings/SKJE78.ini similarity index 100% rename from Data/Sys/GameConfig/SKJE78.ini rename to Data/Sys/GameSettings/SKJE78.ini diff --git a/Data/Sys/GameConfig/SKVE20.ini b/Data/Sys/GameSettings/SKVE20.ini similarity index 100% rename from Data/Sys/GameConfig/SKVE20.ini rename to Data/Sys/GameSettings/SKVE20.ini diff --git a/Data/Sys/GameConfig/SLSEXJ.ini b/Data/Sys/GameSettings/SLSEXJ.ini similarity index 100% rename from Data/Sys/GameConfig/SLSEXJ.ini rename to Data/Sys/GameSettings/SLSEXJ.ini diff --git a/Data/Sys/GameConfig/SLSJ01.ini b/Data/Sys/GameSettings/SLSJ01.ini similarity index 100% rename from Data/Sys/GameConfig/SLSJ01.ini rename to Data/Sys/GameSettings/SLSJ01.ini diff --git a/Data/Sys/GameConfig/SLSP01.ini b/Data/Sys/GameSettings/SLSP01.ini similarity index 100% rename from Data/Sys/GameConfig/SLSP01.ini rename to Data/Sys/GameSettings/SLSP01.ini diff --git a/Data/Sys/GameConfig/SLWE41.ini b/Data/Sys/GameSettings/SLWE41.ini similarity index 100% rename from Data/Sys/GameConfig/SLWE41.ini rename to Data/Sys/GameSettings/SLWE41.ini diff --git a/Data/Sys/GameConfig/SMBE8P.ini b/Data/Sys/GameSettings/SMBE8P.ini similarity index 100% rename from Data/Sys/GameConfig/SMBE8P.ini rename to Data/Sys/GameSettings/SMBE8P.ini diff --git a/Data/Sys/GameConfig/SMBP8P.ini b/Data/Sys/GameSettings/SMBP8P.ini similarity index 100% rename from Data/Sys/GameConfig/SMBP8P.ini rename to Data/Sys/GameSettings/SMBP8P.ini diff --git a/Data/Sys/GameConfig/SMFE4Q.ini b/Data/Sys/GameSettings/SMFE4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SMFE4Q.ini rename to Data/Sys/GameSettings/SMFE4Q.ini diff --git a/Data/Sys/GameConfig/SMFP4Q.ini b/Data/Sys/GameSettings/SMFP4Q.ini similarity index 100% rename from Data/Sys/GameConfig/SMFP4Q.ini rename to Data/Sys/GameSettings/SMFP4Q.ini diff --git a/Data/Sys/GameConfig/SMNE01.ini b/Data/Sys/GameSettings/SMNE01.ini similarity index 100% rename from Data/Sys/GameConfig/SMNE01.ini rename to Data/Sys/GameSettings/SMNE01.ini diff --git a/Data/Sys/GameConfig/SMNJ01.ini b/Data/Sys/GameSettings/SMNJ01.ini similarity index 100% rename from Data/Sys/GameConfig/SMNJ01.ini rename to Data/Sys/GameSettings/SMNJ01.ini diff --git a/Data/Sys/GameConfig/SMNK01.ini b/Data/Sys/GameSettings/SMNK01.ini similarity index 100% rename from Data/Sys/GameConfig/SMNK01.ini rename to Data/Sys/GameSettings/SMNK01.ini diff --git a/Data/Sys/GameConfig/SMNP01.ini b/Data/Sys/GameSettings/SMNP01.ini similarity index 98% rename from Data/Sys/GameConfig/SMNP01.ini rename to Data/Sys/GameSettings/SMNP01.ini index de60c36282..fa82d55841 100644 --- a/Data/Sys/GameConfig/SMNP01.ini +++ b/Data/Sys/GameSettings/SMNP01.ini @@ -13,7 +13,7 @@ EmulationStateId = 4 [OnFrame] # Add memory patches to be applied every frame here. -+$Speed hack +$Speed hack 0x801D5B10:dword:0x60000000 0x801D5B14:dword:0x60000000 diff --git a/Data/Sys/GameConfig/SMNW01.ini b/Data/Sys/GameSettings/SMNW01.ini similarity index 100% rename from Data/Sys/GameConfig/SMNW01.ini rename to Data/Sys/GameSettings/SMNW01.ini diff --git a/Data/Sys/GameConfig/SMOE41.ini b/Data/Sys/GameSettings/SMOE41.ini similarity index 100% rename from Data/Sys/GameConfig/SMOE41.ini rename to Data/Sys/GameSettings/SMOE41.ini diff --git a/Data/Sys/GameConfig/SMOP41.ini b/Data/Sys/GameSettings/SMOP41.ini similarity index 100% rename from Data/Sys/GameConfig/SMOP41.ini rename to Data/Sys/GameSettings/SMOP41.ini diff --git a/Data/Sys/GameConfig/SMOX41.ini b/Data/Sys/GameSettings/SMOX41.ini similarity index 100% rename from Data/Sys/GameConfig/SMOX41.ini rename to Data/Sys/GameSettings/SMOX41.ini diff --git a/Data/Sys/GameConfig/SN4EDA.ini b/Data/Sys/GameSettings/SN4EDA.ini similarity index 100% rename from Data/Sys/GameConfig/SN4EDA.ini rename to Data/Sys/GameSettings/SN4EDA.ini diff --git a/Data/Sys/GameConfig/SN4JDA.ini b/Data/Sys/GameSettings/SN4JDA.ini similarity index 100% rename from Data/Sys/GameConfig/SN4JDA.ini rename to Data/Sys/GameSettings/SN4JDA.ini diff --git a/Data/Sys/GameConfig/SN4XGT.ini b/Data/Sys/GameSettings/SN4XGT.ini similarity index 100% rename from Data/Sys/GameConfig/SN4XGT.ini rename to Data/Sys/GameSettings/SN4XGT.ini diff --git a/Data/Sys/GameConfig/SNCE8P.ini b/Data/Sys/GameSettings/SNCE8P.ini similarity index 100% rename from Data/Sys/GameConfig/SNCE8P.ini rename to Data/Sys/GameSettings/SNCE8P.ini diff --git a/Data/Sys/GameConfig/SNCJ8P.ini b/Data/Sys/GameSettings/SNCJ8P.ini similarity index 100% rename from Data/Sys/GameConfig/SNCJ8P.ini rename to Data/Sys/GameSettings/SNCJ8P.ini diff --git a/Data/Sys/GameConfig/SNCP8P.ini b/Data/Sys/GameSettings/SNCP8P.ini similarity index 100% rename from Data/Sys/GameConfig/SNCP8P.ini rename to Data/Sys/GameSettings/SNCP8P.ini diff --git a/Data/Sys/GameConfig/SNDE20.ini b/Data/Sys/GameSettings/SNDE20.ini similarity index 100% rename from Data/Sys/GameConfig/SNDE20.ini rename to Data/Sys/GameSettings/SNDE20.ini diff --git a/Data/Sys/GameConfig/SNJE69.ini b/Data/Sys/GameSettings/SNJE69.ini similarity index 100% rename from Data/Sys/GameConfig/SNJE69.ini rename to Data/Sys/GameSettings/SNJE69.ini diff --git a/Data/Sys/GameConfig/SNJP69.ini b/Data/Sys/GameSettings/SNJP69.ini similarity index 100% rename from Data/Sys/GameConfig/SNJP69.ini rename to Data/Sys/GameSettings/SNJP69.ini diff --git a/Data/Sys/GameConfig/SO3EE9.ini b/Data/Sys/GameSettings/SO3EE9.ini similarity index 100% rename from Data/Sys/GameConfig/SO3EE9.ini rename to Data/Sys/GameSettings/SO3EE9.ini diff --git a/Data/Sys/GameConfig/SO3J99.ini b/Data/Sys/GameSettings/SO3J99.ini similarity index 100% rename from Data/Sys/GameConfig/SO3J99.ini rename to Data/Sys/GameSettings/SO3J99.ini diff --git a/Data/Sys/GameConfig/SOJE41.ini b/Data/Sys/GameSettings/SOJE41.ini similarity index 100% rename from Data/Sys/GameConfig/SOJE41.ini rename to Data/Sys/GameSettings/SOJE41.ini diff --git a/Data/Sys/GameConfig/SOJP41.ini b/Data/Sys/GameSettings/SOJP41.ini similarity index 100% rename from Data/Sys/GameConfig/SOJP41.ini rename to Data/Sys/GameSettings/SOJP41.ini diff --git a/Data/Sys/GameConfig/SOUE01.ini b/Data/Sys/GameSettings/SOUE01.ini similarity index 100% rename from Data/Sys/GameConfig/SOUE01.ini rename to Data/Sys/GameSettings/SOUE01.ini diff --git a/Data/Sys/GameConfig/SOUJ01.ini b/Data/Sys/GameSettings/SOUJ01.ini similarity index 100% rename from Data/Sys/GameConfig/SOUJ01.ini rename to Data/Sys/GameSettings/SOUJ01.ini diff --git a/Data/Sys/GameConfig/SOUK01.ini b/Data/Sys/GameSettings/SOUK01.ini similarity index 100% rename from Data/Sys/GameConfig/SOUK01.ini rename to Data/Sys/GameSettings/SOUK01.ini diff --git a/Data/Sys/GameConfig/SOUP01.ini b/Data/Sys/GameSettings/SOUP01.ini similarity index 100% rename from Data/Sys/GameConfig/SOUP01.ini rename to Data/Sys/GameSettings/SOUP01.ini diff --git a/Data/Sys/GameConfig/SPDE52.ini b/Data/Sys/GameSettings/SPDE52.ini similarity index 100% rename from Data/Sys/GameConfig/SPDE52.ini rename to Data/Sys/GameSettings/SPDE52.ini diff --git a/Data/Sys/GameConfig/SPDP52.ini b/Data/Sys/GameSettings/SPDP52.ini similarity index 100% rename from Data/Sys/GameConfig/SPDP52.ini rename to Data/Sys/GameSettings/SPDP52.ini diff --git a/Data/Sys/GameConfig/SPPEFS.ini b/Data/Sys/GameSettings/SPPEFS.ini similarity index 100% rename from Data/Sys/GameConfig/SPPEFS.ini rename to Data/Sys/GameSettings/SPPEFS.ini diff --git a/Data/Sys/GameConfig/SPTJEB.ini b/Data/Sys/GameSettings/SPTJEB.ini similarity index 100% rename from Data/Sys/GameConfig/SPTJEB.ini rename to Data/Sys/GameSettings/SPTJEB.ini diff --git a/Data/Sys/GameConfig/SPVEA4.ini b/Data/Sys/GameSettings/SPVEA4.ini similarity index 100% rename from Data/Sys/GameConfig/SPVEA4.ini rename to Data/Sys/GameSettings/SPVEA4.ini diff --git a/Data/Sys/GameConfig/SPVPA4.ini b/Data/Sys/GameSettings/SPVPA4.ini similarity index 100% rename from Data/Sys/GameConfig/SPVPA4.ini rename to Data/Sys/GameSettings/SPVPA4.ini diff --git a/Data/Sys/GameConfig/SPVXA4.ini b/Data/Sys/GameSettings/SPVXA4.ini similarity index 100% rename from Data/Sys/GameConfig/SPVXA4.ini rename to Data/Sys/GameSettings/SPVXA4.ini diff --git a/Data/Sys/GameConfig/SPVYA4.ini b/Data/Sys/GameSettings/SPVYA4.ini similarity index 100% rename from Data/Sys/GameConfig/SPVYA4.ini rename to Data/Sys/GameSettings/SPVYA4.ini diff --git a/Data/Sys/GameConfig/SQME52.ini b/Data/Sys/GameSettings/SQME52.ini similarity index 100% rename from Data/Sys/GameConfig/SQME52.ini rename to Data/Sys/GameSettings/SQME52.ini diff --git a/Data/Sys/GameConfig/SQMP52.ini b/Data/Sys/GameSettings/SQMP52.ini similarity index 100% rename from Data/Sys/GameConfig/SQMP52.ini rename to Data/Sys/GameSettings/SQMP52.ini diff --git a/Data/Sys/GameConfig/SR5E41.ini b/Data/Sys/GameSettings/SR5E41.ini similarity index 100% rename from Data/Sys/GameConfig/SR5E41.ini rename to Data/Sys/GameSettings/SR5E41.ini diff --git a/Data/Sys/GameConfig/SRQE41.ini b/Data/Sys/GameSettings/SRQE41.ini similarity index 100% rename from Data/Sys/GameConfig/SRQE41.ini rename to Data/Sys/GameSettings/SRQE41.ini diff --git a/Data/Sys/GameConfig/SRQP41.ini b/Data/Sys/GameSettings/SRQP41.ini similarity index 100% rename from Data/Sys/GameConfig/SRQP41.ini rename to Data/Sys/GameSettings/SRQP41.ini diff --git a/Data/Sys/GameConfig/SS3EWR.ini b/Data/Sys/GameSettings/SS3EWR.ini similarity index 100% rename from Data/Sys/GameConfig/SS3EWR.ini rename to Data/Sys/GameSettings/SS3EWR.ini diff --git a/Data/Sys/GameConfig/SSQE01.ini b/Data/Sys/GameSettings/SSQE01.ini similarity index 100% rename from Data/Sys/GameConfig/SSQE01.ini rename to Data/Sys/GameSettings/SSQE01.ini diff --git a/Data/Sys/GameConfig/SSQJ01.ini b/Data/Sys/GameSettings/SSQJ01.ini similarity index 100% rename from Data/Sys/GameConfig/SSQJ01.ini rename to Data/Sys/GameSettings/SSQJ01.ini diff --git a/Data/Sys/GameConfig/SSQP01.ini b/Data/Sys/GameSettings/SSQP01.ini similarity index 100% rename from Data/Sys/GameConfig/SSQP01.ini rename to Data/Sys/GameSettings/SSQP01.ini diff --git a/Data/Sys/GameConfig/SSRE20.ini b/Data/Sys/GameSettings/SSRE20.ini similarity index 100% rename from Data/Sys/GameConfig/SSRE20.ini rename to Data/Sys/GameSettings/SSRE20.ini diff --git a/Data/Sys/GameConfig/SSRPXT.ini b/Data/Sys/GameSettings/SSRPXT.ini similarity index 100% rename from Data/Sys/GameConfig/SSRPXT.ini rename to Data/Sys/GameSettings/SSRPXT.ini diff --git a/Data/Sys/GameConfig/SSZE5G.ini b/Data/Sys/GameSettings/SSZE5G.ini similarity index 100% rename from Data/Sys/GameConfig/SSZE5G.ini rename to Data/Sys/GameSettings/SSZE5G.ini diff --git a/Data/Sys/GameConfig/STEETR.ini b/Data/Sys/GameSettings/STEETR.ini similarity index 100% rename from Data/Sys/GameConfig/STEETR.ini rename to Data/Sys/GameSettings/STEETR.ini diff --git a/Data/Sys/GameConfig/STHP8P.ini b/Data/Sys/GameSettings/STHP8P.ini similarity index 100% rename from Data/Sys/GameConfig/STHP8P.ini rename to Data/Sys/GameSettings/STHP8P.ini diff --git a/Data/Sys/GameConfig/STKE08.ini b/Data/Sys/GameSettings/STKE08.ini similarity index 100% rename from Data/Sys/GameConfig/STKE08.ini rename to Data/Sys/GameSettings/STKE08.ini diff --git a/Data/Sys/GameConfig/STKJ08.ini b/Data/Sys/GameSettings/STKJ08.ini similarity index 100% rename from Data/Sys/GameConfig/STKJ08.ini rename to Data/Sys/GameSettings/STKJ08.ini diff --git a/Data/Sys/GameConfig/STKP08.ini b/Data/Sys/GameSettings/STKP08.ini similarity index 100% rename from Data/Sys/GameConfig/STKP08.ini rename to Data/Sys/GameSettings/STKP08.ini diff --git a/Data/Sys/GameConfig/SUKE01.ini b/Data/Sys/GameSettings/SUKE01.ini similarity index 100% rename from Data/Sys/GameConfig/SUKE01.ini rename to Data/Sys/GameSettings/SUKE01.ini diff --git a/Data/Sys/GameConfig/SUKJ01.ini b/Data/Sys/GameSettings/SUKJ01.ini similarity index 100% rename from Data/Sys/GameConfig/SUKJ01.ini rename to Data/Sys/GameSettings/SUKJ01.ini diff --git a/Data/Sys/GameConfig/SUKP01.ini b/Data/Sys/GameSettings/SUKP01.ini similarity index 100% rename from Data/Sys/GameConfig/SUKP01.ini rename to Data/Sys/GameSettings/SUKP01.ini diff --git a/Data/Sys/GameConfig/SVBE52.ini b/Data/Sys/GameSettings/SVBE52.ini similarity index 100% rename from Data/Sys/GameConfig/SVBE52.ini rename to Data/Sys/GameSettings/SVBE52.ini diff --git a/Data/Sys/GameConfig/SVBP52.ini b/Data/Sys/GameSettings/SVBP52.ini similarity index 100% rename from Data/Sys/GameConfig/SVBP52.ini rename to Data/Sys/GameSettings/SVBP52.ini diff --git a/Data/Sys/GameConfig/SVME01.ini b/Data/Sys/GameSettings/SVME01.ini similarity index 100% rename from Data/Sys/GameConfig/SVME01.ini rename to Data/Sys/GameSettings/SVME01.ini diff --git a/Data/Sys/GameConfig/SVMJ01.ini b/Data/Sys/GameSettings/SVMJ01.ini similarity index 100% rename from Data/Sys/GameConfig/SVMJ01.ini rename to Data/Sys/GameSettings/SVMJ01.ini diff --git a/Data/Sys/GameConfig/SVMP01.ini b/Data/Sys/GameSettings/SVMP01.ini similarity index 100% rename from Data/Sys/GameConfig/SVMP01.ini rename to Data/Sys/GameSettings/SVMP01.ini diff --git a/Data/Sys/GameConfig/SWAE52.ini b/Data/Sys/GameSettings/SWAE52.ini similarity index 100% rename from Data/Sys/GameConfig/SWAE52.ini rename to Data/Sys/GameSettings/SWAE52.ini diff --git a/Data/Sys/GameConfig/SX3J01.ini b/Data/Sys/GameSettings/SX3J01.ini similarity index 100% rename from Data/Sys/GameConfig/SX3J01.ini rename to Data/Sys/GameSettings/SX3J01.ini diff --git a/Data/Sys/GameConfig/SX3P01.ini b/Data/Sys/GameSettings/SX3P01.ini similarity index 100% rename from Data/Sys/GameConfig/SX3P01.ini rename to Data/Sys/GameSettings/SX3P01.ini diff --git a/Data/Sys/GameConfig/SX4J01.ini b/Data/Sys/GameSettings/SX4J01.ini similarity index 100% rename from Data/Sys/GameConfig/SX4J01.ini rename to Data/Sys/GameSettings/SX4J01.ini diff --git a/Data/Sys/GameConfig/SX4P01.ini b/Data/Sys/GameSettings/SX4P01.ini similarity index 100% rename from Data/Sys/GameConfig/SX4P01.ini rename to Data/Sys/GameSettings/SX4P01.ini diff --git a/Data/Sys/GameConfig/SX8E52.ini b/Data/Sys/GameSettings/SX8E52.ini similarity index 100% rename from Data/Sys/GameConfig/SX8E52.ini rename to Data/Sys/GameSettings/SX8E52.ini diff --git a/Data/Sys/GameConfig/SXBP52.ini b/Data/Sys/GameSettings/SXBP52.ini similarity index 100% rename from Data/Sys/GameConfig/SXBP52.ini rename to Data/Sys/GameSettings/SXBP52.ini diff --git a/Data/Sys/GameConfig/SXCE52.ini b/Data/Sys/GameSettings/SXCE52.ini similarity index 100% rename from Data/Sys/GameConfig/SXCE52.ini rename to Data/Sys/GameSettings/SXCE52.ini diff --git a/Data/Sys/GameConfig/SXCP52.ini b/Data/Sys/GameSettings/SXCP52.ini similarity index 100% rename from Data/Sys/GameConfig/SXCP52.ini rename to Data/Sys/GameSettings/SXCP52.ini diff --git a/Data/Sys/GameConfig/SXDE52.ini b/Data/Sys/GameSettings/SXDE52.ini similarity index 100% rename from Data/Sys/GameConfig/SXDE52.ini rename to Data/Sys/GameSettings/SXDE52.ini diff --git a/Data/Sys/GameConfig/SXEE52.ini b/Data/Sys/GameSettings/SXEE52.ini similarity index 96% rename from Data/Sys/GameConfig/SXEE52.ini rename to Data/Sys/GameSettings/SXEE52.ini index 4d4975dfc4..05445fa6d8 100644 --- a/Data/Sys/GameConfig/SXEE52.ini +++ b/Data/Sys/GameSettings/SXEE52.ini @@ -13,7 +13,7 @@ EmulationIssues = [OnFrame] # Add memory patches to be applied every frame here. -+$Get ingame +$Get ingame 0x801822D0:dword:0x60000000 [ActionReplay] diff --git a/Data/Sys/GameConfig/SZAE69.ini b/Data/Sys/GameSettings/SZAE69.ini similarity index 100% rename from Data/Sys/GameConfig/SZAE69.ini rename to Data/Sys/GameSettings/SZAE69.ini diff --git a/Data/Sys/GameConfig/SZAP69.ini b/Data/Sys/GameSettings/SZAP69.ini similarity index 100% rename from Data/Sys/GameConfig/SZAP69.ini rename to Data/Sys/GameSettings/SZAP69.ini diff --git a/Data/Sys/GameConfig/SZBE69.ini b/Data/Sys/GameSettings/SZBE69.ini similarity index 100% rename from Data/Sys/GameConfig/SZBE69.ini rename to Data/Sys/GameSettings/SZBE69.ini diff --git a/Data/Sys/GameConfig/SZBP69.ini b/Data/Sys/GameSettings/SZBP69.ini similarity index 100% rename from Data/Sys/GameConfig/SZBP69.ini rename to Data/Sys/GameSettings/SZBP69.ini diff --git a/Data/Sys/GameConfig/UGPE01.ini b/Data/Sys/GameSettings/UGPE01.ini similarity index 100% rename from Data/Sys/GameConfig/UGPE01.ini rename to Data/Sys/GameSettings/UGPE01.ini diff --git a/Data/Sys/GameConfig/UGPP01.ini b/Data/Sys/GameSettings/UGPP01.ini similarity index 100% rename from Data/Sys/GameConfig/UGPP01.ini rename to Data/Sys/GameSettings/UGPP01.ini diff --git a/Data/Sys/GameConfig/W2GE08.ini b/Data/Sys/GameSettings/W2GE08.ini similarity index 97% rename from Data/Sys/GameConfig/W2GE08.ini rename to Data/Sys/GameSettings/W2GE08.ini index 62a7b848ea..0e5cae1f0d 100644 --- a/Data/Sys/GameConfig/W2GE08.ini +++ b/Data/Sys/GameSettings/W2GE08.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True [Video_Settings] diff --git a/Data/Sys/GameConfig/W2GP08.ini b/Data/Sys/GameSettings/W2GP08.ini similarity index 97% rename from Data/Sys/GameConfig/W2GP08.ini rename to Data/Sys/GameSettings/W2GP08.ini index 0d265ca35d..56990dee85 100644 --- a/Data/Sys/GameConfig/W2GP08.ini +++ b/Data/Sys/GameSettings/W2GP08.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True [Video_Settings] diff --git a/Data/Sys/GameConfig/W2MEBB.ini b/Data/Sys/GameSettings/W2MEBB.ini similarity index 100% rename from Data/Sys/GameConfig/W2MEBB.ini rename to Data/Sys/GameSettings/W2MEBB.ini diff --git a/Data/Sys/GameConfig/W3GE08.ini b/Data/Sys/GameSettings/W3GE08.ini similarity index 97% rename from Data/Sys/GameConfig/W3GE08.ini rename to Data/Sys/GameSettings/W3GE08.ini index 1759930dea..24dc6f7548 100644 --- a/Data/Sys/GameConfig/W3GE08.ini +++ b/Data/Sys/GameSettings/W3GE08.ini @@ -16,4 +16,3 @@ PH_ZFar = EFBEmulateFormatChanges = True [Video_Settings] SafeTextureCacheColorSamples = 512 -[Gecko] diff --git a/Data/Sys/GameConfig/W3GP08.ini b/Data/Sys/GameSettings/W3GP08.ini similarity index 97% rename from Data/Sys/GameConfig/W3GP08.ini rename to Data/Sys/GameSettings/W3GP08.ini index 46c0206e2b..72b60de292 100644 --- a/Data/Sys/GameConfig/W3GP08.ini +++ b/Data/Sys/GameSettings/W3GP08.ini @@ -16,4 +16,3 @@ PH_ZFar = EFBEmulateFormatChanges = True [Video_Settings] SafeTextureCacheColorSamples = 512 -[Gecko] diff --git a/Data/Sys/GameConfig/W8CEXS.ini b/Data/Sys/GameSettings/W8CEXS.ini similarity index 100% rename from Data/Sys/GameConfig/W8CEXS.ini rename to Data/Sys/GameSettings/W8CEXS.ini diff --git a/Data/Sys/GameConfig/W8CPXS.ini b/Data/Sys/GameSettings/W8CPXS.ini similarity index 100% rename from Data/Sys/GameConfig/W8CPXS.ini rename to Data/Sys/GameSettings/W8CPXS.ini diff --git a/Data/Sys/GameConfig/WA4P01.ini b/Data/Sys/GameSettings/WA4P01.ini similarity index 100% rename from Data/Sys/GameConfig/WA4P01.ini rename to Data/Sys/GameSettings/WA4P01.ini diff --git a/Data/Sys/GameConfig/WALE01.ini b/Data/Sys/GameSettings/WALE01.ini similarity index 100% rename from Data/Sys/GameConfig/WALE01.ini rename to Data/Sys/GameSettings/WALE01.ini diff --git a/Data/Sys/GameConfig/WAYETJ.ini b/Data/Sys/GameSettings/WAYETJ.ini similarity index 100% rename from Data/Sys/GameConfig/WAYETJ.ini rename to Data/Sys/GameSettings/WAYETJ.ini diff --git a/Data/Sys/GameConfig/WB2ETL.ini b/Data/Sys/GameSettings/WB2ETL.ini similarity index 96% rename from Data/Sys/GameConfig/WB2ETL.ini rename to Data/Sys/GameSettings/WB2ETL.ini index b7f7d48ca0..5ea90f06c8 100644 --- a/Data/Sys/GameConfig/WB2ETL.ini +++ b/Data/Sys/GameSettings/WB2ETL.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WB3ETL.ini b/Data/Sys/GameSettings/WB3ETL.ini similarity index 96% rename from Data/Sys/GameConfig/WB3ETL.ini rename to Data/Sys/GameSettings/WB3ETL.ini index 2954bef58e..fb6c0cbd62 100644 --- a/Data/Sys/GameConfig/WB3ETL.ini +++ b/Data/Sys/GameSettings/WB3ETL.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WB6EGL.ini b/Data/Sys/GameSettings/WB6EGL.ini similarity index 96% rename from Data/Sys/GameConfig/WB6EGL.ini rename to Data/Sys/GameSettings/WB6EGL.ini index 8af762c359..1af5dfc320 100644 --- a/Data/Sys/GameConfig/WB6EGL.ini +++ b/Data/Sys/GameSettings/WB6EGL.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WBLPGD.ini b/Data/Sys/GameSettings/WBLPGD.ini similarity index 100% rename from Data/Sys/GameConfig/WBLPGD.ini rename to Data/Sys/GameSettings/WBLPGD.ini diff --git a/Data/Sys/GameConfig/WBME01.ini b/Data/Sys/GameSettings/WBME01.ini similarity index 100% rename from Data/Sys/GameConfig/WBME01.ini rename to Data/Sys/GameSettings/WBME01.ini diff --git a/Data/Sys/GameConfig/WBQE18.ini b/Data/Sys/GameSettings/WBQE18.ini similarity index 100% rename from Data/Sys/GameConfig/WBQE18.ini rename to Data/Sys/GameSettings/WBQE18.ini diff --git a/Data/Sys/GameConfig/WBXETL.ini b/Data/Sys/GameSettings/WBXETL.ini similarity index 96% rename from Data/Sys/GameConfig/WBXETL.ini rename to Data/Sys/GameSettings/WBXETL.ini index 6520392f0c..c8b46841c8 100644 --- a/Data/Sys/GameConfig/WBXETL.ini +++ b/Data/Sys/GameSettings/WBXETL.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WBYETL.ini b/Data/Sys/GameSettings/WBYETL.ini similarity index 97% rename from Data/Sys/GameConfig/WBYETL.ini rename to Data/Sys/GameSettings/WBYETL.ini index 55bb77dbb4..cade2f4991 100644 --- a/Data/Sys/GameConfig/WBYETL.ini +++ b/Data/Sys/GameSettings/WBYETL.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WBZETL.ini b/Data/Sys/GameSettings/WBZETL.ini similarity index 97% rename from Data/Sys/GameConfig/WBZETL.ini rename to Data/Sys/GameSettings/WBZETL.ini index 3fb8e504d7..1529c395fd 100644 --- a/Data/Sys/GameConfig/WBZETL.ini +++ b/Data/Sys/GameSettings/WBZETL.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WC6EUP.ini b/Data/Sys/GameSettings/WC6EUP.ini similarity index 98% rename from Data/Sys/GameConfig/WC6EUP.ini rename to Data/Sys/GameSettings/WC6EUP.ini index 8996b68646..62567fa8d1 100644 --- a/Data/Sys/GameConfig/WC6EUP.ini +++ b/Data/Sys/GameSettings/WC6EUP.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WCHEJS.ini b/Data/Sys/GameSettings/WCHEJS.ini similarity index 97% rename from Data/Sys/GameConfig/WCHEJS.ini rename to Data/Sys/GameSettings/WCHEJS.ini index df3f05b26f..2d36a7ca61 100644 --- a/Data/Sys/GameConfig/WCHEJS.ini +++ b/Data/Sys/GameSettings/WCHEJS.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True EFBToTextureEnable = False diff --git a/Data/Sys/GameConfig/WCVENV.ini b/Data/Sys/GameSettings/WCVENV.ini similarity index 100% rename from Data/Sys/GameConfig/WCVENV.ini rename to Data/Sys/GameSettings/WCVENV.ini diff --git a/Data/Sys/GameConfig/WD9EA4.ini b/Data/Sys/GameSettings/WD9EA4.ini similarity index 100% rename from Data/Sys/GameConfig/WD9EA4.ini rename to Data/Sys/GameSettings/WD9EA4.ini diff --git a/Data/Sys/GameConfig/WDME01.ini b/Data/Sys/GameSettings/WDME01.ini similarity index 100% rename from Data/Sys/GameConfig/WDME01.ini rename to Data/Sys/GameSettings/WDME01.ini diff --git a/Data/Sys/GameConfig/WDMP01.ini b/Data/Sys/GameSettings/WDMP01.ini similarity index 100% rename from Data/Sys/GameConfig/WDMP01.ini rename to Data/Sys/GameSettings/WDMP01.ini diff --git a/Data/Sys/GameConfig/WERP18.ini b/Data/Sys/GameSettings/WERP18.ini similarity index 100% rename from Data/Sys/GameConfig/WERP18.ini rename to Data/Sys/GameSettings/WERP18.ini diff --git a/Data/Sys/GameConfig/WF4EGD.ini b/Data/Sys/GameSettings/WF4EGD.ini similarity index 100% rename from Data/Sys/GameConfig/WF4EGD.ini rename to Data/Sys/GameSettings/WF4EGD.ini diff --git a/Data/Sys/GameConfig/WFLE01.ini b/Data/Sys/GameSettings/WFLE01.ini similarity index 96% rename from Data/Sys/GameConfig/WFLE01.ini rename to Data/Sys/GameSettings/WFLE01.ini index 3b5e8530f4..b5e7489086 100644 --- a/Data/Sys/GameConfig/WFLE01.ini +++ b/Data/Sys/GameSettings/WFLE01.ini @@ -12,6 +12,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameConfig/WFUEQQ.ini b/Data/Sys/GameSettings/WFUEQQ.ini similarity index 96% rename from Data/Sys/GameConfig/WFUEQQ.ini rename to Data/Sys/GameSettings/WFUEQQ.ini index fce18cf20c..f86db23cda 100644 --- a/Data/Sys/GameConfig/WFUEQQ.ini +++ b/Data/Sys/GameSettings/WFUEQQ.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WGDEA4.ini b/Data/Sys/GameSettings/WGDEA4.ini similarity index 100% rename from Data/Sys/GameConfig/WGDEA4.ini rename to Data/Sys/GameSettings/WGDEA4.ini diff --git a/Data/Sys/GameConfig/WGDPA4.ini b/Data/Sys/GameSettings/WGDPA4.ini similarity index 100% rename from Data/Sys/GameConfig/WGDPA4.ini rename to Data/Sys/GameSettings/WGDPA4.ini diff --git a/Data/Sys/GameConfig/WGOEWG.ini b/Data/Sys/GameSettings/WGOEWG.ini similarity index 100% rename from Data/Sys/GameConfig/WGOEWG.ini rename to Data/Sys/GameSettings/WGOEWG.ini diff --git a/Data/Sys/GameConfig/WGOPWG.ini b/Data/Sys/GameSettings/WGOPWG.ini similarity index 100% rename from Data/Sys/GameConfig/WGOPWG.ini rename to Data/Sys/GameSettings/WGOPWG.ini diff --git a/Data/Sys/GameConfig/WGSE08.ini b/Data/Sys/GameSettings/WGSE08.ini similarity index 98% rename from Data/Sys/GameConfig/WGSE08.ini rename to Data/Sys/GameSettings/WGSE08.ini index 9ede5a162d..e6e02e3c44 100644 --- a/Data/Sys/GameConfig/WGSE08.ini +++ b/Data/Sys/GameSettings/WGSE08.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True [Video_Settings] diff --git a/Data/Sys/GameConfig/WGSP08.ini b/Data/Sys/GameSettings/WGSP08.ini similarity index 98% rename from Data/Sys/GameConfig/WGSP08.ini rename to Data/Sys/GameSettings/WGSP08.ini index a3eeca61e5..8bf5201a6b 100644 --- a/Data/Sys/GameConfig/WGSP08.ini +++ b/Data/Sys/GameSettings/WGSP08.ini @@ -16,7 +16,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Hacks] EFBEmulateFormatChanges = True [Video_Settings] diff --git a/Data/Sys/GameConfig/WGYEHN.ini b/Data/Sys/GameSettings/WGYEHN.ini similarity index 100% rename from Data/Sys/GameConfig/WGYEHN.ini rename to Data/Sys/GameSettings/WGYEHN.ini diff --git a/Data/Sys/GameConfig/WHFETY.ini b/Data/Sys/GameSettings/WHFETY.ini similarity index 100% rename from Data/Sys/GameConfig/WHFETY.ini rename to Data/Sys/GameSettings/WHFETY.ini diff --git a/Data/Sys/GameConfig/WHWEFJ.ini b/Data/Sys/GameSettings/WHWEFJ.ini similarity index 97% rename from Data/Sys/GameConfig/WHWEFJ.ini rename to Data/Sys/GameSettings/WHWEFJ.ini index 87fdaae304..f281b7133f 100644 --- a/Data/Sys/GameConfig/WHWEFJ.ini +++ b/Data/Sys/GameSettings/WHWEFJ.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 [Video_Hacks] diff --git a/Data/Sys/GameConfig/WHWPFJ.ini b/Data/Sys/GameSettings/WHWPFJ.ini similarity index 97% rename from Data/Sys/GameConfig/WHWPFJ.ini rename to Data/Sys/GameSettings/WHWPFJ.ini index 0c658b96f6..afaf2267c4 100644 --- a/Data/Sys/GameConfig/WHWPFJ.ini +++ b/Data/Sys/GameSettings/WHWPFJ.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 [Video_Hacks] diff --git a/Data/Sys/GameConfig/WICPKQ.ini b/Data/Sys/GameSettings/WICPKQ.ini similarity index 100% rename from Data/Sys/GameConfig/WICPKQ.ini rename to Data/Sys/GameSettings/WICPKQ.ini diff --git a/Data/Sys/GameConfig/WIDEUN.ini b/Data/Sys/GameSettings/WIDEUN.ini similarity index 100% rename from Data/Sys/GameConfig/WIDEUN.ini rename to Data/Sys/GameSettings/WIDEUN.ini diff --git a/Data/Sys/GameConfig/WILETL.ini b/Data/Sys/GameSettings/WILETL.ini similarity index 100% rename from Data/Sys/GameConfig/WILETL.ini rename to Data/Sys/GameSettings/WILETL.ini diff --git a/Data/Sys/GameConfig/WIYETL.ini b/Data/Sys/GameSettings/WIYETL.ini similarity index 100% rename from Data/Sys/GameConfig/WIYETL.ini rename to Data/Sys/GameSettings/WIYETL.ini diff --git a/Data/Sys/GameConfig/WJEEJX.ini b/Data/Sys/GameSettings/WJEEJX.ini similarity index 100% rename from Data/Sys/GameConfig/WJEEJX.ini rename to Data/Sys/GameSettings/WJEEJX.ini diff --git a/Data/Sys/GameConfig/WKTJA4.ini b/Data/Sys/GameSettings/WKTJA4.ini similarity index 100% rename from Data/Sys/GameConfig/WKTJA4.ini rename to Data/Sys/GameSettings/WKTJA4.ini diff --git a/Data/Sys/GameConfig/WKTPA4.ini b/Data/Sys/GameSettings/WKTPA4.ini similarity index 100% rename from Data/Sys/GameConfig/WKTPA4.ini rename to Data/Sys/GameSettings/WKTPA4.ini diff --git a/Data/Sys/GameConfig/WLOEHL.ini b/Data/Sys/GameSettings/WLOEHL.ini similarity index 100% rename from Data/Sys/GameConfig/WLOEHL.ini rename to Data/Sys/GameSettings/WLOEHL.ini diff --git a/Data/Sys/GameConfig/WLWEHL.ini b/Data/Sys/GameSettings/WLWEHL.ini similarity index 100% rename from Data/Sys/GameConfig/WLWEHL.ini rename to Data/Sys/GameSettings/WLWEHL.ini diff --git a/Data/Sys/GameConfig/WM8E18.ini b/Data/Sys/GameSettings/WM8E18.ini similarity index 100% rename from Data/Sys/GameConfig/WM8E18.ini rename to Data/Sys/GameSettings/WM8E18.ini diff --git a/Data/Sys/GameConfig/WMBP01.ini b/Data/Sys/GameSettings/WMBP01.ini similarity index 100% rename from Data/Sys/GameConfig/WMBP01.ini rename to Data/Sys/GameSettings/WMBP01.ini diff --git a/Data/Sys/GameConfig/WMMEAF.ini b/Data/Sys/GameSettings/WMMEAF.ini similarity index 100% rename from Data/Sys/GameConfig/WMMEAF.ini rename to Data/Sys/GameSettings/WMMEAF.ini diff --git a/Data/Sys/GameConfig/WOTEM0.ini b/Data/Sys/GameSettings/WOTEM0.ini similarity index 100% rename from Data/Sys/GameConfig/WOTEM0.ini rename to Data/Sys/GameSettings/WOTEM0.ini diff --git a/Data/Sys/GameConfig/WPCE01.ini b/Data/Sys/GameSettings/WPCE01.ini similarity index 98% rename from Data/Sys/GameConfig/WPCE01.ini rename to Data/Sys/GameSettings/WPCE01.ini index 550e1424b4..632a6849a1 100644 --- a/Data/Sys/GameConfig/WPCE01.ini +++ b/Data/Sys/GameSettings/WPCE01.ini @@ -16,4 +16,3 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] diff --git a/Data/Sys/GameConfig/WPJEJW.ini b/Data/Sys/GameSettings/WPJEJW.ini similarity index 97% rename from Data/Sys/GameConfig/WPJEJW.ini rename to Data/Sys/GameSettings/WPJEJW.ini index 8f3f896d73..4c2ad883b7 100644 --- a/Data/Sys/GameConfig/WPJEJW.ini +++ b/Data/Sys/GameSettings/WPJEJW.ini @@ -12,6 +12,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameConfig/WPPEXS.ini b/Data/Sys/GameSettings/WPPEXS.ini similarity index 100% rename from Data/Sys/GameConfig/WPPEXS.ini rename to Data/Sys/GameSettings/WPPEXS.ini diff --git a/Data/Sys/GameConfig/WPPJJF.ini b/Data/Sys/GameSettings/WPPJJF.ini similarity index 100% rename from Data/Sys/GameConfig/WPPJJF.ini rename to Data/Sys/GameSettings/WPPJJF.ini diff --git a/Data/Sys/GameConfig/WPSE01.ini b/Data/Sys/GameSettings/WPSE01.ini similarity index 100% rename from Data/Sys/GameConfig/WPSE01.ini rename to Data/Sys/GameSettings/WPSE01.ini diff --git a/Data/Sys/GameConfig/WPUEGD.ini b/Data/Sys/GameSettings/WPUEGD.ini similarity index 96% rename from Data/Sys/GameConfig/WPUEGD.ini rename to Data/Sys/GameSettings/WPUEGD.ini index 2051ccf6eb..4b14ae7d37 100644 --- a/Data/Sys/GameConfig/WPUEGD.ini +++ b/Data/Sys/GameSettings/WPUEGD.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WPYPPY.ini b/Data/Sys/GameSettings/WPYPPY.ini similarity index 100% rename from Data/Sys/GameConfig/WPYPPY.ini rename to Data/Sys/GameSettings/WPYPPY.ini diff --git a/Data/Sys/GameConfig/WR9E08.ini b/Data/Sys/GameSettings/WR9E08.ini similarity index 100% rename from Data/Sys/GameConfig/WR9E08.ini rename to Data/Sys/GameSettings/WR9E08.ini diff --git a/Data/Sys/GameConfig/WR9P08.ini b/Data/Sys/GameSettings/WR9P08.ini similarity index 100% rename from Data/Sys/GameConfig/WR9P08.ini rename to Data/Sys/GameSettings/WR9P08.ini diff --git a/Data/Sys/GameConfig/WRGEHU.ini b/Data/Sys/GameSettings/WRGEHU.ini similarity index 100% rename from Data/Sys/GameConfig/WRGEHU.ini rename to Data/Sys/GameSettings/WRGEHU.ini diff --git a/Data/Sys/GameConfig/WRIPGD.ini b/Data/Sys/GameSettings/WRIPGD.ini similarity index 100% rename from Data/Sys/GameConfig/WRIPGD.ini rename to Data/Sys/GameSettings/WRIPGD.ini diff --git a/Data/Sys/GameConfig/WRUPXS.ini b/Data/Sys/GameSettings/WRUPXS.ini similarity index 100% rename from Data/Sys/GameConfig/WRUPXS.ini rename to Data/Sys/GameSettings/WRUPXS.ini diff --git a/Data/Sys/GameConfig/WRXE08.ini b/Data/Sys/GameSettings/WRXE08.ini similarity index 100% rename from Data/Sys/GameConfig/WRXE08.ini rename to Data/Sys/GameSettings/WRXE08.ini diff --git a/Data/Sys/GameConfig/WSNE8P.ini b/Data/Sys/GameSettings/WSNE8P.ini similarity index 100% rename from Data/Sys/GameConfig/WSNE8P.ini rename to Data/Sys/GameSettings/WSNE8P.ini diff --git a/Data/Sys/GameConfig/WTEELU.ini b/Data/Sys/GameSettings/WTEELU.ini similarity index 97% rename from Data/Sys/GameConfig/WTEELU.ini rename to Data/Sys/GameSettings/WTEELU.ini index f44112dcd3..289c72bd9d 100644 --- a/Data/Sys/GameConfig/WTEELU.ini +++ b/Data/Sys/GameSettings/WTEELU.ini @@ -12,7 +12,6 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] UseXFB = True UseRealXFB = False diff --git a/Data/Sys/GameConfig/WTKEGL.ini b/Data/Sys/GameSettings/WTKEGL.ini similarity index 98% rename from Data/Sys/GameConfig/WTKEGL.ini rename to Data/Sys/GameSettings/WTKEGL.ini index 7af8152062..fffe3a11c2 100644 --- a/Data/Sys/GameConfig/WTKEGL.ini +++ b/Data/Sys/GameSettings/WTKEGL.ini @@ -16,6 +16,5 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/Sys/GameConfig/WTRPXS.ini b/Data/Sys/GameSettings/WTRPXS.ini similarity index 100% rename from Data/Sys/GameConfig/WTRPXS.ini rename to Data/Sys/GameSettings/WTRPXS.ini diff --git a/Data/Sys/GameConfig/WTTPTW.ini b/Data/Sys/GameSettings/WTTPTW.ini similarity index 100% rename from Data/Sys/GameConfig/WTTPTW.ini rename to Data/Sys/GameSettings/WTTPTW.ini diff --git a/Data/Sys/GameConfig/WTXPJS.ini b/Data/Sys/GameSettings/WTXPJS.ini similarity index 100% rename from Data/Sys/GameConfig/WTXPJS.ini rename to Data/Sys/GameSettings/WTXPJS.ini diff --git a/Data/Sys/GameConfig/WWRE01.ini b/Data/Sys/GameSettings/WWRE01.ini similarity index 100% rename from Data/Sys/GameConfig/WWRE01.ini rename to Data/Sys/GameSettings/WWRE01.ini diff --git a/Data/Sys/GameConfig/WZIPTW.ini b/Data/Sys/GameSettings/WZIPTW.ini similarity index 100% rename from Data/Sys/GameConfig/WZIPTW.ini rename to Data/Sys/GameSettings/WZIPTW.ini diff --git a/Data/Sys/GameConfig/WZPPRZ.ini b/Data/Sys/GameSettings/WZPPRZ.ini similarity index 100% rename from Data/Sys/GameConfig/WZPPRZ.ini rename to Data/Sys/GameSettings/WZPPRZ.ini diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 1077aadd81..d171bcb0a7 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -59,7 +59,7 @@ #define GC_USER_DIR "GC" #define WII_USER_DIR "Wii" #define CONFIG_DIR "Config" -#define GAMECONFIG_DIR "GameConfig" +#define GAMESETTINGS_DIR "GameSettings" #define MAPS_DIR "Maps" #define CACHE_DIR "Cache" #define SHADERCACHE_DIR "ShaderCache" diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index e37689ad0a..64f24d6420 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -740,7 +740,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; - paths[D_GAMECONFIG_IDX] = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP; + paths[D_GAMESETTINGS_IDX] = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP; paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; @@ -791,37 +791,37 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new break; case D_USER_IDX: - paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; - paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; - paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; - paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; - paths[D_GAMECONFIG_IDX] = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP; - paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; - paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; - paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; - paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; - paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; - paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP; - paths[D_OPENCL_IDX] = paths[D_USER_IDX] + OPENCL_DIR DIR_SEP; - paths[D_HIRESTEXTURES_IDX] = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP; - paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP; - paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; - paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; - paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; - paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; - paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; - paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; - paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; - paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; - paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; - paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; - paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; - paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; - paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; - paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; - paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; - paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; - paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; + paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; + paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; + paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; + paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; + paths[D_GAMESETTINGS_IDX] = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP; + paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; + paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; + paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; + paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; + paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; + paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP; + paths[D_OPENCL_IDX] = paths[D_USER_IDX] + OPENCL_DIR DIR_SEP; + paths[D_HIRESTEXTURES_IDX] = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP; + paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP; + paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; + paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; + paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; + paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; + paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; + paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; + paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; + paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; + paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; + paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; + paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; + paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; + paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; + paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; + paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; + paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; + paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; break; case D_CONFIG_IDX: diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h index 40aba0037d..6d0a440f69 100644 --- a/Source/Core/Common/Src/FileUtil.h +++ b/Source/Core/Common/Src/FileUtil.h @@ -21,8 +21,8 @@ enum { D_GCUSER_IDX, D_WIIROOT_IDX, D_WIIUSER_IDX, - D_CONFIG_IDX, - D_GAMECONFIG_IDX, + D_CONFIG_IDX, // global settings + D_GAMESETTINGS_IDX, // user-specified settings which override both the global and the default settings (per game) D_MAPS_IDX, D_CACHE_IDX, D_SHADERCACHE_IDX, diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 1ca57979e4..771ef5700b 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -111,115 +111,121 @@ bool CompareValues(const u32 val1, const u32 val2, const int type); // ---------------------- // AR Remote Functions -void LoadCodes(IniFile &ini, bool forceLoad) +void LoadCodes(IniFile &globalIni, IniFile &localIni, bool forceLoad) { // Parses the Action Replay section of a game ini file. if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats && !forceLoad) return; - std::vector lines; - std::vector encryptedLines; - ARCode currentCode; arCodes.clear(); - if (!ini.GetLines("ActionReplay", lines)) - return; // no codes found. - - std::vector::const_iterator - it = lines.begin(), - lines_end = lines.end(); - for (; it != lines_end; ++it) + std::vector enabledLines; + std::set enabledNames; + localIni.GetLines("ActionReplay_Enabled", enabledLines); + for (auto iter = enabledLines.begin(); iter != enabledLines.end(); ++iter) { - const std::string line = *it; - - if (line.empty()) - continue; - - std::vector pieces; - - // Check if the line is a name of the code - if (line[0] == '+' || line[0] == '$') + const std::string& line = *iter; + if (line.size() != 0 && line[0] == '$') { - if (currentCode.ops.size()) - { - arCodes.push_back(currentCode); - currentCode.ops.clear(); - } - if (encryptedLines.size()) - { - DecryptARCode(encryptedLines, currentCode.ops); - arCodes.push_back(currentCode); - currentCode.ops.clear(); - encryptedLines.clear(); - } - - if (line.size() > 1) - { - if (line[0] == '+') - { - currentCode.active = true; - currentCode.name = line.substr(2, line.size() - 2);; - if (!forceLoad) - Core::DisplayMessage("AR code active: " + currentCode.name, 5000); - } - else - { - currentCode.active = false; - currentCode.name = line.substr(1, line.size() - 1); - } - } - continue; + std::string name = line.substr(1, line.size() - 1); + enabledNames.insert(name); } + } - SplitString(line, ' ', pieces); + IniFile* inis[] = {&globalIni, &localIni}; + for (size_t i = 0; i < ArraySize(inis); ++i) + { + std::vector lines; + std::vector encryptedLines; + ARCode currentCode; + + inis[i]->GetLines("ActionReplay", lines); - // Check if the AR code is decrypted - if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8) + std::vector::const_iterator + it = lines.begin(), + lines_end = lines.end(); + for (; it != lines_end; ++it) { - AREntry op; - bool success_addr = TryParse(std::string("0x") + pieces[0], &op.cmd_addr); - bool success_val = TryParse(std::string("0x") + pieces[1], &op.value); - if (!(success_addr | success_val)) { - PanicAlertT("Action Replay Error: invalid AR code line: %s", line.c_str()); - if (!success_addr) PanicAlertT("The address is invalid"); - if (!success_val) PanicAlertT("The value is invalid"); + const std::string line = *it; + + if (line.empty()) + continue; + + std::vector pieces; + + // Check if the line is a name of the code + if (line[0] == '$') + { + if (currentCode.ops.size()) + { + arCodes.push_back(currentCode); + currentCode.ops.clear(); + } + if (encryptedLines.size()) + { + DecryptARCode(encryptedLines, currentCode.ops); + arCodes.push_back(currentCode); + currentCode.ops.clear(); + encryptedLines.clear(); + } + + currentCode.name = line.substr(1, line.size() - 1); + currentCode.active = enabledNames.find(currentCode.name) != enabledNames.end(); + currentCode.user_defined = (i == 1); } else { - currentCode.ops.push_back(op); - } - } - else - { - SplitString(line, '-', pieces); - if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5) - { - // Encrypted AR code - // Decryption is done in "blocks", so we must push blocks into a vector, - // then send to decrypt when a new block is encountered, or if it's the last block. - encryptedLines.push_back(pieces[0]+pieces[1]+pieces[2]); - } - } - } + SplitString(line, ' ', pieces); - // Handle the last code correctly. - if (currentCode.ops.size()) - { - arCodes.push_back(currentCode); - } - if (encryptedLines.size()) - { - DecryptARCode(encryptedLines, currentCode.ops); - arCodes.push_back(currentCode); + // Check if the AR code is decrypted + if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8) + { + AREntry op; + bool success_addr = TryParse(std::string("0x") + pieces[0], &op.cmd_addr); + bool success_val = TryParse(std::string("0x") + pieces[1], &op.value); + if (!(success_addr | success_val)) { + PanicAlertT("Action Replay Error: invalid AR code line: %s", line.c_str()); + if (!success_addr) PanicAlertT("The address is invalid"); + if (!success_val) PanicAlertT("The value is invalid"); + } + else + { + currentCode.ops.push_back(op); + } + } + else + { + SplitString(line, '-', pieces); + if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5) + { + // Encrypted AR code + // Decryption is done in "blocks", so we must push blocks into a vector, + // then send to decrypt when a new block is encountered, or if it's the last block. + encryptedLines.push_back(pieces[0]+pieces[1]+pieces[2]); + } + } + } + } + + // Handle the last code correctly. + if (currentCode.ops.size()) + { + arCodes.push_back(currentCode); + } + if (encryptedLines.size()) + { + DecryptARCode(encryptedLines, currentCode.ops); + arCodes.push_back(currentCode); + } } UpdateActiveList(); } -void LoadCodes(std::vector &_arCodes, IniFile &ini) +void LoadCodes(std::vector &_arCodes, IniFile &globalIni, IniFile& localIni) { - LoadCodes(ini, true); + LoadCodes(globalIni, localIni, true); _arCodes = arCodes; } diff --git a/Source/Core/Core/Src/ActionReplay.h b/Source/Core/Core/Src/ActionReplay.h index 42c40f08c4..ac2bb7bd2a 100644 --- a/Source/Core/Core/Src/ActionReplay.h +++ b/Source/Core/Core/Src/ActionReplay.h @@ -23,12 +23,13 @@ struct ARCode std::string name; std::vector ops; bool active; + bool user_defined; }; void RunAllActive(); bool RunCode(const ARCode &arcode); -void LoadCodes(IniFile &ini, bool forceLoad); -void LoadCodes(std::vector &_arCodes, IniFile &ini); +void LoadCodes(IniFile &globalIni, IniFile &localIni, bool forceLoad); +void LoadCodes(std::vector &_arCodes, IniFile &globalIni, IniFile &localIni); size_t GetCodeListSize(); ARCode GetARCode(size_t index); void SetARCode_IsActive(bool active, size_t index); diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index ec388e4974..a7051dd127 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -24,6 +24,7 @@ #include #include "Common.h" +#include "CommonPaths.h" #include "IniFile.h" #include "BootManager.h" #include "Volume.h" @@ -73,11 +74,16 @@ bool BootCore(const std::string& _rFilename) return false; // Load game specific settings - IniFile game_ini; std::string unique_id = StartUp.GetUniqueID(); - StartUp.m_strGameIni = File::GetUserPath(D_GAMECONFIG_IDX) + unique_id + ".ini"; - if (unique_id.size() == 6 && game_ini.Load(StartUp.m_strGameIni.c_str())) + StartUp.m_strGameIniDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + unique_id + ".ini"; + StartUp.m_strGameIniLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + unique_id + ".ini"; + + if (unique_id.size() == 6) { + IniFile game_ini; + game_ini.Load(StartUp.m_strGameIniDefault); + game_ini.Load(StartUp.m_strGameIniLocal, true); + config_cache.valid = true; config_cache.bCPUThread = StartUp.bCPUThread; config_cache.bSkipIdle = StartUp.bSkipIdle; diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index bfb80ff626..4974635ea4 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -205,7 +205,8 @@ bool Init() if (g_aspect_wide) { IniFile gameIni; - gameIni.Load(_CoreParameter.m_strGameIni.c_str()); + gameIni.Load(_CoreParameter.m_strGameIniDefault.c_str()); + gameIni.Load(_CoreParameter.m_strGameIniLocal.c_str(), true); gameIni.Get("Wii", "Widescreen", &g_aspect_wide, !!SConfig::GetInstance().m_SYSCONF-> GetData("IPL.AR")); diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 5666049b2f..6e87673f95 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -198,7 +198,8 @@ struct SCoreStartupParameter std::string m_strApploader; std::string m_strUniqueID; std::string m_strName; - std::string m_strGameIni; + std::string m_strGameIniDefault; + std::string m_strGameIniLocal; // Constructor just calls LoadDefaults SCoreStartupParameter(); diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp index 6d5b1f782f..54a00d1a47 100644 --- a/Source/Core/Core/Src/GeckoCodeConfig.cpp +++ b/Source/Core/Core/Src/GeckoCodeConfig.cpp @@ -15,6 +15,7 @@ namespace Gecko { +// TODO: Support loading codes from default game inis. void LoadCodes(const IniFile& inifile, std::vector& gcodes) { std::vector lines; @@ -96,7 +97,7 @@ void SaveGeckoCode(std::vector& lines, const GeckoCode& gcode) } lines.push_back(name); - + // save all the code lines std::vector::const_iterator codes_iter = gcode.codes.begin(), diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp index 2221fe456f..c7d133132b 100644 --- a/Source/Core/Core/Src/PatchEngine.cpp +++ b/Source/Core/Core/Src/PatchEngine.cpp @@ -20,6 +20,7 @@ #include #include +#include "CommonPaths.h" #include "StringUtil.h" #include "PatchEngine.h" #include "HW/Memmap.h" @@ -44,22 +45,40 @@ std::vector onFrame; std::map speedHacks; std::vector discList; -void LoadPatchSection(const char *section, std::vector &patches, IniFile &ini) +void LoadPatchSection(const char *section, std::vector &patches, + IniFile &globalIni, IniFile &localIni) { - std::vector lines; - - if (!ini.GetLines(section, lines)) - return; - - Patch currentPatch; - - for (std::vector::const_iterator iter = lines.begin(); iter != lines.end(); ++iter) + // Load the name of all enabled patches + std::string enabledSectionName = std::string(section) + "_Enabled"; + std::vector enabledLines; + std::set enabledNames; + localIni.GetLines(enabledSectionName.c_str(), enabledLines); + for (auto iter = enabledLines.begin(); iter != enabledLines.end(); ++iter) { - std::string line = *iter; - - if (line.size()) + const std::string& line = *iter; + if (line.size() != 0 && line[0] == '$') { - if (line[0] == '+' || line[0] == '$') + std::string name = line.substr(1, line.size() - 1); + enabledNames.insert(name); + } + } + + IniFile* inis[] = {&globalIni, &localIni}; + + for (size_t i = 0; i < ArraySize(inis); ++i) + { + std::vector lines; + Patch currentPatch; + inis[i]->GetLines(section, lines); + + for (auto iter = lines.begin(); iter != lines.end(); ++iter) + { + std::string line = *iter; + + if (line.size() == 0) + continue; + + if (line[0] == '$') { // Take care of the previous code if (currentPatch.name.size()) @@ -67,39 +86,38 @@ void LoadPatchSection(const char *section, std::vector &patches, IniFile currentPatch.entries.clear(); // Set active and name - currentPatch.active = (line[0] == '+') ? true : false; - if (currentPatch.active) - currentPatch.name = line.substr(2, line.size() - 2); - else - currentPatch.name = line.substr(1, line.size() - 1); - continue; + currentPatch.name = line.substr(1, line.size() - 1); + currentPatch.active = enabledNames.find(currentPatch.name) != enabledNames.end(); + currentPatch.user_defined = (i == 1); } - - std::string::size_type loc = line.find_first_of('=', 0); - - if (loc != std::string::npos) - line[loc] = ':'; - - std::vector items; - SplitString(line, ':', items); - - if (items.size() >= 3) + else { - PatchEntry pE; - bool success = true; - success &= TryParse(items[0], &pE.address); - success &= TryParse(items[2], &pE.value); + std::string::size_type loc = line.find_first_of('=', 0); - pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings); - success &= (pE.type != (PatchType)3); - if (success) - currentPatch.entries.push_back(pE); + if (loc != std::string::npos) + line[loc] = ':'; + + std::vector items; + SplitString(line, ':', items); + + if (items.size() >= 3) + { + PatchEntry pE; + bool success = true; + success &= TryParse(items[0], &pE.address); + success &= TryParse(items[2], &pE.value); + + pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings); + success &= (pE.type != (PatchType)3); + if (success) + currentPatch.entries.push_back(pE); + } } } - } - if (currentPatch.name.size() && currentPatch.entries.size()) - patches.push_back(currentPatch); + if (currentPatch.name.size() && currentPatch.entries.size()) + patches.push_back(currentPatch); + } } static void LoadDiscList(const char *section, std::vector &_discList, IniFile &ini) @@ -150,22 +168,24 @@ int GetSpeedhackCycles(const u32 addr) void LoadPatches(const char *gameID) { - IniFile ini; - std::string filename = File::GetUserPath(D_GAMECONFIG_IDX) + gameID + ".ini"; + IniFile globalIni, localIni; + globalIni.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + gameID + ".ini"); + localIni.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + gameID + ".ini", true); - if (ini.Load(filename.c_str())) - { - LoadPatchSection("OnFrame", onFrame, ini); - ActionReplay::LoadCodes(ini, false); - - // lil silly - std::vector gcodes; - Gecko::LoadCodes(ini, gcodes); - Gecko::SetActiveCodes(gcodes); + IniFile merged; + merged.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + gameID + ".ini"); + merged.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + gameID + ".ini", true); - LoadSpeedhacks("Speedhacks", speedHacks, ini); - LoadDiscList("DiscList", discList, ini); - } + LoadPatchSection("OnFrame", onFrame, globalIni, localIni); + ActionReplay::LoadCodes(globalIni, localIni, false); + + // lil silly + std::vector gcodes; + Gecko::LoadCodes(localIni, gcodes); + Gecko::SetActiveCodes(gcodes); + + LoadSpeedhacks("Speedhacks", speedHacks, merged); + LoadDiscList("DiscList", discList, merged); } void ApplyPatches(const std::vector &patches) diff --git a/Source/Core/Core/Src/PatchEngine.h b/Source/Core/Core/Src/PatchEngine.h index 87b3e8c901..13de073eb9 100644 --- a/Source/Core/Core/Src/PatchEngine.h +++ b/Source/Core/Core/Src/PatchEngine.h @@ -33,10 +33,12 @@ struct Patch std::string name; std::vector entries; bool active; + bool user_defined; // False if this code is shipped with Dolphin. }; int GetSpeedhackCycles(const u32 addr); -void LoadPatchSection(const char *section, std::vector &patches, IniFile &ini); +void LoadPatchSection(const char *section, std::vector &patches, + IniFile &globalIni, IniFile &localIni); void LoadPatches(const char *gameID); void ApplyFramePatches(); void ApplyARPatches(); diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index 7d92d7cb04..1fe6f750ba 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -5,6 +5,7 @@ #include "Globals.h" #include "CheatsWindow.h" #include "ActionReplay.h" +#include "CommonPaths.h" #include "Core.h" #include "ConfigManager.h" #include "VolumeHandler.h" @@ -243,8 +244,10 @@ void wxCheatsWindow::OnEvent_Close(wxCloseEvent& ev) void wxCheatsWindow::UpdateGUI() { // load code - m_gameini_path = File::GetUserPath(D_GAMECONFIG_IDX) + Core::g_CoreStartupParameter.GetUniqueID() + ".ini"; - m_gameini.Load(m_gameini_path); + m_gameini_default_path = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + Core::g_CoreStartupParameter.GetUniqueID() + ".ini"; + m_gameini_default.Load(m_gameini_default_path); + m_gameini_local_path = File::GetUserPath(D_GAMESETTINGS_IDX) + Core::g_CoreStartupParameter.GetUniqueID() + ".ini"; + m_gameini_local.Load(m_gameini_local_path, true); Load_ARCodes(); Load_GeckoCodes(); @@ -283,7 +286,7 @@ void wxCheatsWindow::Load_ARCodes() void wxCheatsWindow::Load_GeckoCodes() { - m_geckocode_panel->LoadCodes(m_gameini, Core::g_CoreStartupParameter.GetUniqueID(), true); + m_geckocode_panel->LoadCodes(m_gameini_local, Core::g_CoreStartupParameter.GetUniqueID(), true); } void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (event)) @@ -338,10 +341,10 @@ void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev) Gecko::SetActiveCodes(m_geckocode_panel->GetCodes()); // Save gameini, with changed gecko codes - if (m_gameini_path.size()) + if (m_gameini_local_path.size()) { - Gecko::SaveCodes(m_gameini, m_geckocode_panel->GetCodes()); - m_gameini.Save(m_gameini_path); + Gecko::SaveCodes(m_gameini_local, m_geckocode_panel->GetCodes()); + m_gameini_local.Save(m_gameini_local_path); } ev.Skip(); diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h index 244e4d5b48..ee2d0e1892 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.h +++ b/Source/Core/DolphinWX/Src/CheatsWindow.h @@ -130,8 +130,10 @@ class wxCheatsWindow : public wxDialog std::vector indexList; Gecko::CodeConfigPanel *m_geckocode_panel; - IniFile m_gameini; - std::string m_gameini_path; + IniFile m_gameini_default; + IniFile m_gameini_local; + std::string m_gameini_default_path; + std::string m_gameini_local_path; void Init_ChildControls(); diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index a763fad3fc..8f2ce68a0d 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -115,7 +115,8 @@ GameListItem::GameListItem(const std::string& _rFileName) if (IsValid()) { IniFile ini; - ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + m_UniqueID + ".ini"); + ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_UniqueID + ".ini"); + ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_UniqueID + ".ini", true); ini.Get("EmuState", "EmulationStateId", &m_emu_state); ini.Get("EmuState", "EmulationIssues", &m_issues); } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 945257ab88..a158c37278 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -6,6 +6,8 @@ #import #endif +#include + #include "Common.h" #include "CommonPaths.h" #include "Globals.h" @@ -45,6 +47,7 @@ BEGIN_EVENT_TABLE(CISOProperties, wxDialog) EVT_CLOSE(CISOProperties::OnClose) EVT_BUTTON(wxID_OK, CISOProperties::OnCloseClick) EVT_BUTTON(ID_EDITCONFIG, CISOProperties::OnEditConfig) + EVT_BUTTON(ID_SHOWDEFAULTCONFIG, CISOProperties::OnShowDefaultConfig) EVT_CHOICE(ID_EMUSTATE, CISOProperties::SetRefresh) EVT_CHOICE(ID_EMU_ISSUES, CISOProperties::SetRefresh) EVT_BUTTON(ID_PHSETTINGS, CISOProperties::PHackButtonClicked) @@ -70,6 +73,7 @@ END_EVENT_TABLE() CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style) : wxDialog(parent, id, title, position, size, style) { + // Load ISO data OpenISO = DiscIO::CreateVolumeFromFilename(fileName); if (DiscIO::IsVolumeWiiDisc(OpenISO)) { @@ -102,12 +106,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW } } - OpenGameListItem = new GameListItem(fileName); - - bRefreshList = false; - - CreateGUIControls(DiscIO::IsVolumeWadFile(OpenISO)); - + // Load game ini std::string _iniFilename = OpenISO->GetUniqueID(); if (!_iniFilename.length()) @@ -121,34 +120,21 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW } } - GameIniFile = File::GetUserPath(D_GAMECONFIG_IDX) + _iniFilename + ".ini"; + GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini"; + GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini"; - if (GameIni.Load(GameIniFile.c_str())) - { - LoadGameConfig(); - } - else - { - // Will fail out if GameConfig folder doesn't exist - std::ofstream f; - OpenFStream(f, GameIniFile, std::ios_base::out); - if (f) - { - f << "# " << OpenISO->GetUniqueID() << " - " << OpenISO->GetName() << '\n' - << "[Core] Values set here will override the main dolphin settings.\n" - << "[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.\n" - << "[OnFrame] Add memory patches to be applied every frame here.\n" - << "[ActionReplay] Add action replay cheats here.\n"; - f.close(); - } + printf("Loading\n"); + GameIniDefault.Load(GameIniFileDefault); + GameIniLocal.Load(GameIniFileLocal); - if (GameIni.Load(GameIniFile.c_str())) - LoadGameConfig(); - else - wxMessageBox(wxString::Format(_("Could not create %s"), - StrToWxStr(GameIniFile).c_str()), - _("Error"), wxOK|wxICON_ERROR, this); - } + // Setup GUI + OpenGameListItem = new GameListItem(fileName); + + bRefreshList = false; + + CreateGUIControls(DiscIO::IsVolumeWadFile(OpenISO)); + + LoadGameConfig(); // Disk header and apploader @@ -280,6 +266,15 @@ size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent, return CurrentIndex; } +long CISOProperties::GetElementStyle(const char* section, const char* key) +{ + // Disable 3rd state if default gameini overrides the setting + if (GameIniDefault.Exists(section, key)) + return 0; + + return wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER; +} + void CISOProperties::CreateGUIControls(bool IsWad) { wxButton * const EditConfig = @@ -287,13 +282,9 @@ void CISOProperties::CreateGUIControls(bool IsWad) EditConfig->SetToolTip(_("This will let you Manually Edit the INI config file")); wxButton * const EditConfigDefault = - new wxButton(this, ID_EDITCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize); + new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize); EditConfigDefault->SetToolTip(_("Opens the default (read-only) configuration for this game in an external text editor.")); - wxButton * const EditConfigLocal = - new wxButton(this, ID_EDITCONFIG, _("Edit Local Overrides"), wxDefaultPosition, wxDefaultSize); - EditConfigLocal->SetToolTip(_("Opens the user specified overrides in an external text editor.")); - // Notebook wxNotebook * const m_Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize); @@ -314,32 +305,33 @@ void CISOProperties::CreateGUIControls(bool IsWad) // GameConfig editing - Overrides and emulation state wxStaticText * const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting.")); + // Core - CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread"), wxDefaultValidator); + SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle"), wxDefaultValidator); + MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU"), wxDefaultValidator); MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)")); - TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "TLBHack"), wxDefaultValidator); TLBHack->SetToolTip(_("Fast version of the MMU. Does not work for every game.")); - DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ"), wxDefaultValidator); DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled.")); - VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam"), wxDefaultValidator); VBeam->SetToolTip(_("Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF = Compatible)")); - SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU"), wxDefaultValidator); SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)")); - FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed"), wxDefaultValidator); FastDiscSpeed->SetToolTip(_("Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)")); - BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging"), wxDefaultValidator); + DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE"), wxDefaultValidator); // Wii Console - EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"), wxDefaultValidator); // Video - UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); + UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "UseBBox")); UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games.")); - UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); + UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "ZTPSpeedupHack")); UseZTPSpeedupHack->SetToolTip(_("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game.")); // Hack @@ -567,10 +559,13 @@ void CISOProperties::CreateGUIControls(bool IsWad) wxSizer* sButtons = CreateButtonSizer(wxNO_DEFAULT); sButtons->Prepend(EditConfigDefault); - sButtons->Prepend(EditConfigLocal); sButtons->Prepend(EditConfig); sButtons->Add(new wxButton(this, wxID_OK, _("Close"))); + // If there is no default gameini, disable the button. + if (!File::Exists(GameIniFileDefault)) + EditConfigDefault->Disable(); + // Add notebook and buttons to the dialog wxBoxSizer* sMain; sMain = new wxBoxSizer(wxVERTICAL); @@ -586,7 +581,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event)) { if (!SaveGameConfig()) - PanicAlertT("Could not save %s", GameIniFile.c_str()); + PanicAlertT("Could not save %s", GameIniFileLocal.c_str()); EndModal(bRefreshList ? wxID_OK : wxID_CANCEL); } @@ -945,234 +940,193 @@ void CISOProperties::SetRefresh(wxCommandEvent& event) EmuIssues->Enable(event.GetSelection() != 0); } +void CISOProperties::SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox) +{ + // Prefer local gameini value over default gameini value. + bool value; + if (GameIniLocal.Get(section, key, &value)) + checkbox->Set3StateValue((wxCheckBoxState)value); + else if (GameIniDefault.Get(section, key, &value)) + checkbox->Set3StateValue((wxCheckBoxState)value); + else + checkbox->Set3StateValue(wxCHK_UNDETERMINED); +} + void CISOProperties::LoadGameConfig() { + SetCheckboxValueFromGameini("Core", "CPUThread", CPUThread); + SetCheckboxValueFromGameini("Core", "SkipIdle", SkipIdle); + SetCheckboxValueFromGameini("Core", "MMU", MMU); + SetCheckboxValueFromGameini("Core", "TLBHack", TLBHack); + SetCheckboxValueFromGameini("Core", "DCBZ", DCBZOFF); + SetCheckboxValueFromGameini("Core", "VBeam", VBeam); + SetCheckboxValueFromGameini("Core", "SyncGPU", SyncGPU); + SetCheckboxValueFromGameini("Core", "FastDiscSpeed", FastDiscSpeed); + SetCheckboxValueFromGameini("Core", "BlockMerging", BlockMerging); + SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE); + SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen); + SetCheckboxValueFromGameini("Video", "UseBBox", UseBBox); + SetCheckboxValueFromGameini("Video", "ZTPSpeedupHack", UseZTPSpeedupHack); + + // First set values from default gameini, then apply values from local gameini bool bTemp; + GameIniDefault.Get("Video", "ProjectionHack", &bTemp); + PHackEnable->SetValue(bTemp); + if (GameIniLocal.Get("Video", "ProjectionHack", &bTemp)) + PHackEnable->SetValue(bTemp); + + GameIniDefault.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear); + GameIniLocal.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear); + GameIniDefault.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar); + GameIniLocal.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar); + GameIniDefault.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP); + GameIniLocal.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP); + + GameIniDefault.Get("Video", "PH_ZNear", &PHack_Data.PHZNear); + GameIniLocal.Get("Video", "PH_ZNear", &PHack_Data.PHZNear); + GameIniDefault.Get("Video", "PH_ZFar", &PHack_Data.PHZFar); + GameIniLocal.Get("Video", "PH_ZFar", &PHack_Data.PHZFar); + int iTemp; - std::string sTemp; - - if (GameIni.Get("Core", "CPUThread", &bTemp)) - CPUThread->Set3StateValue((wxCheckBoxState)bTemp); - else - CPUThread->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "SkipIdle", &bTemp)) - SkipIdle->Set3StateValue((wxCheckBoxState)bTemp); - else - SkipIdle->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "MMU", &bTemp)) - MMU->Set3StateValue((wxCheckBoxState)bTemp); - else - MMU->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "TLBHack", &bTemp)) - TLBHack->Set3StateValue((wxCheckBoxState)bTemp); - else - TLBHack->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "DCBZ", &bTemp)) - DCBZOFF->Set3StateValue((wxCheckBoxState)bTemp); - else - DCBZOFF->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "VBeam", &bTemp)) - VBeam->Set3StateValue((wxCheckBoxState)bTemp); - else - VBeam->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "SyncGPU", &bTemp)) - SyncGPU->Set3StateValue((wxCheckBoxState)bTemp); - else - SyncGPU->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "FastDiscSpeed", &bTemp)) - FastDiscSpeed->Set3StateValue((wxCheckBoxState)bTemp); - else - FastDiscSpeed->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "BlockMerging", &bTemp)) - BlockMerging->Set3StateValue((wxCheckBoxState)bTemp); - else - BlockMerging->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Core", "DSPHLE", &bTemp)) - DSPHLE->Set3StateValue((wxCheckBoxState)bTemp); - else - DSPHLE->Set3StateValue(wxCHK_UNDETERMINED); - - // ?? - if (GameIni.Get("Wii", "Widescreen", &bTemp)) - EnableWideScreen->Set3StateValue((wxCheckBoxState)bTemp); - else - EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "UseBBox", &bTemp)) - UseBBox->Set3StateValue((wxCheckBoxState)bTemp); - else - UseBBox->Set3StateValue(wxCHK_UNDETERMINED); - - - if (GameIni.Get("Video", "ZTPSpeedupHack", &bTemp)) - UseZTPSpeedupHack->Set3StateValue((wxCheckBoxState)bTemp); - else - UseZTPSpeedupHack->Set3StateValue(wxCHK_UNDETERMINED); - - GameIni.Get("Video", "ProjectionHack", &bTemp); - PHackEnable->Set3StateValue((wxCheckBoxState)bTemp); - - GameIni.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear); - GameIni.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar); - GameIni.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP); - - GameIni.Get("Video", "PH_ZNear", &PHack_Data.PHZNear); - GameIni.Get("Video", "PH_ZFar", &PHack_Data.PHZFar); - - GameIni.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/); + GameIniDefault.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/); EmuState->SetSelection(iTemp); + if (GameIniLocal.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/)) + EmuState->SetSelection(iTemp); - GameIni.Get("EmuState", "EmulationIssues", &sTemp); + std::string sTemp; + GameIniDefault.Get("EmuState", "EmulationIssues", &sTemp); if (!sTemp.empty()) - { EmuIssues->SetValue(StrToWxStr(sTemp)); - } + if (GameIniLocal.Get("EmuState", "EmulationIssues", &sTemp)) + EmuIssues->SetValue(StrToWxStr(sTemp)); + EmuIssues->Enable(EmuState->GetSelection() != 0); PatchList_Load(); ActionReplayList_Load(); - m_geckocode_panel->LoadCodes(GameIni, OpenISO->GetUniqueID()); + m_geckocode_panel->LoadCodes(GameIniLocal, OpenISO->GetUniqueID()); +} + +void CISOProperties::SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox) +{ + // Delete any existing entries from the local gameini if checkbox is undetermined. + // Otherwise, write the current value to the local gameini if the value differs from the default gameini values. + // Delete any existing entry from the local gameini if the value does not differ from the default gameini value. + bool checkbox_val = (checkbox->Get3StateValue() == wxCHK_CHECKED); + + if (checkbox->Get3StateValue() == wxCHK_UNDETERMINED) + GameIniLocal.DeleteKey(section, key); + else if (!GameIniDefault.Exists(section, key)) + GameIniLocal.Set(section, key, checkbox_val); + else + { + bool default_value; + GameIniDefault.Get(section, key, &default_value); + if (default_value != checkbox_val) + GameIniLocal.Set(section, key, checkbox_val); + else + GameIniLocal.DeleteKey(section, key); + } } bool CISOProperties::SaveGameConfig() { - if (CPUThread->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "CPUThread"); - else - GameIni.Set("Core", "CPUThread", CPUThread->Get3StateValue()); + SaveGameIniValueFrom3StateCheckbox("Core", "CPUThread", CPUThread); + SaveGameIniValueFrom3StateCheckbox("Core", "SkipIdle", SkipIdle); + SaveGameIniValueFrom3StateCheckbox("Core", "MMU", MMU); + SaveGameIniValueFrom3StateCheckbox("Core", "TLBHack", TLBHack); + SaveGameIniValueFrom3StateCheckbox("Core", "DCBZ", DCBZOFF); + SaveGameIniValueFrom3StateCheckbox("Core", "VBeam", VBeam); + SaveGameIniValueFrom3StateCheckbox("Core", "SyncGPU", SyncGPU); + SaveGameIniValueFrom3StateCheckbox("Core", "FastDiscSpeed", FastDiscSpeed); + SaveGameIniValueFrom3StateCheckbox("Core", "BlockMerging", BlockMerging); + SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE); + SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen); + SaveGameIniValueFrom3StateCheckbox("Video", "UseBBox", UseBBox); + SaveGameIniValueFrom3StateCheckbox("Video", "ZTPSpeedupHack", UseZTPSpeedupHack); - if (SkipIdle->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "SkipIdle"); - else - GameIni.Set("Core", "SkipIdle", SkipIdle->Get3StateValue()); + #define SAVE_IF_NOT_DEFAULT(section, key, val, def) do { \ + if (GameIniDefault.Exists((section), (key))) { \ + std::remove_reference::type tmp__; \ + GameIniDefault.Get((section), (key), &tmp__); \ + if ((val) != tmp__) \ + GameIniLocal.Set((section), (key), (val)); \ + else \ + GameIniLocal.DeleteKey((section), (key)); \ + } else if ((val) != (def)) \ + GameIniLocal.Set((section), (key), (val)); \ + else \ + GameIniLocal.DeleteKey((section), (key)); \ + } while (0) - if (MMU->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "MMU"); - else - GameIni.Set("Core", "MMU", MMU->Get3StateValue()); + SAVE_IF_NOT_DEFAULT("Video", "ProjectionHack", PHackEnable->GetValue(), false); + SAVE_IF_NOT_DEFAULT("Video", "PH_SZNear", (PHack_Data.PHackSZNear ? 1 : 0), 0); + SAVE_IF_NOT_DEFAULT("Video", "PH_SZFar", (PHack_Data.PHackSZFar ? 1 : 0), 0); + SAVE_IF_NOT_DEFAULT("Video", "PH_ExtraParam", (PHack_Data.PHackExP ? 1 : 0), 0); + SAVE_IF_NOT_DEFAULT("Video", "PH_ZNear", PHack_Data.PHZNear, ""); + SAVE_IF_NOT_DEFAULT("Video", "PH_ZFar", PHack_Data.PHZFar, ""); + SAVE_IF_NOT_DEFAULT("EmuState", "EmulationStateId", EmuState->GetSelection(), 0); - if (TLBHack->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "TLBHack"); - else - GameIni.Set("Core", "TLBHack", TLBHack->Get3StateValue()); - - if (DCBZOFF->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "DCBZ"); - else - GameIni.Set("Core", "DCBZ", DCBZOFF->Get3StateValue()); - - if (VBeam->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "VBeam"); - else - GameIni.Set("Core", "VBeam", VBeam->Get3StateValue()); - - if (SyncGPU->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "SyncGPU"); - else - GameIni.Set("Core", "SyncGPU", SyncGPU->Get3StateValue()); - - if (FastDiscSpeed->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "FastDiscSpeed"); - else - GameIni.Set("Core", "FastDiscSpeed", FastDiscSpeed->Get3StateValue()); - - if (BlockMerging->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "BlockMerging"); - else - GameIni.Set("Core", "BlockMerging", BlockMerging->Get3StateValue()); - - if (DSPHLE->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "DSPHLE"); - else - GameIni.Set("Core", "DSPHLE", DSPHLE->Get3StateValue()); - - if (EnableWideScreen->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Wii", "Widescreen"); - else - GameIni.Set("Wii", "Widescreen", EnableWideScreen->Get3StateValue()); - - if (UseBBox->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "UseBBox"); - else - GameIni.Set("Video", "UseBBox", UseBBox->Get3StateValue()); - - if (UseZTPSpeedupHack->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "ZTPSpeedupHack"); - else - GameIni.Set("Video", "ZTPSpeedupHack", UseZTPSpeedupHack->Get3StateValue()); - - GameIni.Set("Video", "ProjectionHack", PHackEnable->Get3StateValue()); - - GameIni.Set("Video", "PH_SZNear", PHack_Data.PHackSZNear ? 1 : 0); - GameIni.Set("Video", "PH_SZFar", PHack_Data.PHackSZFar ? 1 : 0); - GameIni.Set("Video", "PH_ExtraParam", PHack_Data.PHackExP ? 1 : 0); - - GameIni.Set("Video", "PH_ZNear", PHack_Data.PHZNear); - GameIni.Set("Video", "PH_ZFar", PHack_Data.PHZFar); - - GameIni.Set("EmuState", "EmulationStateId", EmuState->GetSelection()); - - std::string sTemp; - GameIni.Get("EmuState","EmulationIssues", &sTemp); - if (EmuIssues->GetValue() != sTemp) - bRefreshList = true; - GameIni.Set("EmuState", "EmulationIssues", WxStrToStr(EmuIssues->GetValue())); + std::string emu_issues = EmuIssues->GetValue().ToStdString(); + SAVE_IF_NOT_DEFAULT("EmuState", "EmulationIssues", emu_issues, ""); PatchList_Save(); ActionReplayList_Save(); - Gecko::SaveCodes(GameIni, m_geckocode_panel->GetCodes()); + Gecko::SaveCodes(GameIniLocal, m_geckocode_panel->GetCodes()); - return GameIni.Save(GameIniFile.c_str()); + bool success = GameIniLocal.Save(GameIniFileLocal.c_str()); + + // If the resulting file is empty, delete it. Kind of a hack, but meh. + if (success && File::GetSize(GameIniFileLocal) == 0) + File::Delete(GameIniFileLocal); + + return success; +} + +void CISOProperties::LaunchExternalEditor(const std::string& filename) +{ +#ifdef __APPLE__ + // wxTheMimeTypesManager is not yet implemented for wxCocoa + [[NSWorkspace sharedWorkspace] openFile: + [NSString stringWithUTF8String: filename.c_str()] + withApplication: @"TextEdit"]; +#else + wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("ini")); + if(filetype == NULL) // From extension failed, trying with MIME type now + { + filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain")); + if(filetype == NULL) // MIME type failed, aborting mission + { + PanicAlertT("Filetype 'ini' is unknown! Will not open!"); + return; + } + } + wxString OpenCommand; + OpenCommand = filetype->GetOpenCommand(StrToWxStr(filename)); + if(OpenCommand.IsEmpty()) + PanicAlertT("Couldn't find open command for extension 'ini'!"); + else + if(wxExecute(OpenCommand, wxEXEC_SYNC) == -1) + PanicAlertT("wxExecute returned -1 on application run!"); +#endif + + bRefreshList = true; // Just in case + + // Once we're done with the ini edit, give the focus back to Dolphin + SetFocus(); } void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event)) { - if (File::Exists(GameIniFile)) - { - SaveGameConfig(); + SaveGameConfig(); + LaunchExternalEditor(GameIniFileLocal); + GameIniLocal.Load(GameIniFileLocal); + LoadGameConfig(); +} -#ifdef __APPLE__ - // wxTheMimeTypesManager is not yet implemented for wxCocoa - [[NSWorkspace sharedWorkspace] openFile: - [NSString stringWithUTF8String: GameIniFile.c_str()] - withApplication: @"TextEdit"]; -#else - wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("ini")); - if(filetype == NULL) // From extension failed, trying with MIME type now - { - filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain")); - if(filetype == NULL) // MIME type failed, aborting mission - { - PanicAlertT("Filetype 'ini' is unknown! Will not open!"); - return; - } - } - wxString OpenCommand; - OpenCommand = filetype->GetOpenCommand(StrToWxStr(GameIniFile)); - if(OpenCommand.IsEmpty()) - PanicAlertT("Couldn't find open command for extension 'ini'!"); - else - if(wxExecute(OpenCommand, wxEXEC_SYNC) == -1) - PanicAlertT("wxExecute returned -1 on application run!"); -#endif - - GameIni.Load(GameIniFile.c_str()); - LoadGameConfig(); - - bRefreshList = true; // Just in case - } - - // Once we're done with the ini edit, give the focus back to Dolphin - SetFocus(); +void CISOProperties::OnShowDefaultConfig(wxCommandEvent& WXUNUSED (event)) +{ + LaunchExternalEditor(GameIniFileDefault); } void CISOProperties::ListSelectionChanged(wxCommandEvent& event) @@ -1180,14 +1134,26 @@ void CISOProperties::ListSelectionChanged(wxCommandEvent& event) switch (event.GetId()) { case ID_PATCHES_LIST: - if (Patches->GetSelection() != wxNOT_FOUND) + if (Patches->GetSelection() == wxNOT_FOUND + || DefaultPatches.find(Patches->GetString(Patches->GetSelection()).ToStdString()) != DefaultPatches.end()) + { + EditPatch->Disable(); + RemovePatch->Disable(); + } + else { EditPatch->Enable(); RemovePatch->Enable(); } break; case ID_CHEATS_LIST: - if (Cheats->GetSelection() != wxNOT_FOUND) + if (Cheats->GetSelection() == wxNOT_FOUND + || DefaultCheats.find(Cheats->GetString(Cheats->GetSelection()).ToStdString()) != DefaultCheats.end()) + { + EditCheat->Disable(); + RemoveCheat->Disable(); + } + else { EditCheat->Enable(); RemoveCheat->Enable(); @@ -1200,14 +1166,17 @@ void CISOProperties::PatchList_Load() { onFrame.clear(); Patches->Clear(); - PatchEngine::LoadPatchSection("OnFrame", onFrame, GameIni); + + PatchEngine::LoadPatchSection("OnFrame", onFrame, GameIniDefault, GameIniLocal); u32 index = 0; - for (std::vector::const_iterator it = onFrame.begin(); it != onFrame.end(); ++it) + for (auto it = onFrame.begin(); it != onFrame.end(); ++it) { PatchEngine::Patch p = *it; Patches->Append(StrToWxStr(p.name)); Patches->Check(index, p.active); + if (!p.user_defined) + DefaultPatches.insert(p.name); ++index; } } @@ -1215,20 +1184,27 @@ void CISOProperties::PatchList_Load() void CISOProperties::PatchList_Save() { std::vector lines; + std::vector enabledLines; u32 index = 0; - for (std::vector::const_iterator onFrame_it = onFrame.begin(); onFrame_it != onFrame.end(); ++onFrame_it) + for (auto onFrame_it = onFrame.begin(); onFrame_it != onFrame.end(); ++onFrame_it) { - lines.push_back(Patches->IsChecked(index) ? "+$" + onFrame_it->name : "$" + onFrame_it->name); + if (Patches->IsChecked(index)) + enabledLines.push_back("$" + onFrame_it->name); - for (std::vector::const_iterator iter2 = onFrame_it->entries.begin(); iter2 != onFrame_it->entries.end(); ++iter2) + // Do not save default patches. + if (DefaultPatches.find(onFrame_it->name) == DefaultPatches.end()) { - std::string temp = StringFromFormat("0x%08X:%s:0x%08X", iter2->address, PatchEngine::PatchTypeStrings[iter2->type], iter2->value); - lines.push_back(temp); + lines.push_back("$" + onFrame_it->name); + for (auto iter2 = onFrame_it->entries.begin(); iter2 != onFrame_it->entries.end(); ++iter2) + { + std::string temp = StringFromFormat("0x%08X:%s:0x%08X", iter2->address, PatchEngine::PatchTypeStrings[iter2->type], iter2->value); + lines.push_back(temp); + } } ++index; } - GameIni.SetLines("OnFrame", lines); - lines.clear(); + GameIniLocal.SetLines("OnFrame_Enabled", enabledLines); + GameIniLocal.SetLines("OnFrame", lines); } void CISOProperties::PHackButtonClicked(wxCommandEvent& event) @@ -1282,7 +1258,7 @@ void CISOProperties::ActionReplayList_Load() { arCodes.clear(); Cheats->Clear(); - ActionReplay::LoadCodes(arCodes, GameIni); + ActionReplay::LoadCodes(arCodes, GameIniDefault, GameIniLocal); u32 index = 0; for (std::vector::const_iterator it = arCodes.begin(); it != arCodes.end(); ++it) @@ -1290,6 +1266,8 @@ void CISOProperties::ActionReplayList_Load() ActionReplay::ARCode arCode = *it; Cheats->Append(StrToWxStr(arCode.name)); Cheats->Check(index, arCode.active); + if (!arCode.user_defined) + DefaultCheats.insert(arCode.name); ++index; } } @@ -1297,20 +1275,28 @@ void CISOProperties::ActionReplayList_Load() void CISOProperties::ActionReplayList_Save() { std::vector lines; + std::vector enabledLines; u32 index = 0; - for (std::vector::const_iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter) + for (auto iter = arCodes.begin(); iter != arCodes.end(); ++iter) { ActionReplay::ARCode code = *iter; - lines.push_back(Cheats->IsChecked(index) ? "+$" + code.name : "$" + code.name); + if (Cheats->IsChecked(index)) + enabledLines.push_back("$" + code.name); - for (std::vector::const_iterator iter2 = code.ops.begin(); iter2 != code.ops.end(); ++iter2) + // Do not save default cheats. + if (DefaultCheats.find(code.name) == DefaultCheats.end()) { - lines.push_back(WxStrToStr(wxString::Format(wxT("%08X %08X"), iter2->cmd_addr, iter2->value))); + lines.push_back("$" + code.name); + for (auto iter2 = code.ops.begin(); iter2 != code.ops.end(); ++iter2) + { + lines.push_back(WxStrToStr(wxString::Format(wxT("%08X %08X"), iter2->cmd_addr, iter2->value))); + } } ++index; } - GameIni.SetLines("ActionReplay", lines); + GameIniLocal.SetLines("ActionReplay_Enabled", enabledLines); + GameIniLocal.SetLines("ActionReplay", lines); } void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 019992a9f3..f58c51dbee 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -129,6 +129,7 @@ private: ID_ENABLEPROGRESSIVESCAN, ID_ENABLEWIDESCREEN, ID_EDITCONFIG, + ID_SHOWDEFAULTCONFIG, ID_EMUSTATE, ID_EMU_ISSUES, ID_PATCHES_LIST, @@ -163,10 +164,13 @@ private: IDM_BNRSAVEAS }; + void LaunchExternalEditor(const std::string& filename); + void CreateGUIControls(bool); void OnClose(wxCloseEvent& event); void OnCloseClick(wxCommandEvent& event); void OnEditConfig(wxCommandEvent& event); + void OnShowDefaultConfig(wxCommandEvent& event); void ListSelectionChanged(wxCommandEvent& event); void PatchButtonClicked(wxCommandEvent& event); void ActionReplayButtonClicked(wxCommandEvent& event); @@ -193,13 +197,22 @@ private: void ExportDir(const char* _rFullPath, const char* _rExportFilename, const int partitionNum = 0); - IniFile GameIni; - std::string GameIniFile; + IniFile GameIniDefault; + IniFile GameIniLocal; + std::string GameIniFileDefault; + std::string GameIniFileLocal; + + std::set DefaultPatches; + std::set DefaultCheats; void LoadGameConfig(); void PatchList_Load(); void PatchList_Save(); void ActionReplayList_Save(); void ChangeBannerDetails(int lang); + + long GetElementStyle(const char* section, const char* key); + void SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox); + void SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox); }; #endif diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 998f2bd1ed..858ce1f588 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -253,15 +253,12 @@ bool DolphinApp::OnInit() File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, File::GetUserPath(D_WIIUSER_IDX)); - // TODO: replace these with overlays - File::CopyDir(std::string(File::GetSysDirectory() + GAMECONFIG_DIR DIR_SEP), - File::GetUserPath(D_GAMECONFIG_IDX)); - File::CreateFullPath(File::GetUserPath(D_USER_IDX)); File::CreateFullPath(File::GetUserPath(D_CACHE_IDX)); File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX)); File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX)); File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX)); + File::CreateFullPath(File::GetUserPath(D_GAMESETTINGS_IDX)); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX)); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP); File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP); diff --git a/Source/Core/DolphinWX/Src/PHackSettings.cpp b/Source/Core/DolphinWX/Src/PHackSettings.cpp index 9fb93d3d73..3db44891e6 100644 --- a/Source/Core/DolphinWX/Src/PHackSettings.cpp +++ b/Source/Core/DolphinWX/Src/PHackSettings.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "CommonPaths.h" #include "PHackSettings.h" #include "ConfigManager.h" #include "WxUtils.h" @@ -18,10 +19,9 @@ CPHackSettings::CPHackSettings(wxWindow* parent, wxWindowID id, const wxString& { CreateGUIControls(); std::string _iniFilename; - _iniFilename = File::GetUserPath(D_GAMECONFIG_IDX) + "PH_PRESETS.ini"; + _iniFilename = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP "PH_PRESETS.ini"; PHPresetsIni.Load(_iniFilename.c_str()); - //PHPresetsIni.SortSections(); - //PHPresetsIni.Save(_iniFilename.c_str()); + PHPresetsIni.SortSections(); LoadPHackData(); } diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index 96fc6205db..9382138c43 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "InputConfig.h" +#include "CommonPaths.h" #include "../../Core/Src/ConfigManager.h" #include "../../Core/Src/HW/Wiimote.h" @@ -37,7 +38,8 @@ bool InputPlugin::LoadConfig(bool isGC) type = "Wiimote"; path = "Profiles/Wiimote/"; } - game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); + game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); + game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", true); for (int i = 0; i < 4; i++) { if (game_ini.Exists("Controls", (type + "Profile" + num[i]).c_str())) @@ -46,7 +48,10 @@ bool InputPlugin::LoadConfig(bool isGC) if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini")) useProfile[i] = true; else + { + // TODO: Having a PanicAlert for this is dumb. PanicAlertT("Selected controller profile does not exist"); + } } } } @@ -94,6 +99,6 @@ void InputPlugin::SaveConfig() e = controllers.end(); for ( ; i!=e; ++i ) (*i)->SaveConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); - + inifile.Save(ini_filename); } diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 9220ec9661..e81807985a 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -120,13 +120,13 @@ void VideoConfig::Load(const char *ini_file) OSD::AddMessage("Warning: Shader Debugging is enabled, performance will suffer heavily", 15000); } -void VideoConfig::GameIniLoad(const char *ini_file) +void VideoConfig::GameIniLoad(const char* default_ini_file, const char* local_ini_file) { bool gfx_override_exists = false; // XXX: Again, bad place to put OSD messages at (see delroth's comment above) // XXX: This will add an OSD message for each projection hack value... meh -#define CHECK_SETTING(section, key, var) { \ +#define CHECK_SETTING(section, key, var) do { \ decltype(var) temp = var; \ if (iniFile.GetIfExists(section, key, &var) && var != temp) { \ char buf[256]; \ @@ -134,10 +134,11 @@ void VideoConfig::GameIniLoad(const char *ini_file) OSD::AddMessage(buf, 7500); \ gfx_override_exists = true; \ } \ - } + } while (0) IniFile iniFile; - iniFile.Load(ini_file); + iniFile.Load(default_ini_file); + iniFile.Load(local_ini_file, true); CHECK_SETTING("Video_Hardware", "VSync", bVSync); @@ -279,7 +280,7 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Hacks", "EFBAccessEnable", bEFBAccessEnable); iniFile.Set("Hacks", "DlistCachingEnable", bDlistCachingEnable); iniFile.Set("Hacks", "EFBCopyEnable", bEFBCopyEnable); - iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture); + iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture); iniFile.Set("Hacks", "EFBScaledCopy", bCopyEFBScaled); iniFile.Set("Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable); iniFile.Set("Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges); @@ -290,60 +291,6 @@ void VideoConfig::Save(const char *ini_file) iniFile.Save(ini_file); } -void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini) -{ - // wxWidgets doesn't provide us with a nice way to change 3-state checkboxes into 2-state ones - // This would allow us to make the "default config" dialog layout to be 2-state based, but the - // "game config" layout to be 3-state based (with the 3rd state being "use default") - // Since we can't do that, we instead just save anything which differs from the default config - // TODO: Make this less ugly - - VideoConfig defCfg; - defCfg.Load(default_ini); - - IniFile iniFile; - iniFile.Load(game_ini); - - #define SET_IF_DIFFERS(section, key, member) { if ((member) != (defCfg.member)) iniFile.Set((section), (key), (member)); else iniFile.DeleteKey((section), (key)); } - - SET_IF_DIFFERS("Video_Hardware", "VSync", bVSync); - - SET_IF_DIFFERS("Video_Settings", "wideScreenHack", bWidescreenHack); - SET_IF_DIFFERS("Video_Settings", "AspectRatio", iAspectRatio); - SET_IF_DIFFERS("Video_Settings", "Crop", bCrop); - SET_IF_DIFFERS("Video_Settings", "UseXFB", bUseXFB); - SET_IF_DIFFERS("Video_Settings", "UseRealXFB", bUseRealXFB); - SET_IF_DIFFERS("Video_Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples); - SET_IF_DIFFERS("Video_Settings", "DLOptimize", iCompileDLsLevel); - SET_IF_DIFFERS("Video_Settings", "HiresTextures", bHiresTextures); - SET_IF_DIFFERS("Video_Settings", "AnaglyphStereo", bAnaglyphStereo); - SET_IF_DIFFERS("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation); - SET_IF_DIFFERS("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle); - SET_IF_DIFFERS("Video_Settings", "EnablePixelLighting", bEnablePixelLighting); - SET_IF_DIFFERS("Video_Settings", "FastDepthCalc", bFastDepthCalc); - SET_IF_DIFFERS("Video_Settings", "MSAA", iMultisampleMode); - SET_IF_DIFFERS("Video_Settings", "EFBScale", iEFBScale); // integral - SET_IF_DIFFERS("Video_Settings", "DstAlphaPass", bDstAlphaPass); - SET_IF_DIFFERS("Video_Settings", "DisableFog", bDisableFog); - SET_IF_DIFFERS("Video_Settings", "EnableOpenCL", bEnableOpenCL); - SET_IF_DIFFERS("Video_Settings", "OMPDecoder", bOMPDecoder); - - SET_IF_DIFFERS("Video_Enhancements", "ForceFiltering", bForceFiltering); - SET_IF_DIFFERS("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy); // NOTE - this is x in (1 << x) - SET_IF_DIFFERS("Video_Enhancements", "PostProcessingShader", sPostProcessingShader); - SET_IF_DIFFERS("Video_Enhancements", "Enable3dVision", b3DVision); - - SET_IF_DIFFERS("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable); - SET_IF_DIFFERS("Video_Hacks", "DlistCachingEnable", bDlistCachingEnable); - SET_IF_DIFFERS("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable); - SET_IF_DIFFERS("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture); - SET_IF_DIFFERS("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled); - SET_IF_DIFFERS("Video_Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable); - SET_IF_DIFFERS("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges); - - iniFile.Save(game_ini); -} - bool VideoConfig::IsVSync() { return Core::isTabPressed ? false : bVSync; diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 4a773d30e7..cfb4a1ccde 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -50,7 +50,7 @@ struct VideoConfig { VideoConfig(); void Load(const char *ini_file); - void GameIniLoad(const char *ini_file); + void GameIniLoad(const char* default_ini, const char* game_ini); void VerifyValidity(); void Save(const char *ini_file); void GameIniSave(const char* default_ini, const char* game_ini); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index 10369a1329..328cb5fa31 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -154,8 +154,10 @@ bool VideoBackend::Initialize(void *&window_handle) frameCount = 0; + const SCoreStartupParameter& core_params = SConfig::GetInstance().m_LocalCoreStartupParameter; + g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini").c_str()); - g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str()); + g_Config.GameIniLoad(core_params.m_strGameIniDefault.c_str(), core_params.m_strGameIniLocal.c_str()); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); UpdateActiveConfig(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index f3ca31ba82..08c76f4a49 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -150,7 +150,8 @@ bool VideoBackend::Initialize(void *&window_handle) frameCount = 0; g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx9.ini").c_str()); - g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str()); + g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniDefault.c_str(), + SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal.c_str()); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); // as only some driver/hardware configurations support dual source blending only enable it if is diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 9e38b80fed..60f2748eeb 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -172,7 +172,8 @@ bool VideoBackend::Initialize(void *&window_handle) frameCount = 0; g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini").c_str()); - g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str()); + g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniDefault.c_str(), + SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal.c_str()); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); UpdateActiveConfig(); From 4ef5624f1fd46f3d4dd59b98f9c6c485f0dfd566 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 13 Sep 2013 20:26:48 +0200 Subject: [PATCH 176/267] Change the name of INI options for memcard paths and NAND path to make migrating User directory from non-global to global easier --- Source/Core/Core/Src/ConfigManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index a84b235b04..a4298949f0 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -167,7 +167,7 @@ void SConfig::SaveSettings() } ini.Set("General", "RecursiveGCMPaths", m_RecursiveISOFolder); - ini.Set("General", "NANDRoot", m_NANDPath); + ini.Set("General", "NANDRootPath", m_NANDPath); ini.Set("General", "WirelessMac", m_WirelessMac); #ifdef USE_GDBSTUB ini.Set("General", "GDBPort", m_LocalCoreStartupParameter.iGDBPort); @@ -244,8 +244,8 @@ void SConfig::SaveSettings() ini.Set("Core", "SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage); ini.Set("Core", "DPL2Decoder", m_LocalCoreStartupParameter.bDPL2Decoder); ini.Set("Core", "Latency", m_LocalCoreStartupParameter.iLatency); - ini.Set("Core", "MemcardA", m_strMemoryCardA); - ini.Set("Core", "MemcardB", m_strMemoryCardB); + ini.Set("Core", "MemcardAPath", m_strMemoryCardA); + ini.Set("Core", "MemcardBPath", m_strMemoryCardB); ini.Set("Core", "SlotA", m_EXIDevice[0]); ini.Set("Core", "SlotB", m_EXIDevice[1]); ini.Set("Core", "SerialPort1", m_EXIDevice[2]); @@ -318,7 +318,7 @@ void SConfig::LoadSettings() ini.Get("General", "RecursiveGCMPaths", &m_RecursiveISOFolder, false); - ini.Get("General", "NANDRoot", &m_NANDPath); + ini.Get("General", "NANDRootPath", &m_NANDPath); m_NANDPath = File::GetUserPath(D_WIIROOT_IDX, m_NANDPath); DiscIO::cUIDsys::AccessInstance().UpdateLocation(); DiscIO::CSharedContent::AccessInstance().UpdateLocation(); @@ -403,8 +403,8 @@ void SConfig::LoadSettings() ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); ini.Get("Core", "DPL2Decoder", &m_LocalCoreStartupParameter.bDPL2Decoder, false); ini.Get("Core", "Latency", &m_LocalCoreStartupParameter.iLatency, 2); - ini.Get("Core", "MemcardA", &m_strMemoryCardA); - ini.Get("Core", "MemcardB", &m_strMemoryCardB); + ini.Get("Core", "MemcardAPath", &m_strMemoryCardA); + ini.Get("Core", "MemcardBPath", &m_strMemoryCardB); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1], EXIDEVICE_NONE); ini.Get("Core", "SerialPort1", (int*)&m_EXIDevice[2], EXIDEVICE_NONE); From 5d202ae9ea47383c835bf7641ba4a7bb339a0e94 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sat, 14 Sep 2013 15:07:53 -0700 Subject: [PATCH 177/267] proper fix for issue 6206 --- Source/Core/DiscIO/Src/BannerLoaderGC.cpp | 1 + Source/Core/DolphinWX/Src/GameListCtrl.cpp | 43 +++++------ Source/Core/DolphinWX/Src/ISOFile.cpp | 3 +- Source/Core/DolphinWX/Src/ISOProperties.cpp | 80 +++++++++++++-------- 4 files changed, 72 insertions(+), 55 deletions(-) diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp index 3585835443..58b79d12db 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp @@ -145,6 +145,7 @@ std::vector CBannerLoaderGC::GetDescriptions() desc_count = 1; break; + // English, German, French, Spanish, Italian, Dutch case CBannerLoaderGC::BANNER_BNR2: desc_count = 6; break; diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index a0186fa7e0..49a38b6ea8 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -62,24 +62,25 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is int indexOne = 0; int indexOther = 0; - switch (iso1->GetCountry()) + + // index only matters for WADS and PAL GC games, but invalid indicies for the others + // will return the (only) language in the list + if (iso1->GetPlatform() == GameListItem::WII_WAD) { - case DiscIO::IVolume::COUNTRY_JAPAN: - case DiscIO::IVolume::COUNTRY_USA: - indexOne = 0; - break; - default: - indexOne = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; + indexOne = SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG"); + } + else + { // GC + indexOne = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; } - switch (iso2->GetCountry()) + if (iso2->GetPlatform() == GameListItem::WII_WAD) { - case DiscIO::IVolume::COUNTRY_JAPAN: - case DiscIO::IVolume::COUNTRY_USA: - indexOther = 0; - break; - default: - indexOther = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; + indexOther = SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG"); + } + else + { // GC + indexOther = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; } switch(sortData) @@ -410,19 +411,9 @@ void CGameListCtrl::InsertItemInReportView(long _Index) int SelectedLanguage = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; // Is this sane? - switch (rISOFile.GetCountry()) + if (rISOFile.GetPlatform() == GameListItem::WII_WAD) { - case DiscIO::IVolume::COUNTRY_TAIWAN: - case DiscIO::IVolume::COUNTRY_JAPAN: - SelectedLanguage = -1; - break; - - case DiscIO::IVolume::COUNTRY_USA: - SelectedLanguage = 0; - break; - - default: - break; + SelectedLanguage = SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG"); } std::string const name = rISOFile.GetName(SelectedLanguage); diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index 8f2ce68a0d..c38f6f5110 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -78,7 +78,8 @@ GameListItem::GameListItem(const std::string& _rFileName) { if (pBannerLoader->IsValid()) { - m_names = pBannerLoader->GetNames(); + if (m_Platform != WII_WAD) + m_names = pBannerLoader->GetNames(); m_company = pBannerLoader->GetCompany(); m_descriptions = pBannerLoader->GetDescriptions(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index a158c37278..1928e60ce6 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -75,7 +75,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW { // Load ISO data OpenISO = DiscIO::CreateVolumeFromFilename(fileName); - if (DiscIO::IsVolumeWiiDisc(OpenISO)) + bool IsWad = DiscIO::IsVolumeWadFile(OpenISO); + bool IsWiiDisc = DiscIO::IsVolumeWiiDisc(OpenISO); + if (IsWiiDisc) { for (u32 i = 0; i < 0xFFFFFFFF; i++) // yes, technically there can be OVER NINE THOUSAND partitions... { @@ -97,7 +99,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW else { // TODO : Should we add a way to browse the wad file ? - if (!DiscIO::IsVolumeWadFile(OpenISO)) + if (!IsWad) { GCFiles.clear(); pFileSystem = DiscIO::CreateFileSystem(OpenISO); @@ -132,7 +134,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW bRefreshList = false; - CreateGUIControls(DiscIO::IsVolumeWadFile(OpenISO)); + CreateGUIControls(IsWad); LoadGameConfig(); @@ -156,21 +158,33 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW break; case DiscIO::IVolume::COUNTRY_USA: m_Country->SetValue(_("USA")); - m_Lang->SetSelection(0); - m_Lang->Disable(); // For NTSC Games, there's no multi lang + if (!IsWad) // For (non wad) NTSC Games, there's no multi lang + { + m_Lang->SetSelection(0); + m_Lang->Disable(); + } + break; case DiscIO::IVolume::COUNTRY_JAPAN: m_Country->SetValue(_("JAPAN")); - m_Lang->SetSelection(-1); - m_Lang->Disable(); // For NTSC Games, there's no multi lang + if (!IsWad) // For (non wad) NTSC Games, there's no multi lang + { + m_Lang->Insert(_("Japanese"), 0); + m_Lang->SetSelection(0); + m_Lang->Disable(); + } break; case DiscIO::IVolume::COUNTRY_KOREA: m_Country->SetValue(_("KOREA")); break; case DiscIO::IVolume::COUNTRY_TAIWAN: m_Country->SetValue(_("TAIWAN")); - m_Lang->SetSelection(-1); - m_Lang->Disable(); // For NTSC Games, there's no multi lang + if (!IsWad) // For (non wad) NTSC Games, there's no multi lang + { + m_Lang->Insert(_("TAIWAN"), 0); + m_Lang->SetSelection(0); + m_Lang->Disable(); + } break; case DiscIO::IVolume::COUNTRY_SDK: m_Country->SetValue(_("No Country (SDK)")); @@ -179,6 +193,13 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW m_Country->SetValue(_("UNKNOWN")); break; } + + if (IsWiiDisc) // Only one language with wii banners + { + m_Lang->SetSelection(0); + m_Lang->Disable(); + } + wxString temp = _T("0x") + StrToWxStr(OpenISO->GetMakerID()); m_MakerID->SetValue(temp); m_Revision->SetValue(wxString::Format(wxT("%u"), OpenISO->GetRevision())); @@ -186,7 +207,15 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW m_FST->SetValue(wxString::Format(wxT("%u"), OpenISO->GetFSTSize())); // Here we set all the info to be shown (be it SJIS or Ascii) + we set the window title - ChangeBannerDetails((int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); + if (!IsWad) + { + ChangeBannerDetails((int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); + } + else + { + ChangeBannerDetails(SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG")); + } + m_Banner->SetBitmap(OpenGameListItem->GetImage()); m_Banner->Bind(wxEVT_RIGHT_DOWN, &CISOProperties::RightClickOnBanner, this); @@ -480,8 +509,19 @@ void CISOProperties::CreateGUIControls(bool IsWad) arrayStringFor_Lang.Add(_("Spanish")); arrayStringFor_Lang.Add(_("Italian")); arrayStringFor_Lang.Add(_("Dutch")); + int language = (int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; + if (IsWad) + { + arrayStringFor_Lang.Insert(_("Japanese"), 0); + arrayStringFor_Lang.Add(_("Simplified Chinese")); + arrayStringFor_Lang.Add(_("Traditional Chinese")); + arrayStringFor_Lang.Add(_("Korean")); + + language = SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG"); + } m_Lang = new wxChoice(m_Information, ID_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_Lang); - m_Lang->SetSelection((int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); + m_Lang->SetSelection(language); + wxStaticText * const m_ShortText = new wxStaticText(m_Information, wxID_ANY, _("Short Name:")); m_ShortName = new wxTextCtrl(m_Information, ID_SHORTNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); wxStaticText * const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:")); @@ -1342,23 +1382,7 @@ void CISOProperties::OnChangeBannerLang(wxCommandEvent& event) void CISOProperties::ChangeBannerDetails(int lang) { - // why? - switch (OpenGameListItem->GetCountry()) - { - case DiscIO::IVolume::COUNTRY_TAIWAN: - case DiscIO::IVolume::COUNTRY_JAPAN: - lang = -1; - break; - - case DiscIO::IVolume::COUNTRY_USA: - lang = 0; - break; - - default: - break; - } - - wxString const shortName = StrToWxStr(OpenGameListItem->GetBannerName(lang)); + wxString const shortName = StrToWxStr(OpenGameListItem->GetName(lang)); wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(lang)); wxString const maker = StrToWxStr(OpenGameListItem->GetCompany()); From 6dc16a59f8d3235673aca62c519837351970cd82 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 15 Sep 2013 11:13:06 +1200 Subject: [PATCH 178/267] Made defaults "explicitly defaulted" for PolarSSL Fixes issue 6601 --- Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj b/Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj index c68c308492..25e09cc48b 100644 --- a/Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj +++ b/Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj @@ -87,28 +87,36 @@ true $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; + $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; + $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ From 550c855ae6ccf48b85cac6c5032d24cac8e5deac Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 14 Sep 2013 20:27:54 -0400 Subject: [PATCH 179/267] Create blank ini file before editing it, if it doesn't already exists. This prevents the editor from prompting to create it. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index a158c37278..f3f675779e 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1077,8 +1077,8 @@ bool CISOProperties::SaveGameConfig() bool success = GameIniLocal.Save(GameIniFileLocal.c_str()); // If the resulting file is empty, delete it. Kind of a hack, but meh. - if (success && File::GetSize(GameIniFileLocal) == 0) - File::Delete(GameIniFileLocal); + //if (success && File::GetSize(GameIniFileLocal) == 0) + // File::Delete(GameIniFileLocal); return success; } @@ -1119,6 +1119,12 @@ void CISOProperties::LaunchExternalEditor(const std::string& filename) void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event)) { SaveGameConfig(); + // Create blank file to prevent editor from prompting to create it. + if (!File::Exists(GameIniFileLocal)) + { + std::fstream blankFile(GameIniFileLocal); + blankFile.close(); + } LaunchExternalEditor(GameIniFileLocal); GameIniLocal.Load(GameIniFileLocal); LoadGameConfig(); From b4c082f1b30fd676a1074032a1a3d3cc65a24af6 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 14 Sep 2013 22:58:32 -0400 Subject: [PATCH 180/267] No, i don't check what i committed before pushing to master, one week before a release. Fixes a mistake from 550c855ae6cc. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index f3f675779e..381b2dd90c 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1077,8 +1077,8 @@ bool CISOProperties::SaveGameConfig() bool success = GameIniLocal.Save(GameIniFileLocal.c_str()); // If the resulting file is empty, delete it. Kind of a hack, but meh. - //if (success && File::GetSize(GameIniFileLocal) == 0) - // File::Delete(GameIniFileLocal); + if (success && File::GetSize(GameIniFileLocal) == 0) + File::Delete(GameIniFileLocal); return success; } @@ -1122,7 +1122,7 @@ void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event)) // Create blank file to prevent editor from prompting to create it. if (!File::Exists(GameIniFileLocal)) { - std::fstream blankFile(GameIniFileLocal); + std::fstream blankFile(GameIniFileLocal, std::ios::out); blankFile.close(); } LaunchExternalEditor(GameIniFileLocal); From 5a0f0b908eaa152b16a16779a7b7771b0debc11c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 15 Sep 2013 14:34:30 -0400 Subject: [PATCH 181/267] [Android] Fix the name of the parameters in some unused interface methods. There are some interface methods that are simply stubbed for the time being. It would be better to give the parameters better names despite not being used. --- .../src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java | 4 ++-- .../src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java index 4551e5b94c..c508b1f810 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java @@ -51,12 +51,12 @@ public final class NativeGLSurfaceView extends SurfaceView } } - public void surfaceChanged(SurfaceHolder arg0, int arg1, int arg2, int arg3) + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { // TODO Auto-generated method stub } - public void surfaceDestroyed(SurfaceHolder arg0) + public void surfaceDestroyed(SurfaceHolder holder) { // TODO Auto-generated method stub } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java index ce57b0d0ff..486110f6c9 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java @@ -76,7 +76,7 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen actionBar.addTab(actionBar.newTab().setText(R.string.video_settings).setTabListener(this)); } - public void onTabReselected(Tab arg0, FragmentTransaction arg1) + public void onTabReselected(Tab tab, FragmentTransaction ft) { // Do nothing. } From 449cd3b267475718251bef9b94e80cce1354ce4e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 15 Sep 2013 22:11:17 -0400 Subject: [PATCH 182/267] [Android] No need to use startActivityForResult in DolphinEmulator.java any more. Just some leftover stuff from the big refactor. --- .../src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 07bfaf8a63..13a6adbe4e 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -58,8 +58,8 @@ public final class DolphinEmulator extends Activity super.onCreate(savedInstanceState); if (savedInstanceState == null) { - Intent ListIntent = new Intent(this, GameListActivity.class); - startActivityForResult(ListIntent, 1); + Intent GameListIntent = new Intent(this, GameListActivity.class); + startActivity(GameListIntent, savedInstanceState); String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; String ConfigDir = BaseDir + File.separator + "Config"; From 2c350a5e6b7eb08b06ec3ee93f605333d7bad696 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 16 Sep 2013 05:28:14 +0200 Subject: [PATCH 183/267] Fix INIFile ignoring the last line of files --- Source/Core/Common/Src/IniFile.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp index 1c45a8095e..f7d97cd607 100644 --- a/Source/Core/Common/Src/IniFile.cpp +++ b/Source/Core/Common/Src/IniFile.cpp @@ -351,8 +351,6 @@ bool IniFile::Load(const char* filename, bool keep_current_data) } #endif - if (in.eof()) break; - if (line.size() > 0) { if (line[0] == '[') From 037199c326a031df77c3684f1d6b496592baf5b5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 16 Sep 2013 05:46:07 +0200 Subject: [PATCH 184/267] Look for portable.txt in the exe directory and activate portable mode if it exists --- Source/Core/Common/Src/FileUtil.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 64f24d6420..982f7e79de 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -681,15 +681,17 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new if (paths[D_USER_IDX].empty()) { #ifdef _WIN32 - // Detect where the User directory is. There are four different cases (on top of the + // Detect where the User directory is. There are five different cases (on top of the // command line flag, which overrides all this): - // 1. HKCU\Software\Dolphin Emulator\LocalUserConfig exists and is true + // 1. GetExeDirectory()\portable.txt exists // -> Use GetExeDirectory()\User - // 2. HKCU\Software\Dolphin Emulator\UserConfigPath exists + // 2. HKCU\Software\Dolphin Emulator\LocalUserConfig exists and is true + // -> Use GetExeDirectory()\User + // 3. HKCU\Software\Dolphin Emulator\UserConfigPath exists // -> Use this as the user directory path - // 3. My Documents exists + // 4. My Documents exists // -> Use My Documents\Dolphin Emulator as the User directory path - // 4. Default + // 5. Default // -> Use GetExeDirectory()\User // Check our registry keys @@ -708,17 +710,19 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new RegCloseKey(hkey); } + local = local || File::Exists(GetExeDirectory() + DIR_SEP "portable.txt"); + // Get Program Files path in case we need it. TCHAR my_documents[MAX_PATH]; bool my_documents_found = SUCCEEDED(SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, my_documents)); - if (local) // Case 1 + if (local) // Case 1-2 paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; - else if (configPath[0]) // Case 2 + else if (configPath[0]) // Case 3 paths[D_USER_IDX] = TStrToUTF8(configPath); - else if (my_documents_found) // Case 3 + else if (my_documents_found) // Case 4 paths[D_USER_IDX] = TStrToUTF8(my_documents) + DIR_SEP "Dolphin Emulator" DIR_SEP; - else // Case 4 + else // Case 5 paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; // Prettify the path: it will be displayed in some places, we don't want a mix of \ and /. From f0fc611f1582bb64f850400e9766e31e523e9fba Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 16 Sep 2013 06:56:49 +0200 Subject: [PATCH 185/267] Add a hacky check for text file size in ReadFileToString. Fixes issue 6455. --- Source/Core/Common/Src/FileUtil.cpp | 28 +++++++++++++++++++++++++++- Source/Core/Common/Src/FileUtil.h | 8 ++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 982f7e79de..7663e11078 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -885,8 +885,34 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str) if (!f) return false; + size_t read_size; str.resize(GetSize(f)); - return file.ReadArray(&str[0], str.size()); + bool retval = file.ReadArray(&str[0], str.size(), &read_size); + + // On Windows, reading a text file automatically translates \r\n to \n. + // This means we will read less characters than the expected size of the + // file. In that case, ignore the return value and count ourselves. +#ifdef _WIN32 + if (text_file) + { + size_t count = 0; + for (size_t i = 0; i < read_size; ++i) + { + if (str[i] == '\n') + count += 2; + else + count += 1; + } + + if (count != str.size()) + return false; + + str.resize(read_size); + return true; + } +#endif + + return retval; } IOFile::IOFile() diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h index 6d0a440f69..e3263ba233 100644 --- a/Source/Core/Common/Src/FileUtil.h +++ b/Source/Core/Common/Src/FileUtil.h @@ -161,11 +161,15 @@ public: bool Close(); template - bool ReadArray(T* data, size_t length) + bool ReadArray(T* data, size_t length, size_t* pReadBytes = NULL) { - if (!IsOpen() || length != std::fread(data, sizeof(T), length, m_file)) + size_t read_bytes = 0; + if (!IsOpen() || length != (read_bytes = std::fread(data, sizeof(T), length, m_file))) m_good = false; + if (pReadBytes) + *pReadBytes = read_bytes; + return m_good; } From beb41a8f56a9efb9a2540c71192fbddb790b7cb8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 07:47:49 +0000 Subject: [PATCH 186/267] [ARM] Add NEON VORR and fix encoding on NEON VEOR. Remove VMRS_APSR because it is the same as VMRS(PC) --- Source/Core/Common/Src/ArmEmitter.cpp | 16 +++++++++++++--- Source/Core/Common/Src/ArmEmitter.h | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index a5a45545de..17e7bc3ab6 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -1069,9 +1069,6 @@ void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, s16 offset) } } -void ARMXEmitter::VMRS_APSR() { - Write32(condition | 0xEF10A10 | (15 << 12)); -} void ARMXEmitter::VMRS(ARMReg Rt) { Write32(condition | (0xEF << 20) | (1 << 16) | (Rt << 12) | 0xA10); } @@ -1339,12 +1336,25 @@ void NEONXEmitter::VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm) { bool register_quad = Vd >= Q0; Vd = SubBase(Vd); + Vn = SubBase(Vn); Vm = SubBase(Vm); Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) | ((Vd & 0xF) << 12) | (1 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) | ((Vm & 0x10) << 1) | (1 << 4) | (Vm & 0xF)); } +void NEONXEmitter::VORR(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + bool register_quad = Vd >= Q0; + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF2 << 24) | (0x1 << 21) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) + | ((Vd & 0xF) << 12) | (1 << 8) | ((Vn & 0x10) << 3) + | (register_quad << 6) | ((Vm & 0x10) << 1) | (1 << 4) | (Vm & 0xF)); +} + } diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h index 3e70c3c04c..09287ae0fe 100644 --- a/Source/Core/Common/Src/ArmEmitter.h +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -561,7 +561,6 @@ public: void VMOV(ARMReg Dest, ARMReg Src); void VCVT(ARMReg Dest, ARMReg Src, int flags); - void VMRS_APSR(); void VMRS(ARMReg Rt); void VMSR(ARMReg Rt); @@ -636,6 +635,7 @@ public: void VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm); void VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VORR(ARMReg Vd, ARMReg Vn, ARMReg Vm); void VLD1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); void VLD2(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); From c56ecce840ef68989946cc6b6d6d24cb76f16aea Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 07:48:53 +0000 Subject: [PATCH 187/267] [ARM] fctiwzx implementation. This isn't implemented in JIT64 and it is unstandeable why it isn't. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 3 +- .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 119 +++++++++++++++++- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 121 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index c5df10f697..09745cf8df 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -68,6 +68,7 @@ private: void PrintDebug(UGeckoInstruction inst, u32 level); void Helper_UpdateCR1(ARMReg value); + void SetFPException(ARMReg Reg, u32 Exception); public: JitArm() : code_buffer(32000) {} ~JitArm() {} @@ -199,7 +200,7 @@ public: void fmrx(UGeckoInstruction _inst); void fmaddsx(UGeckoInstruction _inst); void fmaddx(UGeckoInstruction _inst); - + void fctiwzx(UGeckoInstruction inst); // Floating point loadStore void lfs(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index d89e6f6e33..453d9d739a 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -25,19 +25,136 @@ #include "../PPCTables.h" #include "ArmEmitter.h" #include "../../HW/Memmap.h" - +#include "../Interpreter/Interpreter_FPUtils.h" #include "Jit.h" #include "JitRegCache.h" #include "JitFPRCache.h" #include "JitAsm.h" +static const double minmaxFloat[2] = {-(double)0x80000000, (double)0x7FFFFFFF}; +static const double doublenum = 0xfff8000000000000ull; +static Operand2 FRFIMask(5, 0x8); // 0x60000 +static Operand2 FIMask(2, 8); // 0x20000 +static Operand2 FRMask(4, 8); // 0x40000 +static Operand2 FXMask(2, 1); // 0x80000000 + +static Operand2 XXException(2, 4); // 0x2000000 +static Operand2 CVIException(1, 0xC); // 0x100 + void JitArm::Helper_UpdateCR1(ARMReg value) { // Should just update exception flags, not do any compares. PanicAlert("CR1"); } +void JitArm::SetFPException(ARMReg Reg, u32 Exception) +{ + Operand2 *ExceptionMask; + switch(Exception) + { + case FPSCR_VXCVI: + ExceptionMask = &CVIException; + break; + case FPSCR_XX: + ExceptionMask = &XXException; + break; + default: + _assert_msg_(DYNA_REC, false, "Passed unsupported FPexception: 0x%08x", Exception); + return; + break; + } + ARMReg rB = gpr.GetReg(); + MOV(rB, Reg); + ORR(Reg, Reg, *ExceptionMask); + CMP(rB, Reg); + SetCC(CC_NEQ); + ORR(Reg, Reg, FXMask); // If exception is set, set exception bit + SetCC(); + BIC(Reg, Reg, FRFIMask); + gpr.Unlock(rB); +} + +void JitArm::fctiwzx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITFloatingPointOff) + u32 b = inst.FB; + u32 d = inst.FD; + + ARMReg vB = fpr.R0(b); + ARMReg vD = fpr.R0(d); + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + ARMReg V2 = fpr.GetReg(); + + ARMReg rA = gpr.GetReg(); + ARMReg fpscrReg = gpr.GetReg(); + + FixupBranch DoneMax, DoneMin; + LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + MOVI2R(rA, (u32)minmaxFloat); + + // Check if greater than max float + { + VLDR(V0, rA, 8); // Load Max + VCMPE(vB, V0); + VMRS(_PC); // Loads in to APSR + FixupBranch noException = B_CC(CC_LE); + VMOV(vD, V0); // Set to max + SetFPException(fpscrReg, FPSCR_VXCVI); + DoneMax = B(); + SetJumpTarget(noException); + } + // Check if less than min float + { + VLDR(V0, rA, 0); + VCMPE(vB, V0); + VMRS(_PC); + FixupBranch noException = B_CC(CC_GE); + VMOV(vD, V0); + SetFPException(fpscrReg, FPSCR_VXCVI); + DoneMin = B(); + SetJumpTarget(noException); + } + // Within ranges, convert to integer + VCVT(vD, vB, TO_INT | IS_SIGNED | ROUND_TO_ZERO); + VCMPE(vD, vB); + VMRS(_PC); + + SetCC(CC_EQ); + BIC(fpscrReg, fpscrReg, FRFIMask); + FixupBranch DoneEqual = B(); + SetCC(); + SetFPException(fpscrReg, FPSCR_XX); + ORR(fpscrReg, fpscrReg, FIMask); + VABS(V1, vB); + VABS(V2, vD); + VCMPE(V2, V1); + VMRS(_PC); + SetCC(CC_GT); + ORR(fpscrReg, fpscrReg, FRMask); + SetCC(); + SetJumpTarget(DoneEqual); + + SetJumpTarget(DoneMax); + SetJumpTarget(DoneMin); + + MOVI2R(rA, (u32)&doublenum); + VLDR(V0, rA, 0); + NEONXEmitter nemit(this); + nemit.VORR(vD, vD, V0); + + if (inst.Rc) Helper_UpdateCR1(vD); + + STR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + gpr.Unlock(rA); + gpr.Unlock(fpscrReg); + fpr.Unlock(V0); + fpr.Unlock(V1); + fpr.Unlock(V2); +} + void JitArm::fabsx(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 12e1deb0ab..ae2d2e6558 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -350,7 +350,7 @@ static GekkoOPTemplate table63[] = {32, &JitArm::Default}, //"fcmpo", OPTYPE_FPU, FL_RC_BIT_F}}, {0, &JitArm::Default}, //"fcmpu", OPTYPE_FPU, FL_RC_BIT_F}}, {14, &JitArm::Default}, //"fctiwx", OPTYPE_FPU, FL_RC_BIT_F}}, - {15, &JitArm::Default}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}}, + {15, &JitArm::fctiwzx}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}}, {72, &JitArm::fmrx}, //"fmrx", OPTYPE_FPU, FL_RC_BIT_F}}, {136, &JitArm::fnabsx}, //"fnabsx", OPTYPE_FPU, FL_RC_BIT_F}}, {40, &JitArm::fnegx}, //"fnegx", OPTYPE_FPU, FL_RC_BIT_F}}, From 0bcc20ca5baac14659a782a48278c20a343c456e Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 08:57:51 +0000 Subject: [PATCH 188/267] [ARM] fcmpo/fcmpu implementations. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 4 +- .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 142 +++++++++++++++++- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 4 +- 3 files changed, 145 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 09745cf8df..b2034c7c13 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -200,7 +200,9 @@ public: void fmrx(UGeckoInstruction _inst); void fmaddsx(UGeckoInstruction _inst); void fmaddx(UGeckoInstruction _inst); - void fctiwzx(UGeckoInstruction inst); + void fctiwzx(UGeckoInstruction _inst); + void fcmpo(UGeckoInstruction _inst); + void fcmpu(UGeckoInstruction _inst); // Floating point loadStore void lfs(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 453d9d739a..9f5c2ce96a 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -38,10 +38,12 @@ static Operand2 FRFIMask(5, 0x8); // 0x60000 static Operand2 FIMask(2, 8); // 0x20000 static Operand2 FRMask(4, 8); // 0x40000 static Operand2 FXMask(2, 1); // 0x80000000 +static Operand2 VEMask(0x40, 0); // 0x40 static Operand2 XXException(2, 4); // 0x2000000 static Operand2 CVIException(1, 0xC); // 0x100 - +static Operand2 NANException(1, 4); // 0x1000000 +static Operand2 VXVCException(8, 8); // 0x80000 void JitArm::Helper_UpdateCR1(ARMReg value) { // Should just update exception flags, not do any compares. @@ -59,6 +61,12 @@ void JitArm::SetFPException(ARMReg Reg, u32 Exception) case FPSCR_XX: ExceptionMask = &XXException; break; + case FPSCR_VXSNAN: + ExceptionMask = &NANException; + break; + case FPSCR_VXVC: + ExceptionMask = &VXVCException; + break; default: _assert_msg_(DYNA_REC, false, "Passed unsupported FPexception: 0x%08x", Exception); return; @@ -87,7 +95,7 @@ void JitArm::fctiwzx(UGeckoInstruction inst) ARMReg V0 = fpr.GetReg(); ARMReg V1 = fpr.GetReg(); ARMReg V2 = fpr.GetReg(); - + ARMReg rA = gpr.GetReg(); ARMReg fpscrReg = gpr.GetReg(); @@ -155,6 +163,136 @@ void JitArm::fctiwzx(UGeckoInstruction inst) fpr.Unlock(V2); } +void JitArm::fcmpo(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITFloatingPointOff) + u32 a = inst.FA, b = inst.FB; + int cr = inst.CRFD; + + ARMReg vA = fpr.R0(a); + ARMReg vB = fpr.R0(b); + ARMReg fpscrReg = gpr.GetReg(); + ARMReg crReg = gpr.GetReg(); + Operand2 FPRFMask(0x1F, 0xA); // 0x1F000 + Operand2 LessThan(0x8, 0xA); // 0x8000 + Operand2 GreaterThan(0x4, 0xA); // 0x4000 + Operand2 EqualTo(0x2, 0xA); // 0x2000 + Operand2 NANRes(0x1, 0xA); // 0x1000 + FixupBranch Done1, Done2, Done3; + LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + BIC(fpscrReg, fpscrReg, FPRFMask); + + VCMPE(vA, vB); + VMRS(_PC); + SetCC(CC_LT); + ORR(fpscrReg, fpscrReg, LessThan); + MOV(crReg, 8); + Done1 = B(); + SetCC(CC_GT); + ORR(fpscrReg, fpscrReg, GreaterThan); + MOV(crReg, 4); + Done2 = B(); + SetCC(CC_EQ); + ORR(fpscrReg, fpscrReg, EqualTo); + MOV(crReg, 2); + Done3 = B(); + SetCC(); + + ORR(fpscrReg, fpscrReg, NANRes); + MOV(crReg, 1); + + VCMPE(vA, vA); + VMRS(_PC); + FixupBranch NanA = B_CC(CC_NEQ); + VCMPE(vB, vB); + VMRS(_PC); + FixupBranch NanB = B_CC(CC_NEQ); + + SetFPException(fpscrReg, FPSCR_VXVC); + FixupBranch Done4 = B(); + + SetJumpTarget(NanA); + SetJumpTarget(NanB); + + SetFPException(fpscrReg, FPSCR_VXSNAN); + + TST(fpscrReg, VEMask); + + FixupBranch noVXVC = B_CC(CC_NEQ); + SetFPException(fpscrReg, FPSCR_VXVC); + + SetJumpTarget(noVXVC); + SetJumpTarget(Done1); + SetJumpTarget(Done2); + SetJumpTarget(Done3); + SetJumpTarget(Done4); + STRB(crReg, R9, PPCSTATE_OFF(cr_fast) + cr); + STR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + gpr.Unlock(fpscrReg, crReg); +} + +void JitArm::fcmpu(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITFloatingPointOff) + u32 a = inst.FA, b = inst.FB; + int cr = inst.CRFD; + + ARMReg vA = fpr.R0(a); + ARMReg vB = fpr.R0(b); + ARMReg fpscrReg = gpr.GetReg(); + ARMReg crReg = gpr.GetReg(); + Operand2 FPRFMask(0x1F, 0xA); // 0x1F000 + Operand2 LessThan(0x8, 0xA); // 0x8000 + Operand2 GreaterThan(0x4, 0xA); // 0x4000 + Operand2 EqualTo(0x2, 0xA); // 0x2000 + Operand2 NANRes(0x1, 0xA); // 0x1000 + FixupBranch Done1, Done2, Done3; + LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + BIC(fpscrReg, fpscrReg, FPRFMask); + + VCMPE(vA, vB); + VMRS(_PC); + SetCC(CC_LT); + ORR(fpscrReg, fpscrReg, LessThan); + MOV(crReg, 8); + Done1 = B(); + SetCC(CC_GT); + ORR(fpscrReg, fpscrReg, GreaterThan); + MOV(crReg, 4); + Done2 = B(); + SetCC(CC_EQ); + ORR(fpscrReg, fpscrReg, EqualTo); + MOV(crReg, 2); + Done3 = B(); + SetCC(); + + ORR(fpscrReg, fpscrReg, NANRes); + MOV(crReg, 1); + + VCMPE(vA, vA); + VMRS(_PC); + FixupBranch NanA = B_CC(CC_NEQ); + VCMPE(vB, vB); + VMRS(_PC); + FixupBranch NanB = B_CC(CC_NEQ); + FixupBranch Done4 = B(); + + SetJumpTarget(NanA); + SetJumpTarget(NanB); + + SetFPException(fpscrReg, FPSCR_VXSNAN); + + SetJumpTarget(Done1); + SetJumpTarget(Done2); + SetJumpTarget(Done3); + SetJumpTarget(Done4); + STRB(crReg, R9, PPCSTATE_OFF(cr_fast) + cr); + STR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + gpr.Unlock(fpscrReg, crReg); +} + void JitArm::fabsx(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index ae2d2e6558..d37a0206e0 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -347,8 +347,8 @@ static GekkoOPTemplate table59[] = static GekkoOPTemplate table63[] = { {264, &JitArm::fabsx}, //"fabsx", OPTYPE_FPU, FL_RC_BIT_F}}, - {32, &JitArm::Default}, //"fcmpo", OPTYPE_FPU, FL_RC_BIT_F}}, - {0, &JitArm::Default}, //"fcmpu", OPTYPE_FPU, FL_RC_BIT_F}}, + {32, &JitArm::fcmpo}, //"fcmpo", OPTYPE_FPU, FL_RC_BIT_F}}, + {0, &JitArm::fcmpu}, //"fcmpu", OPTYPE_FPU, FL_RC_BIT_F}}, {14, &JitArm::Default}, //"fctiwx", OPTYPE_FPU, FL_RC_BIT_F}}, {15, &JitArm::fctiwzx}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}}, {72, &JitArm::fmrx}, //"fmrx", OPTYPE_FPU, FL_RC_BIT_F}}, From 1b5f904438707fcc4d77f5ca3ed5ef6fdc96edff Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Mon, 16 Sep 2013 12:13:58 +0200 Subject: [PATCH 189/267] D3D11: Fix screenshot aspect ratio. Fixes issue 6527. --- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index ca849ccde5..7bb6c3cadb 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -168,9 +168,9 @@ void TeardownDeviceObjects() s_television.Shutdown(); } -void CreateScreenshotTexture() +void CreateScreenshotTexture(const TargetRectangle& rc) { - D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE); + D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, rc.GetWidth(), rc.GetHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE); HRESULT hr = D3D::device->CreateTexture2D(&scrtex_desc, NULL, &s_screenshot_texture); CHECK(hr==S_OK, "Create screenshot staging texture"); D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture"); @@ -721,21 +721,22 @@ void Renderer::SetBlendMode(bool forceUpdate) } } -bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &rc) +bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle& rc) { if (!s_screenshot_texture) - CreateScreenshotTexture(); + CreateScreenshotTexture(rc); // copy back buffer to system memory - D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); + D3D11_BOX box = CD3D11_BOX(rc.left, rc.top, 0, rc.right, rc.bottom, 1); + D3D::context->CopySubresourceRegion(s_screenshot_texture, 0, 0, 0, 0, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex(), 0, &box); // D3DX11SaveTextureToFileA doesn't allow us to ignore the alpha channel, so we need to strip it out ourselves D3D11_MAPPED_SUBRESOURCE map; D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map); - for (unsigned int y = 0; y < D3D::GetBackBufferHeight(); ++y) + for (unsigned int y = 0; y < rc.GetHeight(); ++y) { u8* ptr = (u8*)map.pData + y * map.RowPitch + 3; - for (unsigned int x = 0; x < D3D::GetBackBufferWidth(); ++x) + for (unsigned int x = 0; x < rc.GetWidth(); ++x) { *ptr = 0xFF; ptr += 4; @@ -747,8 +748,8 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle HRESULT hr = PD3DX11SaveTextureToFileA(D3D::context, s_screenshot_texture, D3DX11_IFF_PNG, filename.c_str()); if (SUCCEEDED(hr)) { - OSD::AddMessage(StringFromFormat("Saved %i x %i %s", D3D::GetBackBufferWidth(), - D3D::GetBackBufferHeight(), filename.c_str())); + OSD::AddMessage(StringFromFormat("Saved %i x %i %s", rc.GetWidth(), + rc.GetHeight(), filename.c_str())); } else { @@ -906,9 +907,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons static int s_recordHeight; if (!s_screenshot_texture) - CreateScreenshotTexture(); + CreateScreenshotTexture(GetTargetRectangle()); - D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); + D3D11_BOX box = CD3D11_BOX(GetTargetRectangle().left, GetTargetRectangle().top, 0, GetTargetRectangle().right, GetTargetRectangle().bottom, 1); + D3D::context->CopySubresourceRegion(s_screenshot_texture, 0, 0, 0, 0, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex(), 0, &box); if (!bLastFrameDumped) { s_recordWidth = GetTargetRectangle().GetWidth(); @@ -937,8 +939,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons w = s_recordWidth; h = s_recordHeight; } - auto source_ptr = (const u8*)map.pData + GetTargetRectangle().left*4 + GetTargetRectangle().top*map.RowPitch; - formatBufferDump(source_ptr, &frame_data[0], s_recordWidth, s_recordHeight, map.RowPitch); + formatBufferDump((u8*)map.pData, &frame_data[0], s_recordWidth, s_recordHeight, map.RowPitch); AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); D3D::context->Unmap(s_screenshot_texture, 0); } From afdac224cb7735e09060f4479e20883a42af1c83 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 16 Sep 2013 06:31:21 -0400 Subject: [PATCH 190/267] Prevent an error message from erroneously displaying when dumping frames in d3d9 or d3d11. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 7bb6c3cadb..4e412641b8 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -940,7 +940,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons h = s_recordHeight; } formatBufferDump((u8*)map.pData, &frame_data[0], s_recordWidth, s_recordHeight, map.RowPitch); - AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); + AVIDump::AddFrame(&frame_data[0], GetTargetRectangle().GetWidth(), GetTargetRectangle().GetHeight()); D3D::context->Unmap(s_screenshot_texture, 0); } bLastFrameDumped = true; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index f11d7afd0b..44c19dcace 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -969,7 +969,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons h = s_recordHeight; } formatBufferDump((const u8*)rect.pBits, &frame_data[0], s_recordWidth, s_recordHeight, rect.Pitch); - AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); + AVIDump::AddFrame(&frame_data[0], GetTargetRectangle().GetWidth(), GetTargetRectangle().GetHeight()); ScreenShootMEMSurface->UnlockRect(); } } From 43f2313ef942183d7d29abd3d75cec4d495425ca Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 11:21:04 +0000 Subject: [PATCH 191/267] [ARM] Implement ps_msub. Minor optimizations. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../Src/PowerPC/JitArm32/JitArm_Paired.cpp | 62 ++++++++++++------- .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 43 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index b2034c7c13..e6160004ab 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -220,6 +220,7 @@ public: void ps_sum0(UGeckoInstruction _inst); void ps_sum1(UGeckoInstruction _inst); void ps_madd(UGeckoInstruction _inst); + void ps_msub(UGeckoInstruction _inst); void ps_madds0(UGeckoInstruction _inst); void ps_madds1(UGeckoInstruction _inst); void ps_sub(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 9f8c90b7df..6e3c898c7f 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -69,15 +69,42 @@ void JitArm::ps_madd(UGeckoInstruction inst) ARMReg V0 = fpr.GetReg(); ARMReg V1 = fpr.GetReg(); - VMOV(V0, vB0); - VMOV(V1, vB1); + VMUL(V0, vA0, vC0); + VMUL(V1, vA1, vC1); + VADD(vD0, V0, vB0); + VADD(vD1, V1, vB1); + + fpr.Unlock(V0); + fpr.Unlock(V1); +} + +void JitArm::ps_msub(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) - VMLA(V0, vA0, vC0); - VMLA(V1, vA1, vC1); + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; - VMOV(vD0, V0); - VMOV(vD1, V1); + if (inst.Rc) { + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vC1 = fpr.R1(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + + VMUL(V0, vA0, vC0); + VMUL(V1, vA1, vC1); + VSUB(vD0, V0, vB0); + VSUB(vD1, V1, vB1); + fpr.Unlock(V0); fpr.Unlock(V1); } @@ -102,15 +129,12 @@ void JitArm::ps_madds0(UGeckoInstruction inst) ARMReg V0 = fpr.GetReg(); ARMReg V1 = fpr.GetReg(); - - VMOV(V0, vB0); - VMOV(V1, vB1); - VMLA(V0, vA0, vC0); - VMLA(V1, vA1, vC0); + VMUL(V0, vA0, vC0); + VMUL(V1, vA1, vC0); - VMOV(vD0, V0); - VMOV(vD1, V1); + VADD(vD0, V0, vB0); + VADD(vD1, V1, vB1); fpr.Unlock(V0); fpr.Unlock(V1); @@ -137,14 +161,10 @@ void JitArm::ps_madds1(UGeckoInstruction inst) ARMReg V0 = fpr.GetReg(); ARMReg V1 = fpr.GetReg(); - VMOV(V0, vB0); - VMOV(V1, vB1); - - VMLA(V0, vA0, vC1); - VMLA(V1, vA1, vC1); - - VMOV(vD0, V0); - VMOV(vD1, V1); + VMUL(V0, vA0, vC1); + VMUL(V1, vA1, vC1); + VADD(vD0, V0, vB0); + VADD(vD1, V1, vB1); fpr.Unlock(V0); fpr.Unlock(V1); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index d37a0206e0..a8e34ebdf6 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -156,7 +156,7 @@ static GekkoOPTemplate table4_2[] = {24, &JitArm::Default}, //"ps_res", OPTYPE_PS, 0}}, {25, &JitArm::ps_mul}, //"ps_mul", OPTYPE_PS, 0}}, {26, &JitArm::Default}, //"ps_rsqrte", OPTYPE_PS, 0, 1}}, - {28, &JitArm::Default}, //"ps_msub", OPTYPE_PS, 0}}, + {28, &JitArm::ps_msub}, //"ps_msub", OPTYPE_PS, 0}}, {29, &JitArm::ps_madd}, //"ps_madd", OPTYPE_PS, 0}}, {30, &JitArm::Default}, //"ps_nmsub", OPTYPE_PS, 0}}, {31, &JitArm::Default}, //"ps_nmadd", OPTYPE_PS, 0}}, From b7f47bc2e1acf100e1d4a6e5ef53a8ee38b061b4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 11:52:25 +0000 Subject: [PATCH 192/267] [ARM] rlwnmx implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 29 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index e6160004ab..3510c60321 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -167,6 +167,7 @@ public: void mulhwux(UGeckoInstruction _inst); void rlwimix(UGeckoInstruction _inst); void rlwinmx(UGeckoInstruction _inst); + void rlwnmx(UGeckoInstruction _inst); void srawix(UGeckoInstruction _inst); void extshx(UGeckoInstruction inst); void extsbx(UGeckoInstruction inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index a5a6b1b274..38a6f0c537 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -775,6 +775,7 @@ void JitArm::rlwimix(UGeckoInstruction inst) } gpr.Unlock(rA, rB); } + void JitArm::rlwinmx(UGeckoInstruction inst) { INSTRUCTION_START @@ -798,6 +799,34 @@ void JitArm::rlwinmx(UGeckoInstruction inst) //m_GPR[inst.RA] = _rotl(m_GPR[inst.RS],inst.SH) & mask; } +void JitArm::rlwnmx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITIntegerOff) + + u32 mask = Helper_Mask(inst.MB,inst.ME); + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg RB = gpr.R(inst.RB); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, mask); + + // PPC rotates left, ARM rotates right. Swap it + MOV(rB, 32); + SUB(rB, rB, RB); + + Operand2 Shift(RS, ST_ROR, rB); // Register shifted register + if (inst.Rc) + { + ANDS(RA, rA, Shift); + GenerateRC(); + } + else + AND (RA, rA, Shift); + gpr.Unlock(rA, rB); +} + void JitArm::srawix(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index a8e34ebdf6..8427956340 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -69,7 +69,7 @@ static GekkoOPTemplate primarytable[] = {20, &JitArm::rlwimix}, //"rlwimix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}}, {21, &JitArm::rlwinmx}, //"rlwinmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, - {23, &JitArm::Default}, //"rlwnmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}}, + {23, &JitArm::rlwnmx}, //"rlwnmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}}, {24, &JitArm::arith}, //"ori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, {25, &JitArm::arith}, //"oris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, From 5a9cb84ae28ea7c2ba68963ee3690d8a5addaa89 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 12:03:08 +0000 Subject: [PATCH 193/267] [ARM] ps_nmadd/ps_nmsub implementations. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 2 + .../Src/PowerPC/JitArm32/JitArm_Paired.cpp | 66 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 4 +- 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 3510c60321..37ea9459f1 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -221,7 +221,9 @@ public: void ps_sum0(UGeckoInstruction _inst); void ps_sum1(UGeckoInstruction _inst); void ps_madd(UGeckoInstruction _inst); + void ps_nmadd(UGeckoInstruction _inst); void ps_msub(UGeckoInstruction _inst); + void ps_nmsub(UGeckoInstruction _inst); void ps_madds0(UGeckoInstruction _inst); void ps_madds1(UGeckoInstruction _inst); void ps_sub(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 6e3c898c7f..175fc9e31e 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -47,6 +47,39 @@ void JitArm::ps_add(UGeckoInstruction inst) VADD(vD1, vA1, vB1); } +void JitArm::ps_nmadd(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + if (inst.Rc) { + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vC1 = fpr.R1(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + + VMUL(V0, vA0, vC0); + VMUL(V1, vA1, vC1); + VADD(vD0, V0, vB0); + VADD(vD1, V1, vB1); + VNEG(vD0, vD0); + VNEG(vD1, vD1); + + fpr.Unlock(V0); + fpr.Unlock(V1); +} + void JitArm::ps_madd(UGeckoInstruction inst) { INSTRUCTION_START @@ -78,6 +111,39 @@ void JitArm::ps_madd(UGeckoInstruction inst) fpr.Unlock(V1); } +void JitArm::ps_nmsub(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + if (inst.Rc) { + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vC1 = fpr.R1(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + + ARMReg V0 = fpr.GetReg(); + ARMReg V1 = fpr.GetReg(); + + VMUL(V0, vA0, vC0); + VMUL(V1, vA1, vC1); + VSUB(vD0, V0, vB0); + VSUB(vD1, V1, vB1); + VNEG(vD0, vD0); + VNEG(vD1, vD1); + + fpr.Unlock(V0); + fpr.Unlock(V1); +} + void JitArm::ps_msub(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 8427956340..cd67098ae3 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -158,8 +158,8 @@ static GekkoOPTemplate table4_2[] = {26, &JitArm::Default}, //"ps_rsqrte", OPTYPE_PS, 0, 1}}, {28, &JitArm::ps_msub}, //"ps_msub", OPTYPE_PS, 0}}, {29, &JitArm::ps_madd}, //"ps_madd", OPTYPE_PS, 0}}, - {30, &JitArm::Default}, //"ps_nmsub", OPTYPE_PS, 0}}, - {31, &JitArm::Default}, //"ps_nmadd", OPTYPE_PS, 0}}, + {30, &JitArm::ps_nmsub}, //"ps_nmsub", OPTYPE_PS, 0}}, + {31, &JitArm::ps_nmadd}, //"ps_nmadd", OPTYPE_PS, 0}}, }; From 7d410ec95c41c717dd7701f0916c7df953eb12f6 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 12:58:20 +0000 Subject: [PATCH 194/267] [ARM] VRSQRTE NEON emitter. --- Source/Core/Common/Src/ArmEmitter.cpp | 11 +++++++++++ Source/Core/Common/Src/ArmEmitter.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index 17e7bc3ab6..deaadc279c 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -1332,6 +1332,17 @@ void NEONXEmitter::VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm) VREVX(0, Size, Vd, Vm); } +void NEONXEmitter::VRSQRTE(NEONElementType Size, ARMReg Vd, ARMReg Vm) +{ + bool register_quad = Vd >= Q0; + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + Write32((0xF3 << 24) | (0xB << 20) | ((Vd & 0x10) << 18) | (0xB << 16) + | ((Vd & 0xF) << 12) | (9 << 7) | (Size & F_32 ? (1 << 8) : 0) | (register_quad << 6) + | ((Vm & 0x10) << 1) | (Vm & 0xF)); +} + void NEONXEmitter::VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm) { bool register_quad = Vd >= Q0; diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h index 09287ae0fe..d137a1ee8d 100644 --- a/Source/Core/Common/Src/ArmEmitter.h +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -634,6 +634,8 @@ public: void VREV32(NEONElementType Size, ARMReg Vd, ARMReg Vm); void VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm); + void VRSQRTE(NEONElementType Size, ARMReg Vd, ARMReg Vm); + void VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm); void VORR(ARMReg Vd, ARMReg Vn, ARMReg Vm); From a0a0c526ae025c6623f762e8f367ba2a9e633196 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 12:59:34 +0000 Subject: [PATCH 195/267] [ARM] ps_rsqrte implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 4 +- .../Src/PowerPC/JitArm32/JitArm_FPUtils.h | 66 +++++++++++++++++++ .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 47 +------------ .../Src/PowerPC/JitArm32/JitArm_Paired.cpp | 65 ++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 5 files changed, 136 insertions(+), 48 deletions(-) create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FPUtils.h diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index 37ea9459f1..d1280eaddf 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -67,7 +67,8 @@ private: void PrintDebug(UGeckoInstruction inst, u32 level); - void Helper_UpdateCR1(ARMReg value); + void Helper_UpdateCR1(ARMReg value); + void SetFPException(ARMReg Reg, u32 Exception); public: JitArm() : code_buffer(32000) {} @@ -238,6 +239,7 @@ public: void ps_neg(UGeckoInstruction _inst); void ps_abs(UGeckoInstruction _inst); void ps_nabs(UGeckoInstruction _inst); + void ps_rsqrte(UGeckoInstruction _inst); // LoadStore paired void psq_l(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FPUtils.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FPUtils.h new file mode 100644 index 0000000000..c186ae9696 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FPUtils.h @@ -0,0 +1,66 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. +#include "../Interpreter/Interpreter_FPUtils.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitFPRCache.h" +#include "JitAsm.h" + +static const double minmaxFloat[2] = {-(double)0x80000000, (double)0x7FFFFFFF}; +static const double doublenum = 0xfff8000000000000ull; + +// Exception masks +static Operand2 FRFIMask(5, 0x8); // 0x60000 +static Operand2 FIMask(2, 8); // 0x20000 +static Operand2 FRMask(4, 8); // 0x40000 +static Operand2 FXMask(2, 1); // 0x80000000 +static Operand2 VEMask(0x40, 0); // 0x40 + +static Operand2 XXException(2, 4); // 0x2000000 +static Operand2 CVIException(1, 0xC); // 0x100 +static Operand2 NANException(1, 4); // 0x1000000 +static Operand2 VXVCException(8, 8); // 0x80000 +static Operand2 ZXException(1, 3); // 0x4000000 +static Operand2 VXSQRTException(2, 5); // 0x200 + +inline void JitArm::SetFPException(ARMReg Reg, u32 Exception) +{ + Operand2 *ExceptionMask; + switch(Exception) + { + case FPSCR_VXCVI: + ExceptionMask = &CVIException; + break; + case FPSCR_XX: + ExceptionMask = &XXException; + break; + case FPSCR_VXSNAN: + ExceptionMask = &NANException; + break; + case FPSCR_VXVC: + ExceptionMask = &VXVCException; + break; + case FPSCR_ZX: + ExceptionMask = &ZXException; + break; + case FPSCR_VXSQRT: + ExceptionMask = &VXSQRTException; + break; + default: + _assert_msg_(DYNA_REC, false, "Passed unsupported FPexception: 0x%08x", Exception); + return; + break; + } + ARMReg rB = gpr.GetReg(); + MOV(rB, Reg); + ORR(Reg, Reg, *ExceptionMask); + CMP(rB, Reg); + SetCC(CC_NEQ); + ORR(Reg, Reg, FXMask); // If exception is set, set exception bit + SetCC(); + BIC(Reg, Reg, FRFIMask); + gpr.Unlock(rB); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 9f5c2ce96a..c3e46b83f2 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -25,64 +25,19 @@ #include "../PPCTables.h" #include "ArmEmitter.h" #include "../../HW/Memmap.h" -#include "../Interpreter/Interpreter_FPUtils.h" +#include "JitArm_FPUtils.h" #include "Jit.h" #include "JitRegCache.h" #include "JitFPRCache.h" #include "JitAsm.h" -static const double minmaxFloat[2] = {-(double)0x80000000, (double)0x7FFFFFFF}; -static const double doublenum = 0xfff8000000000000ull; -static Operand2 FRFIMask(5, 0x8); // 0x60000 -static Operand2 FIMask(2, 8); // 0x20000 -static Operand2 FRMask(4, 8); // 0x40000 -static Operand2 FXMask(2, 1); // 0x80000000 -static Operand2 VEMask(0x40, 0); // 0x40 - -static Operand2 XXException(2, 4); // 0x2000000 -static Operand2 CVIException(1, 0xC); // 0x100 -static Operand2 NANException(1, 4); // 0x1000000 -static Operand2 VXVCException(8, 8); // 0x80000 void JitArm::Helper_UpdateCR1(ARMReg value) { // Should just update exception flags, not do any compares. PanicAlert("CR1"); } -void JitArm::SetFPException(ARMReg Reg, u32 Exception) -{ - Operand2 *ExceptionMask; - switch(Exception) - { - case FPSCR_VXCVI: - ExceptionMask = &CVIException; - break; - case FPSCR_XX: - ExceptionMask = &XXException; - break; - case FPSCR_VXSNAN: - ExceptionMask = &NANException; - break; - case FPSCR_VXVC: - ExceptionMask = &VXVCException; - break; - default: - _assert_msg_(DYNA_REC, false, "Passed unsupported FPexception: 0x%08x", Exception); - return; - break; - } - ARMReg rB = gpr.GetReg(); - MOV(rB, Reg); - ORR(Reg, Reg, *ExceptionMask); - CMP(rB, Reg); - SetCC(CC_NEQ); - ORR(Reg, Reg, FXMask); // If exception is set, set exception bit - SetCC(); - BIC(Reg, Reg, FRFIMask); - gpr.Unlock(rB); -} - void JitArm::fctiwzx(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index 175fc9e31e..ff9d85da63 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -22,11 +22,76 @@ #include "../../CoreTiming.h" #include "../PPCTables.h" #include "ArmEmitter.h" +#include "JitArm_FPUtils.h" #include "Jit.h" #include "JitRegCache.h" #include "JitAsm.h" +void JitArm::ps_rsqrte(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 b = inst.FB, d = inst.FD; + if (inst.Rc){ + Default(inst); return; + } + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + ARMReg fpscrReg = gpr.GetReg(); + ARMReg V0 = D1; + ARMReg rA = gpr.GetReg(); + + MOVI2R(fpscrReg, (u32)&PPC_NAN); + VLDR(V0, fpscrReg, 0); + LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + + VCMP(vB0); + VMRS(_PC); + FixupBranch Less0 = B_CC(CC_LT); + VMOV(vD0, V0); + SetFPException(fpscrReg, FPSCR_VXSQRT); + FixupBranch SkipOrr0 = B(); + SetJumpTarget(Less0); + SetCC(CC_EQ); + ORR(rA, rA, 1); + SetCC(); + SetJumpTarget(SkipOrr0); + + VCMP(vB1); + VMRS(_PC); + FixupBranch Less1 = B_CC(CC_LT); + VMOV(vD1, V0); + SetFPException(fpscrReg, FPSCR_VXSQRT); + FixupBranch SkipOrr1 = B(); + SetJumpTarget(Less1); + SetCC(CC_EQ); + ORR(rA, rA, 2); + SetCC(); + SetJumpTarget(SkipOrr1); + + CMP(rA, 0); + FixupBranch noException = B_CC(CC_EQ); + SetFPException(fpscrReg, FPSCR_ZX); + SetJumpTarget(noException); + + VCVT(S0, vB0, 0); + VCVT(S1, vB1, 0); + + NEONXEmitter nemit(this); + nemit.VRSQRTE(F_32, D0, D0); + VCVT(vD0, S0, 0); + VCVT(vD1, S1, 0); + BKPT(1); + + STR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); + gpr.Unlock(fpscrReg, rA); + fpr.Unlock(V0); +} + void JitArm::ps_add(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index cd67098ae3..01bda52b92 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -155,7 +155,7 @@ static GekkoOPTemplate table4_2[] = {23, &JitArm::Default}, //"ps_sel", OPTYPE_PS, 0}}, {24, &JitArm::Default}, //"ps_res", OPTYPE_PS, 0}}, {25, &JitArm::ps_mul}, //"ps_mul", OPTYPE_PS, 0}}, - {26, &JitArm::Default}, //"ps_rsqrte", OPTYPE_PS, 0, 1}}, + {26, &JitArm::ps_rsqrte}, //"ps_rsqrte", OPTYPE_PS, 0, 1}}, {28, &JitArm::ps_msub}, //"ps_msub", OPTYPE_PS, 0}}, {29, &JitArm::ps_madd}, //"ps_madd", OPTYPE_PS, 0}}, {30, &JitArm::ps_nmsub}, //"ps_nmsub", OPTYPE_PS, 0}}, From cba2dd01bc817f2812849f4738d54bc23a697114 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 13:39:02 +0000 Subject: [PATCH 196/267] [ARM] Remove extraneous BKPT from ps_rsqrte. --- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index ff9d85da63..f55a3c12eb 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -85,11 +85,9 @@ void JitArm::ps_rsqrte(UGeckoInstruction inst) nemit.VRSQRTE(F_32, D0, D0); VCVT(vD0, S0, 0); VCVT(vD1, S1, 0); - BKPT(1); STR(fpscrReg, R9, PPCSTATE_OFF(fpscr)); gpr.Unlock(fpscrReg, rA); - fpr.Unlock(V0); } void JitArm::ps_add(UGeckoInstruction inst) From 98fb4c146e3832c2cf6bcb1287549954a0622610 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 14:05:50 +0000 Subject: [PATCH 197/267] [ARM] ps_sel implementation. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 1 + .../Src/PowerPC/JitArm32/JitArm_Paired.cpp | 39 +++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index d1280eaddf..aec0ee85d9 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -240,6 +240,7 @@ public: void ps_abs(UGeckoInstruction _inst); void ps_nabs(UGeckoInstruction _inst); void ps_rsqrte(UGeckoInstruction _inst); + void ps_sel(UGeckoInstruction _inst); // LoadStore paired void psq_l(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp index f55a3c12eb..983e788707 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp @@ -90,6 +90,45 @@ void JitArm::ps_rsqrte(UGeckoInstruction inst) gpr.Unlock(fpscrReg, rA); } +void JitArm::ps_sel(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITPairedOff) + + u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD; + + if (inst.Rc) { + Default(inst); return; + } + ARMReg vA0 = fpr.R0(a); + ARMReg vA1 = fpr.R1(a); + ARMReg vB0 = fpr.R0(b); + ARMReg vB1 = fpr.R1(b); + ARMReg vC0 = fpr.R0(c); + ARMReg vC1 = fpr.R1(c); + ARMReg vD0 = fpr.R0(d, false); + ARMReg vD1 = fpr.R1(d, false); + + VCMP(vA0); + VMRS(_PC); + + FixupBranch GT0 = B_CC(CC_GE); + VMOV(vD0, vB0); + FixupBranch EQ0 = B(); + SetJumpTarget(GT0); + VMOV(vD0, vC0); + SetJumpTarget(EQ0); + + VCMP(vA1); + VMRS(_PC); + FixupBranch GT1 = B_CC(CC_GE); + VMOV(vD1, vB1); + FixupBranch EQ1 = B(); + SetJumpTarget(GT1); + VMOV(vD1, vC1); + SetJumpTarget(EQ1); +} + void JitArm::ps_add(UGeckoInstruction inst) { INSTRUCTION_START diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 01bda52b92..4bf519919c 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -152,7 +152,7 @@ static GekkoOPTemplate table4_2[] = {18, &JitArm::Default}, //"ps_div", OPTYPE_PS, 0, 16}}, {20, &JitArm::ps_sub}, //"ps_sub", OPTYPE_PS, 0}}, {21, &JitArm::ps_add}, //"ps_add", OPTYPE_PS, 0}}, - {23, &JitArm::Default}, //"ps_sel", OPTYPE_PS, 0}}, + {23, &JitArm::ps_sel}, //"ps_sel", OPTYPE_PS, 0}}, {24, &JitArm::Default}, //"ps_res", OPTYPE_PS, 0}}, {25, &JitArm::ps_mul}, //"ps_mul", OPTYPE_PS, 0}}, {26, &JitArm::ps_rsqrte}, //"ps_rsqrte", OPTYPE_PS, 0, 1}}, From 75f2738f5c32bc7a28078983d1a7da2c31e7acbf Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 16 Sep 2013 17:10:19 +0200 Subject: [PATCH 198/267] VideoCommon: fix ogl lighting bug which happens because of NaN emulation attn is sometimes very big (eg 1e27), so attn*attn doesn't fit into a float. So the funny part here is: 0.0 * (1e27*1e27) = 0.0 * Inf = NaN As the shader compiler is allowed to change the order of multiplications, this issue isn't fixed completely. --- Source/Core/VideoCommon/Src/LightingShaderGen.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h index 09b2dfd257..17dd0a6273 100644 --- a/Source/Core/VideoCommon/Src/LightingShaderGen.h +++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h @@ -78,15 +78,18 @@ static void GenerateLightShader(T& object, LightingUidData& uid_data, int index, "ldir = ldir / dist;\n" "attn = max(0.0f, dot(ldir, " LIGHT_DIR".xyz));\n", LIGHT_DIR_PARAMS(lightsName, index)); - object.Write("attn = max(0.0f, dot(" LIGHT_COSATT".xyz, float3(1.0f, attn, attn*attn))) / dot(" LIGHT_DISTATT".xyz, float3(1.0f,dist,dist2));\n", - LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index)); + // attn*attn may overflow + object.Write("attn = max(0.0f, " LIGHT_COSATT".x + " LIGHT_COSATT".y*attn + " LIGHT_COSATT".z*attn*attn) / dot(" LIGHT_DISTATT".xyz, float3(1.0f,dist,dist2));\n", + LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index)); } else if (chan.attnfunc == 1) { // specular object.Write("ldir = normalize(" LIGHT_POS".xyz);\n", LIGHT_POS_PARAMS(lightsName, index)); object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, " LIGHT_DIR".xyz)) : 0.0f;\n", LIGHT_DIR_PARAMS(lightsName, index)); - object.Write("attn = max(0.0f, dot(" LIGHT_COSATT".xyz, float3(1,attn,attn*attn))) / dot(" LIGHT_DISTATT".xyz, float3(1,attn,attn*attn));\n", - LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index)); + // attn*attn may overflow + object.Write("attn = max(0.0f, " LIGHT_COSATT".x + " LIGHT_COSATT".y*attn + " LIGHT_COSATT".z*attn*attn) / (" LIGHT_DISTATT".x + " LIGHT_DISTATT".y*attn + " LIGHT_DISTATT".z*attn*attn);\n", + LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index), + LIGHT_DISTATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index)); } switch (chan.diffusefunc) From 9b9526fba2da63025d60533eac0b9600a359270f Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 15:13:26 +0000 Subject: [PATCH 199/267] [ARM] Add dcbt/dcbtst/dcba noops. --- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 4bf519919c..8f0417f447 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -214,10 +214,10 @@ static GekkoOPTemplate table31[] = {54, &JitArm::dcbst}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, {86, &JitArm::Default}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, - {246, &JitArm::Default}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, - {278, &JitArm::Default}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, + {246, &JitArm::DoNothing}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, + {278, &JitArm::DoNothing}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, {470, &JitArm::Default}, //"dcbi", OPTYPE_DCACHE, 0, 4}}, - {758, &JitArm::Default}, //"dcba", OPTYPE_DCACHE, 0, 4}}, + {758, &JitArm::DoNothing}, //"dcba", OPTYPE_DCACHE, 0, 4}}, {1014, &JitArm::Default}, //"dcbz", OPTYPE_DCACHE, 0, 4}}, //load word From 7397867b21883aa586ae627f7fc00e5f23160e21 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 15:43:57 +0000 Subject: [PATCH 200/267] [GLES3] Enable support for primitive restart. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 5c4073fb0f..a5a50d28ff 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -373,7 +373,7 @@ Renderer::Renderer() WARN_LOG(VIDEO, "Running the OpenGL ES 3 backend!"); g_Config.backend_info.bSupportsDualSourceBlend = false; g_Config.backend_info.bSupportsGLSLUBO = true; - g_Config.backend_info.bSupportsPrimitiveRestart = false; + g_Config.backend_info.bSupportsPrimitiveRestart = true; g_Config.backend_info.bSupportsEarlyZ = false; g_ogl_config.bSupportsGLSLCache = true; @@ -603,9 +603,11 @@ Renderer::Renderer() glBlendColor(0, 0, 0, 0.5f); glClearDepthf(1.0f); -#ifndef USE_GLES3 if(g_ActiveConfig.backend_info.bSupportsPrimitiveRestart) { +#ifdef USE_GLES3 + glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); +#else if(g_ogl_config.bSupportOGL31) { glEnable(GL_PRIMITIVE_RESTART); @@ -616,8 +618,8 @@ Renderer::Renderer() glEnableClientState(GL_PRIMITIVE_RESTART_NV); glPrimitiveRestartIndexNV(65535); } - } #endif + } UpdateActiveConfig(); } From 1529bb48c87bbe3af1d9aeeb2bd10cfe396dcd13 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 16 Sep 2013 15:44:41 +0000 Subject: [PATCH 201/267] [ARM] Flush the fpr cache between every instruction. Do this until I figure out what is destroying the FPR register states. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp index 8b11840682..c7cdb81d21 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp @@ -483,6 +483,7 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo BKPT(0x7777); } JitArmTables::CompileInstruction(ops[i]); + fpr.Flush(); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) { // Don't do this yet From a2a01d2fc93062f6a3720d18f21db3a7e009d75e Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Mon, 16 Sep 2013 18:49:17 +0300 Subject: [PATCH 202/267] Gameini database update. Fixes issue 6531. Fixes issue 6532. --- Data/Sys/GameSettings/G3EE51.ini | 2 +- Data/Sys/GameSettings/G4ZE69.ini | 20 +++++++++--------- Data/Sys/GameSettings/G4ZP69.ini | 20 ++++++++++++++++++ Data/Sys/GameSettings/GCIE69.ini | 17 +++++++++++++++ Data/Sys/GameSettings/GCIP69.ini | 17 +++++++++++++++ Data/Sys/GameSettings/GGVD78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GGVE78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GGVP78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GGVX78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GNIEA4.ini | 16 ++++++++++++++ Data/Sys/GameSettings/GNIPA4.ini | 16 ++++++++++++++ Data/Sys/GameSettings/GOQEAF.ini | 2 +- Data/Sys/GameSettings/GQQD78.ini | 16 ++++++++++++++ Data/Sys/GameSettings/GQQE78.ini | 16 ++++++++++++++ Data/Sys/GameSettings/GQQF78.ini | 16 ++++++++++++++ Data/Sys/GameSettings/GQQH78.ini | 16 ++++++++++++++ Data/Sys/GameSettings/GQQP78.ini | 16 ++++++++++++++ Data/Sys/GameSettings/GSQE78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GSQP78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GSWE64.ini | 2 -- Data/Sys/GameSettings/GSWI64.ini | 36 ++++++++++++++++++++++++++++++++ Data/Sys/GameSettings/GSWP64.ini | 1 - Data/Sys/GameSettings/GSWS64.ini | 1 - Data/Sys/GameSettings/GTRE78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GTRP78.ini | 18 ++++++++++++++++ Data/Sys/GameSettings/GUTD52.ini | 31 +++++++++++++++++++++++++++ Data/Sys/GameSettings/GUTE52.ini | 2 +- Data/Sys/GameSettings/GUTF52.ini | 31 +++++++++++++++++++++++++++ Data/Sys/GameSettings/GUTI52.ini | 31 +++++++++++++++++++++++++++ Data/Sys/GameSettings/GUTJC0.ini | 31 +++++++++++++++++++++++++++ Data/Sys/GameSettings/GUTP52.ini | 31 +++++++++++++++++++++++++++ Data/Sys/GameSettings/GUTS52.ini | 31 +++++++++++++++++++++++++++ Data/Sys/GameSettings/GZLE01.ini | 2 ++ Data/Sys/GameSettings/GZLJ01.ini | 2 ++ Data/Sys/GameSettings/GZLP01.ini | 2 ++ Data/Sys/GameSettings/JAHE01.ini | 17 +++++++++++++++ Data/Sys/GameSettings/QAFP18.ini | 16 ++++++++++++++ Data/Sys/GameSettings/WLEELU.ini | 17 +++++++++++++++ Data/Sys/GameSettings/WLNELU.ini | 17 +++++++++++++++ Data/Sys/GameSettings/WRIEGD.ini | 17 +++++++++++++++ Data/Sys/GameSettings/WRIPGD.ini | 3 +++ Data/Sys/GameSettings/WXBEA4.ini | 16 ++++++++++++++ 42 files changed, 654 insertions(+), 17 deletions(-) create mode 100644 Data/Sys/GameSettings/G4ZP69.ini create mode 100644 Data/Sys/GameSettings/GCIE69.ini create mode 100644 Data/Sys/GameSettings/GCIP69.ini create mode 100644 Data/Sys/GameSettings/GGVD78.ini create mode 100644 Data/Sys/GameSettings/GGVE78.ini create mode 100644 Data/Sys/GameSettings/GGVP78.ini create mode 100644 Data/Sys/GameSettings/GGVX78.ini create mode 100644 Data/Sys/GameSettings/GNIEA4.ini create mode 100644 Data/Sys/GameSettings/GNIPA4.ini create mode 100644 Data/Sys/GameSettings/GQQD78.ini create mode 100644 Data/Sys/GameSettings/GQQE78.ini create mode 100644 Data/Sys/GameSettings/GQQF78.ini create mode 100644 Data/Sys/GameSettings/GQQH78.ini create mode 100644 Data/Sys/GameSettings/GQQP78.ini create mode 100644 Data/Sys/GameSettings/GSQE78.ini create mode 100644 Data/Sys/GameSettings/GSQP78.ini create mode 100644 Data/Sys/GameSettings/GSWI64.ini create mode 100644 Data/Sys/GameSettings/GTRE78.ini create mode 100644 Data/Sys/GameSettings/GTRP78.ini create mode 100644 Data/Sys/GameSettings/GUTD52.ini create mode 100644 Data/Sys/GameSettings/GUTF52.ini create mode 100644 Data/Sys/GameSettings/GUTI52.ini create mode 100644 Data/Sys/GameSettings/GUTJC0.ini create mode 100644 Data/Sys/GameSettings/GUTP52.ini create mode 100644 Data/Sys/GameSettings/GUTS52.ini create mode 100644 Data/Sys/GameSettings/JAHE01.ini create mode 100644 Data/Sys/GameSettings/QAFP18.ini create mode 100644 Data/Sys/GameSettings/WLEELU.ini create mode 100644 Data/Sys/GameSettings/WLNELU.ini create mode 100644 Data/Sys/GameSettings/WRIEGD.ini create mode 100644 Data/Sys/GameSettings/WXBEA4.ini diff --git a/Data/Sys/GameSettings/G3EE51.ini b/Data/Sys/GameSettings/G3EE51.ini index e0cf383a4c..35bfeae250 100644 --- a/Data/Sys/GameSettings/G3EE51.ini +++ b/Data/Sys/GameSettings/G3EE51.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Black screen. Use an older rev for the game to work like r4727 (r6521 tested) +EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/G4ZE69.ini b/Data/Sys/GameSettings/G4ZE69.ini index 293140eae8..5bc646db5b 100644 --- a/Data/Sys/GameSettings/G4ZE69.ini +++ b/Data/Sys/GameSettings/G4ZE69.ini @@ -1,20 +1,20 @@ # G4ZE69 - The Sims 2 GameCube - [Core] # Values set here will override the main dolphin settings. -TLBHack=1 - +TLBHack = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -Issues="Go to menu and select options, then hangs" - +EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. - [OnFrame] -# Add memory patches to be applied every frame here. - [ActionReplay] -# Add action replay cheats here. - +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/G4ZP69.ini b/Data/Sys/GameSettings/G4ZP69.ini new file mode 100644 index 0000000000..43b31ae338 --- /dev/null +++ b/Data/Sys/GameSettings/G4ZP69.ini @@ -0,0 +1,20 @@ +# G4ZP69 - The Sims 2 GameCube +[Core] +# Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnLoad] +# Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GCIE69.ini b/Data/Sys/GameSettings/GCIE69.ini new file mode 100644 index 0000000000..f2ac2b7cfc --- /dev/null +++ b/Data/Sys/GameSettings/GCIE69.ini @@ -0,0 +1,17 @@ +# GCIE69 - The Sims +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/GCIP69.ini b/Data/Sys/GameSettings/GCIP69.ini new file mode 100644 index 0000000000..0f69c3638e --- /dev/null +++ b/Data/Sys/GameSettings/GCIP69.ini @@ -0,0 +1,17 @@ +# GCIP69 - The Sims +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/GGVD78.ini b/Data/Sys/GameSettings/GGVD78.ini new file mode 100644 index 0000000000..afa39b5ff4 --- /dev/null +++ b/Data/Sys/GameSettings/GGVD78.ini @@ -0,0 +1,18 @@ +# GGVD78 - The SpongeBob SquarePants Movie +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGVE78.ini b/Data/Sys/GameSettings/GGVE78.ini new file mode 100644 index 0000000000..116dd30fe5 --- /dev/null +++ b/Data/Sys/GameSettings/GGVE78.ini @@ -0,0 +1,18 @@ +# GGVE78 - The SpongeBob SquarePants Movie +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGVP78.ini b/Data/Sys/GameSettings/GGVP78.ini new file mode 100644 index 0000000000..13b6e320c6 --- /dev/null +++ b/Data/Sys/GameSettings/GGVP78.ini @@ -0,0 +1,18 @@ +# GGVP78 - The SpongeBob SquarePants Movie +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GGVX78.ini b/Data/Sys/GameSettings/GGVX78.ini new file mode 100644 index 0000000000..0c04afc3ac --- /dev/null +++ b/Data/Sys/GameSettings/GGVX78.ini @@ -0,0 +1,18 @@ +# GGVX78 - The SpongeBob SquarePants Movie +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GNIEA4.ini b/Data/Sys/GameSettings/GNIEA4.ini new file mode 100644 index 0000000000..bb20d2ad9e --- /dev/null +++ b/Data/Sys/GameSettings/GNIEA4.ini @@ -0,0 +1,16 @@ +# GNIEA4 - TMNT2 +[Core] +TLBHack = 1 +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GNIPA4.ini b/Data/Sys/GameSettings/GNIPA4.ini new file mode 100644 index 0000000000..38808a2ee6 --- /dev/null +++ b/Data/Sys/GameSettings/GNIPA4.ini @@ -0,0 +1,16 @@ +# GNIPA4 - TMNT2 +[Core] +TLBHack = 1 +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GOQEAF.ini b/Data/Sys/GameSettings/GOQEAF.ini index 56c790c605..f69223c109 100644 --- a/Data/Sys/GameSettings/GOQEAF.ini +++ b/Data/Sys/GameSettings/GOQEAF.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = bad texture +EmulationIssues = [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/GQQD78.ini b/Data/Sys/GameSettings/GQQD78.ini new file mode 100644 index 0000000000..e786ce46f8 --- /dev/null +++ b/Data/Sys/GameSettings/GQQD78.ini @@ -0,0 +1,16 @@ +# GQQD78 - SpongeBob Lights, Camera, PANTS +[Core] +TLBHack = 1 +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GQQE78.ini b/Data/Sys/GameSettings/GQQE78.ini new file mode 100644 index 0000000000..442c5ad1d4 --- /dev/null +++ b/Data/Sys/GameSettings/GQQE78.ini @@ -0,0 +1,16 @@ +# GQQE78 - SpongeBob Lights, Camera, PANTS +[Core] +TLBHack = 1 +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GQQF78.ini b/Data/Sys/GameSettings/GQQF78.ini new file mode 100644 index 0000000000..c4297e90ea --- /dev/null +++ b/Data/Sys/GameSettings/GQQF78.ini @@ -0,0 +1,16 @@ +# GQQF78 - SpongeBob Lights, Camera, PANTS +[Core] +TLBHack = 1 +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GQQH78.ini b/Data/Sys/GameSettings/GQQH78.ini new file mode 100644 index 0000000000..c725e3fd79 --- /dev/null +++ b/Data/Sys/GameSettings/GQQH78.ini @@ -0,0 +1,16 @@ +# GQQH78 - SpongeBob Lights, Camera, PANTS +[Core] +TLBHack = 1 +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GQQP78.ini b/Data/Sys/GameSettings/GQQP78.ini new file mode 100644 index 0000000000..88a0e6c1a7 --- /dev/null +++ b/Data/Sys/GameSettings/GQQP78.ini @@ -0,0 +1,16 @@ +# GQQP78 - SpongeBob Lights, Camera, PANTS +[Core] +TLBHack = 1 +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/Sys/GameSettings/GSQE78.ini b/Data/Sys/GameSettings/GSQE78.ini new file mode 100644 index 0000000000..69c2a8722c --- /dev/null +++ b/Data/Sys/GameSettings/GSQE78.ini @@ -0,0 +1,18 @@ +# GSQE78 - SpongeBob SquarePants ROTFD +[Core] +[EmuState] +EmulationStateId = 3 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GSQP78.ini b/Data/Sys/GameSettings/GSQP78.ini new file mode 100644 index 0000000000..cc74ae9793 --- /dev/null +++ b/Data/Sys/GameSettings/GSQP78.ini @@ -0,0 +1,18 @@ +# GSQP78 - SpongeBob SquarePants ROTFD +[Core] +[EmuState] +EmulationStateId = 3 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GSWE64.ini b/Data/Sys/GameSettings/GSWE64.ini index 8a3d604694..59418ec3f3 100644 --- a/Data/Sys/GameSettings/GSWE64.ini +++ b/Data/Sys/GameSettings/GSWE64.ini @@ -3,7 +3,6 @@ [Core] # Values set here will override the main dolphin settings. MMU = 1 -BAT = 1 FastDiscSpeed = 1 [EmuState] @@ -34,4 +33,3 @@ UseRealXFB = False [Video_Hacks] EFBEmulateFormatChanges = True - diff --git a/Data/Sys/GameSettings/GSWI64.ini b/Data/Sys/GameSettings/GSWI64.ini new file mode 100644 index 0000000000..23f04559af --- /dev/null +++ b/Data/Sys/GameSettings/GSWI64.ini @@ -0,0 +1,36 @@ +# GSWI64 - Star Wars: Rogue Leader + +[Core] +# Values set here will override the main dolphin settings. +MMU = 1 +FastDiscSpeed = 1 + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 3 + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = False + +[Video_Hacks] +EFBEmulateFormatChanges = True + diff --git a/Data/Sys/GameSettings/GSWP64.ini b/Data/Sys/GameSettings/GSWP64.ini index 3f864e2d5d..27ac0fb2b1 100644 --- a/Data/Sys/GameSettings/GSWP64.ini +++ b/Data/Sys/GameSettings/GSWP64.ini @@ -3,7 +3,6 @@ [Core] # Values set here will override the main dolphin settings. MMU = 1 -BAT = 1 FastDiscSpeed = 1 [EmuState] diff --git a/Data/Sys/GameSettings/GSWS64.ini b/Data/Sys/GameSettings/GSWS64.ini index 98617ef317..a820aec1bd 100644 --- a/Data/Sys/GameSettings/GSWS64.ini +++ b/Data/Sys/GameSettings/GSWS64.ini @@ -3,7 +3,6 @@ [Core] # Values set here will override the main dolphin settings. MMU = 1 -BAT = 1 FastDiscSpeed = 1 [EmuState] diff --git a/Data/Sys/GameSettings/GTRE78.ini b/Data/Sys/GameSettings/GTRE78.ini new file mode 100644 index 0000000000..e9b1cb2591 --- /dev/null +++ b/Data/Sys/GameSettings/GTRE78.ini @@ -0,0 +1,18 @@ +# GTRE78 - Tetris Worlds +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Settings] +UseXFB = True +UseRealXFB = True +[Gecko] diff --git a/Data/Sys/GameSettings/GTRP78.ini b/Data/Sys/GameSettings/GTRP78.ini new file mode 100644 index 0000000000..1722710375 --- /dev/null +++ b/Data/Sys/GameSettings/GTRP78.ini @@ -0,0 +1,18 @@ +# GTRP78 - Tetris Worlds +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Settings] +UseXFB = True +UseRealXFB = True +[Gecko] diff --git a/Data/Sys/GameSettings/GUTD52.ini b/Data/Sys/GameSettings/GUTD52.ini new file mode 100644 index 0000000000..3f5dedc272 --- /dev/null +++ b/Data/Sys/GameSettings/GUTD52.ini @@ -0,0 +1,31 @@ +# GUTD52 - Ultimate Spider-Man + +[Core] +# Values set here will override the main dolphin settings. +MMU = 1 + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTE52.ini b/Data/Sys/GameSettings/GUTE52.ini index 1271e44bb5..685738f72e 100644 --- a/Data/Sys/GameSettings/GUTE52.ini +++ b/Data/Sys/GameSettings/GUTE52.ini @@ -3,7 +3,6 @@ [Core] # Values set here will override the main dolphin settings. MMU = 1 -BAT = 1 [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. @@ -29,4 +28,5 @@ PH_ZFar = [Video_Settings] UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTF52.ini b/Data/Sys/GameSettings/GUTF52.ini new file mode 100644 index 0000000000..360b02e515 --- /dev/null +++ b/Data/Sys/GameSettings/GUTF52.ini @@ -0,0 +1,31 @@ +# GUTF52 - Ultimate Spider-Man + +[Core] +# Values set here will override the main dolphin settings. +MMU = 1 + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTI52.ini b/Data/Sys/GameSettings/GUTI52.ini new file mode 100644 index 0000000000..db1860968f --- /dev/null +++ b/Data/Sys/GameSettings/GUTI52.ini @@ -0,0 +1,31 @@ +# GUTI52 - Ultimate Spider-Man + +[Core] +# Values set here will override the main dolphin settings. +MMU = 1 + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTJC0.ini b/Data/Sys/GameSettings/GUTJC0.ini new file mode 100644 index 0000000000..c863b6928a --- /dev/null +++ b/Data/Sys/GameSettings/GUTJC0.ini @@ -0,0 +1,31 @@ +# GUTJC0 - Ultimate Spider-Man + +[Core] +# Values set here will override the main dolphin settings. +MMU = 1 + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTP52.ini b/Data/Sys/GameSettings/GUTP52.ini new file mode 100644 index 0000000000..b4fc80fc0f --- /dev/null +++ b/Data/Sys/GameSettings/GUTP52.ini @@ -0,0 +1,31 @@ +# GUTP52 - Ultimate Spider-Man + +[Core] +# Values set here will override the main dolphin settings. +MMU = 1 + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GUTS52.ini b/Data/Sys/GameSettings/GUTS52.ini new file mode 100644 index 0000000000..ee3bcdab69 --- /dev/null +++ b/Data/Sys/GameSettings/GUTS52.ini @@ -0,0 +1,31 @@ +# GUTS52 - Ultimate Spider-Man + +[Core] +# Values set here will override the main dolphin settings. +MMU = 1 + +[EmuState] +# The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = + +[OnLoad] +# Add memory patches to be loaded once on boot here. + +[OnFrame] +# Add memory patches to be applied every frame here. + +[ActionReplay] +# Add action replay cheats here. + +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = + +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/Sys/GameSettings/GZLE01.ini b/Data/Sys/GameSettings/GZLE01.ini index 86edfa67fb..f871a46a5f 100644 --- a/Data/Sys/GameSettings/GZLE01.ini +++ b/Data/Sys/GameSettings/GZLE01.ini @@ -370,3 +370,5 @@ EFBAccessEnable = True EFBToTextureEnable = False EFBCopyEnable = True +[Video_Settings] +FastDepthCalc = False diff --git a/Data/Sys/GameSettings/GZLJ01.ini b/Data/Sys/GameSettings/GZLJ01.ini index 8da6a1b970..c1c0ccccb1 100644 --- a/Data/Sys/GameSettings/GZLJ01.ini +++ b/Data/Sys/GameSettings/GZLJ01.ini @@ -46,3 +46,5 @@ EFBAccessEnable = True EFBToTextureEnable = False EFBCopyEnable = True +[Video_Settings] +FastDepthCalc = False diff --git a/Data/Sys/GameSettings/GZLP01.ini b/Data/Sys/GameSettings/GZLP01.ini index 5eb8d7a8c7..ff5edfa24f 100644 --- a/Data/Sys/GameSettings/GZLP01.ini +++ b/Data/Sys/GameSettings/GZLP01.ini @@ -249,3 +249,5 @@ EFBAccessEnable = True EFBToTextureEnable = False EFBCopyEnable = True +[Video_Settings] +FastDepthCalc = False diff --git a/Data/Sys/GameSettings/JAHE01.ini b/Data/Sys/GameSettings/JAHE01.ini new file mode 100644 index 0000000000..17347ff4fa --- /dev/null +++ b/Data/Sys/GameSettings/JAHE01.ini @@ -0,0 +1,17 @@ +# JAHE01 - R・TYPE Ⅲ +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = Needs progressive scan for proper speed. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Settings] +SafeTextureCacheColorSamples = 0 +[Gecko] diff --git a/Data/Sys/GameSettings/QAFP18.ini b/Data/Sys/GameSettings/QAFP18.ini new file mode 100644 index 0000000000..7d800f89ff --- /dev/null +++ b/Data/Sys/GameSettings/QAFP18.ini @@ -0,0 +1,16 @@ +# QAFP18 - The Dynastic Hero +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/Sys/GameSettings/WLEELU.ini b/Data/Sys/GameSettings/WLEELU.ini new file mode 100644 index 0000000000..b09fbbb3bf --- /dev/null +++ b/Data/Sys/GameSettings/WLEELU.ini @@ -0,0 +1,17 @@ +# WLEELU - PooYoos Episode 1 +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/Sys/GameSettings/WLNELU.ini b/Data/Sys/GameSettings/WLNELU.ini new file mode 100644 index 0000000000..dc755d3671 --- /dev/null +++ b/Data/Sys/GameSettings/WLNELU.ini @@ -0,0 +1,17 @@ +# WLNELU - PooYoos Episode 2 +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/Sys/GameSettings/WRIEGD.ini b/Data/Sys/GameSettings/WRIEGD.ini new file mode 100644 index 0000000000..58b8b25bfd --- /dev/null +++ b/Data/Sys/GameSettings/WRIEGD.ini @@ -0,0 +1,17 @@ +# WRIEGD - RAINBOW ISLANDS T.A. +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/WRIPGD.ini b/Data/Sys/GameSettings/WRIPGD.ini index 0441b63e2e..932e440ba4 100644 --- a/Data/Sys/GameSettings/WRIPGD.ini +++ b/Data/Sys/GameSettings/WRIPGD.ini @@ -20,3 +20,6 @@ EmulationIssues = [Video] ProjectionHack = 0 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/WXBEA4.ini b/Data/Sys/GameSettings/WXBEA4.ini new file mode 100644 index 0000000000..6db7604fba --- /dev/null +++ b/Data/Sys/GameSettings/WXBEA4.ini @@ -0,0 +1,16 @@ +# WXBEA4 - Ben 10 Alien Force +[Core] +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Video_Settings] +SafeTextureCacheColorSamples = 0 From 38c7d3880086084db0549ad6381d3af0793defcb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Sep 2013 15:59:31 -0400 Subject: [PATCH 203/267] Fix two wrong opcodes in the x64Emitter. PEXTRW and PINSRW were actually writing PCMPGTB opcodes. Thanks for the help Sintendo. --- Source/Core/Common/Src/x64Emitter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 7725b63fd8..e02ac2f196 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -1429,8 +1429,8 @@ void XEmitter::PCMPGTB(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x64, true, dest void XEmitter::PCMPGTW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x65, true, dest, arg);} void XEmitter::PCMPGTD(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x66, true, dest, arg);} -void XEmitter::PEXTRW(X64Reg dest, OpArg arg, u8 subreg) {WriteSSEOp(64, 0x64, true, dest, arg); Write8(subreg);} -void XEmitter::PINSRW(X64Reg dest, OpArg arg, u8 subreg) {WriteSSEOp(64, 0x64, true, dest, arg); Write8(subreg);} +void XEmitter::PEXTRW(X64Reg dest, OpArg arg, u8 subreg) {WriteSSEOp(64, 0xC5, true, dest, arg); Write8(subreg);} +void XEmitter::PINSRW(X64Reg dest, OpArg arg, u8 subreg) {WriteSSEOp(64, 0xC4, true, dest, arg); Write8(subreg);} void XEmitter::PMADDWD(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0xF5, true, dest, arg); } void XEmitter::PSADBW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0xF6, true, dest, arg);} From b4883e2ada6d452a69f13dec145475a894944a07 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Sep 2013 21:04:58 -0400 Subject: [PATCH 204/267] [Android] Make the AboutFragment extend the ListFragment, since this is basically what this fragment acts as. Much more descriptive than simply extending Fragment. Also made the list non-clickable, since it isn't supposed to be interacted with. --- .../src/org/dolphinemu/dolphinemu/AboutFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java index a94a22a964..8b29e607d7 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java @@ -7,7 +7,7 @@ package org.dolphinemu.dolphinemu; import android.app.Activity; -import android.app.Fragment; +import android.app.ListFragment; import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; @@ -25,7 +25,7 @@ import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment; /** * Represents the about screen. */ -public final class AboutFragment extends Fragment +public final class AboutFragment extends ListFragment { private static Activity m_activity; @@ -44,6 +44,7 @@ public final class AboutFragment extends Fragment AboutFragmentAdapter adapter = new AboutFragmentAdapter(m_activity, R.layout.about_layout, Input); mMainList.setAdapter(adapter); + mMainList.setEnabled(false); // Makes the list view non-clickable. return mMainList; } @@ -108,7 +109,7 @@ public final class AboutFragment extends Fragment View v = convertView; if (v == null) { - LayoutInflater vi = (LayoutInflater)ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + LayoutInflater vi = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); v = vi.inflate(id, parent, false); } From 988544389a6b32ab8ed31d2861e557e0af1de9e9 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Sep 2013 22:04:59 -0400 Subject: [PATCH 205/267] [Android] Slightly change the layout of the AboutFragment. Looks more like an actual list view now. --- Source/Android/res/layout/about_layout.xml | 13 +++++++------ Source/Android/res/values-ja/strings.xml | 4 ++-- Source/Android/res/values/strings.xml | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Source/Android/res/layout/about_layout.xml b/Source/Android/res/layout/about_layout.xml index 390d7d0de9..9c5b84e9ed 100644 --- a/Source/Android/res/layout/about_layout.xml +++ b/Source/Android/res/layout/about_layout.xml @@ -2,22 +2,23 @@ + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="vertical"> + android:textAppearance="?android:attr/textAppearanceMedium"/> + android:layout_marginLeft="15dip" + android:textAppearance="?android:attr/textAppearanceSmall"/> \ No newline at end of file diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index e17935f939..39c6a252bd 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -9,8 +9,8 @@ ナビゲーションウィンドウを閉じる - ビルドのバージョン: - サポートのOpenGL ES 3: + ビルドのバージョン + サポートのOpenGL ES 3 現在のディレクトリ: diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index b3e4f9e3e6..5c8a1269af 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -9,8 +9,8 @@ Close navigation drawer - Build Revision: - Supports OpenGL ES 3: + Build Revision + Supports OpenGL ES 3 Current Dir: From dcf74ef2b3a4a2c2316cd98687919227b185a792 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 17 Sep 2013 09:31:48 +0000 Subject: [PATCH 206/267] [ARM] Renables load instructions with update. --- Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp index 9bb3e9be37..f5296a17d3 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -403,12 +403,6 @@ void JitArm::lXX(UGeckoInstruction inst) break; } - if (update) - { - Default(inst); - return; - } - // Check for exception before loading ARMReg rA = gpr.GetReg(false); From 302e9c891b66173fa47e4d9363c7f09b6d46f3be Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 17 Sep 2013 10:59:12 +0000 Subject: [PATCH 207/267] [ARM] crand/crandc/creqv/crnand/crnor/cror/crorc/crxor/mcrf/mfcr/mtcrf/mtsr/mcrxr/mfsr implementations. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 7 + .../JitArm32/JitArm_SystemRegisters.cpp | 181 ++++++++++++++++++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 28 +-- 3 files changed, 202 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h index aec0ee85d9..e4bf7d6941 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -179,6 +179,13 @@ public: void mtspr(UGeckoInstruction _inst); void mfspr(UGeckoInstruction _inst); void mftb(UGeckoInstruction _inst); + void crXXX(UGeckoInstruction _inst); + void mcrf(UGeckoInstruction _inst); + void mfcr(UGeckoInstruction _inst); + void mtcrf(UGeckoInstruction _inst); + void mtsr(UGeckoInstruction _inst); + void mfsr(UGeckoInstruction _inst); + void mcrxr(UGeckoInstruction _inst); // LoadStore void stX(UGeckoInstruction _inst); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index 5509687184..c1e0678910 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -85,6 +85,101 @@ void JitArm::mfspr(UGeckoInstruction inst) break; } } + +void JitArm::mfcr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff) + // USES_CR + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + int d = inst.RD; + LDRB(rA, R9, PPCSTATE_OFF(cr_fast[0])); + + for (int i = 1; i < 8; i++) + { + LDRB(rB, R9, PPCSTATE_OFF(cr_fast[i])); + LSL(rA, rA, 4); + ORR(rA, rA, rB); + } + MOV(gpr.R(d), rA); + gpr.Unlock(rA, rB); +} + +void JitArm::mtcrf(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff) + ARMReg rA = gpr.GetReg(); + + // USES_CR + u32 crm = inst.CRM; + if (crm != 0) + { + if (gpr.IsImm(inst.RS)) + { + for (int i = 0; i < 8; i++) + { + if ((crm & (0x80 >> i)) != 0) + { + u8 newcr = (gpr.GetImm(inst.RS) >> (28 - (i * 4))) & 0xF; + MOV(rA, newcr); + STRB(rA, R9, PPCSTATE_OFF(cr_fast[i])); + } + } + } + else + { + for (int i = 0; i < 8; i++) + { + if ((crm & (0x80 >> i)) != 0) + { + MOV(rA, gpr.R(inst.RS)); + LSR(rA, rA, 28 - (i * 4)); + AND(rA, rA, 0xF); + STRB(rA, R9, PPCSTATE_OFF(cr_fast[i])); + } + } + } + } + gpr.Unlock(rA); +} + +void JitArm::mtsr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff) + + STR(gpr.R(inst.RS), R9, PPCSTATE_OFF(sr[inst.SR])); +} + +void JitArm::mfsr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff) + + LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(sr[inst.SR])); +} +void JitArm::mcrxr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + // Copy XER[0-3] into CR[inst.CRFD] + LDR(rA, R9, PPCSTATE_OFF(spr[SPR_XER])); + MOV(rB, rA); + LSR(rA, rA, 28); + STRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRFD])); + + // Clear XER[0-3] + Operand2 Top4(0xF, 2); + BIC(rB, rB, Top4); + STR(rB, R9, PPCSTATE_OFF(spr[SPR_XER])); + gpr.Unlock(rA, rB); +} + void JitArm::mtmsr(UGeckoInstruction inst) { INSTRUCTION_START @@ -98,6 +193,7 @@ void JitArm::mtmsr(UGeckoInstruction inst) WriteExit(js.compilerPC + 4, 0); } + void JitArm::mfmsr(UGeckoInstruction inst) { INSTRUCTION_START @@ -106,3 +202,88 @@ void JitArm::mfmsr(UGeckoInstruction inst) LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(msr)); } +void JitArm::mcrf(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff) + ARMReg rA = gpr.GetReg(); + + if (inst.CRFS != inst.CRFD) + { + LDRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRFS])); + STRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRFD])); + } + gpr.Unlock(rA); +} + +void JitArm::crXXX(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(bJITSystemRegistersOff) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + // Get bit CRBA aligned with bit CRBD + LDRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRBA >> 2])); + int shiftA = (inst.CRBD & 3) - (inst.CRBA & 3); + if (shiftA < 0) + LSL(rA, rA, -shiftA); + else if (shiftA > 0) + LSR(rA, rA, shiftA); + + // Get bit CRBB aligned with bit CRBD + int shiftB = (inst.CRBD & 3) - (inst.CRBB & 3); + LDRB(rB, R9, PPCSTATE_OFF(cr_fast[inst.CRBB >> 2])); + if (shiftB < 0) + LSL(rB, rB, -shiftB); + else if (shiftB > 0) + LSR(rB, rB, shiftB); + + // Compute combined bit + switch(inst.SUBOP10) + { + case 33: // crnor + ORR(rA, rA, rB); + RBIT(rA, rA); + break; + + case 129: // crandc + RBIT(rB, rB); + AND(rA, rA, rB); + break; + + case 193: // crxor + EOR(rA, rA, rB); + break; + + case 225: // crnand + AND(rA, rA, rB); + RBIT(rA, rA); + break; + + case 257: // crand + AND(rA, rA, rB); + break; + + case 289: // creqv + EOR(rA, rA, rB); + RBIT(rA, rA); + break; + + case 417: // crorc + RBIT(rB, rB); + ORR(rA, rA, rB); + break; + + case 449: // cror + ORR(rA, rA, rB); + break; + } + // Store result bit in CRBD + AND(rA, rA, 0x8 >> (inst.CRBD & 3)); + LDRB(rB, R9, PPCSTATE_OFF(cr_fast[inst.CRBD >> 2])); + BIC(rB, rB, 0x8 >> (inst.CRBD & 3)); + ORR(rB, rB, rA); + STRB(rB, R9, PPCSTATE_OFF(cr_fast[inst.CRBD >> 2])); + gpr.Unlock(rA, rB); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 8f0417f447..514cce035b 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -175,17 +175,17 @@ static GekkoOPTemplate table19[] = { {528, &JitArm::bcctrx}, //"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK}}, {16, &JitArm::bclrx}, //"bclrx", OPTYPE_BRANCH, FL_ENDBLOCK}}, - {257, &JitArm::Default}, //"crand", OPTYPE_CR, FL_EVIL}}, - {129, &JitArm::Default}, //"crandc", OPTYPE_CR, FL_EVIL}}, - {289, &JitArm::Default}, //"creqv", OPTYPE_CR, FL_EVIL}}, - {225, &JitArm::Default}, //"crnand", OPTYPE_CR, FL_EVIL}}, - {33, &JitArm::Default}, //"crnor", OPTYPE_CR, FL_EVIL}}, - {449, &JitArm::Default}, //"cror", OPTYPE_CR, FL_EVIL}}, - {417, &JitArm::Default}, //"crorc", OPTYPE_CR, FL_EVIL}}, - {193, &JitArm::Default}, //"crxor", OPTYPE_CR, FL_EVIL}}, + {257, &JitArm::crXXX}, //"crand", OPTYPE_CR, FL_EVIL}}, + {129, &JitArm::crXXX}, //"crandc", OPTYPE_CR, FL_EVIL}}, + {289, &JitArm::crXXX}, //"creqv", OPTYPE_CR, FL_EVIL}}, + {225, &JitArm::crXXX}, //"crnand", OPTYPE_CR, FL_EVIL}}, + {33, &JitArm::crXXX}, //"crnor", OPTYPE_CR, FL_EVIL}}, + {449, &JitArm::crXXX}, //"cror", OPTYPE_CR, FL_EVIL}}, + {417, &JitArm::crXXX}, //"crorc", OPTYPE_CR, FL_EVIL}}, + {193, &JitArm::crXXX}, //"crxor", OPTYPE_CR, FL_EVIL}}, {150, &JitArm::DoNothing}, //"isync", OPTYPE_ICACHE, FL_EVIL}}, - {0, &JitArm::Default}, //"mcrf", OPTYPE_SYSTEM, FL_EVIL}}, + {0, &JitArm::mcrf}, //"mcrf", OPTYPE_SYSTEM, FL_EVIL}}, {50, &JitArm::rfi}, //"rfi", OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1}}, {18, &JitArm::Break}, //"rfid", OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS}} @@ -279,17 +279,17 @@ static GekkoOPTemplate table31[] = {759, &JitArm::Default}, //"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}}, {983, &JitArm::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, - {19, &JitArm::Default}, //"mfcr", OPTYPE_SYSTEM, FL_OUT_D}}, + {19, &JitArm::mfcr}, //"mfcr", OPTYPE_SYSTEM, FL_OUT_D}}, {83, &JitArm::mfmsr}, //"mfmsr", OPTYPE_SYSTEM, FL_OUT_D}}, - {144, &JitArm::Default}, //"mtcrf", OPTYPE_SYSTEM, 0}}, + {144, &JitArm::mtcrf}, //"mtcrf", OPTYPE_SYSTEM, 0}}, {146, &JitArm::mtmsr}, //"mtmsr", OPTYPE_SYSTEM, FL_ENDBLOCK}}, - {210, &JitArm::Default}, //"mtsr", OPTYPE_SYSTEM, 0}}, + {210, &JitArm::mtsr}, //"mtsr", OPTYPE_SYSTEM, 0}}, {242, &JitArm::Default}, //"mtsrin", OPTYPE_SYSTEM, 0}}, {339, &JitArm::mfspr}, //"mfspr", OPTYPE_SPR, FL_OUT_D}}, {467, &JitArm::mtspr}, //"mtspr", OPTYPE_SPR, 0, 2}}, {371, &JitArm::mftb}, //"mftb", OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}}, - {512, &JitArm::Default}, //"mcrxr", OPTYPE_SYSTEM, 0}}, - {595, &JitArm::Default}, //"mfsr", OPTYPE_SYSTEM, FL_OUT_D, 2}}, + {512, &JitArm::mcrxr}, //"mcrxr", OPTYPE_SYSTEM, 0}}, + {595, &JitArm::mfsr}, //"mfsr", OPTYPE_SYSTEM, FL_OUT_D, 2}}, {659, &JitArm::Default}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}}, {4, &JitArm::Break}, //"tw", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, From ec5cf60f5eafcb8d1ff7231af21267e0ed3d414a Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 17 Sep 2013 09:56:45 -0400 Subject: [PATCH 208/267] Set L/R buttons in tas input, instead of just the analog triggers. Fixes issue 6613. --- Source/Core/DolphinWX/Src/TASInputDlg.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index e3db56e7fb..2bae92287b 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -527,6 +527,16 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID) PadStatus->button |= PAD_BUTTON_START; else PadStatus->button &= ~PAD_BUTTON_START; + + if(wx_r_button->IsChecked() || rTrig >= 255) + PadStatus->button |= PAD_TRIGGER_R; + else + PadStatus->button &= ~PAD_TRIGGER_R; + + if(wx_l_button->IsChecked() || lTrig >= 255) + PadStatus->button |= PAD_TRIGGER_L; + else + PadStatus->button &= ~PAD_TRIGGER_L; ButtonTurbo(); } From e3d01de01d51d39063402c85eb02cd7612206fdf Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 17 Sep 2013 10:40:12 -0400 Subject: [PATCH 209/267] Fix reading projection hack from game inis in ISOProperties. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index a466cab37d..20e3bead36 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1016,16 +1016,21 @@ void CISOProperties::LoadGameConfig() PHackEnable->SetValue(bTemp); GameIniDefault.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear); - GameIniLocal.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear); + if (GameIniLocal.Get("Video", "PH_SZNear", &bTemp)) + PHack_Data.PHackSZNear = bTemp; GameIniDefault.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar); - GameIniLocal.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar); + if (GameIniLocal.Get("Video", "PH_SZFar", &bTemp)) + PHack_Data.PHackSZFar = bTemp; GameIniDefault.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP); - GameIniLocal.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP); + if (GameIniLocal.Get("Video", "PH_ExtraParam", &bTemp)) + PHack_Data.PHackExP = bTemp; GameIniDefault.Get("Video", "PH_ZNear", &PHack_Data.PHZNear); - GameIniLocal.Get("Video", "PH_ZNear", &PHack_Data.PHZNear); + if (GameIniLocal.Get("Video", "PH_ZNear", &bTemp)) + PHack_Data.PHZNear = bTemp; GameIniDefault.Get("Video", "PH_ZFar", &PHack_Data.PHZFar); - GameIniLocal.Get("Video", "PH_ZFar", &PHack_Data.PHZFar); + if (GameIniLocal.Get("Video", "PH_ZFar", &bTemp)) + PHack_Data.PHZFar = bTemp; int iTemp; GameIniDefault.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/); From 47ce3dd09d05bf19672ea20dad3d7e934cf84b32 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 17 Sep 2013 10:44:47 -0400 Subject: [PATCH 210/267] Really fix reading projection hacks from game inis. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 20e3bead36..0dc4f38b17 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1025,12 +1025,13 @@ void CISOProperties::LoadGameConfig() if (GameIniLocal.Get("Video", "PH_ExtraParam", &bTemp)) PHack_Data.PHackExP = bTemp; + std::string sTemp; GameIniDefault.Get("Video", "PH_ZNear", &PHack_Data.PHZNear); - if (GameIniLocal.Get("Video", "PH_ZNear", &bTemp)) - PHack_Data.PHZNear = bTemp; + if (GameIniLocal.Get("Video", "PH_ZNear", &sTemp)) + PHack_Data.PHZNear = sTemp; GameIniDefault.Get("Video", "PH_ZFar", &PHack_Data.PHZFar); - if (GameIniLocal.Get("Video", "PH_ZFar", &bTemp)) - PHack_Data.PHZFar = bTemp; + if (GameIniLocal.Get("Video", "PH_ZFar", &sTemp)) + PHack_Data.PHZFar = sTemp; int iTemp; GameIniDefault.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/); @@ -1038,7 +1039,6 @@ void CISOProperties::LoadGameConfig() if (GameIniLocal.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/)) EmuState->SetSelection(iTemp); - std::string sTemp; GameIniDefault.Get("EmuState", "EmulationIssues", &sTemp); if (!sTemp.empty()) EmuIssues->SetValue(StrToWxStr(sTemp)); From e34d8aee1d3818e16281e990717fb82df49d447b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 17 Sep 2013 16:31:51 +0200 Subject: [PATCH 211/267] Add * to the characters leading a verbatim line (used in Gecko codes comments) --- Source/Core/Common/Src/IniFile.cpp | 8 ++++---- Source/Core/DolphinWX/Src/ISOProperties.cpp | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp index f7d97cd607..a86e101b01 100644 --- a/Source/Core/Common/Src/IniFile.cpp +++ b/Source/Core/Common/Src/IniFile.cpp @@ -371,11 +371,11 @@ bool IniFile::Load(const char* filename, bool keep_current_data) std::string key, value; ParseLine(line, &key, &value); - // Lines starting with '$' or '+' are kept verbatim. Kind - // of a hack, but the support for raw lines inside an INI - // is a hack anyway. + // Lines starting with '$', '*' or '+' are kept verbatim. + // Kind of a hack, but the support for raw lines inside an + // INI is a hack anyway. if ((key == "" && value == "") - || (line.size() >= 1 && (line[0] == '$' || line[0] == '+'))) + || (line.size() >= 1 && (line[0] == '$' || line[0] == '+' || line[0] == '*'))) current_section->lines.push_back(line.c_str()); else current_section->Set(key, value.c_str()); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 0dc4f38b17..583aeea495 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -125,7 +125,6 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini"; GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini"; - printf("Loading\n"); GameIniDefault.Load(GameIniFileDefault); GameIniLocal.Load(GameIniFileLocal); From ec9c395f4f367d35efa52be0482875f46ba8a9c8 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 17 Sep 2013 16:32:06 +0200 Subject: [PATCH 212/267] Add WBFS to the file extensions supported by Dolphin on OSX --- Source/Core/DolphinWX/Info.plist.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Info.plist.in b/Source/Core/DolphinWX/Info.plist.in index f08863a5d9..24d0117576 100644 --- a/Source/Core/DolphinWX/Info.plist.in +++ b/Source/Core/DolphinWX/Info.plist.in @@ -14,6 +14,7 @@ gcz iso wad + wbfs CFBundleTypeIconFile Dolphin.icns From 06062d5744688f4a125ea447334588b41cc86129 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 17 Sep 2013 22:06:30 +0000 Subject: [PATCH 213/267] [ARM] Fix VSQRT/VCMP/VCMPE/VCMPE0/VCMP0 emitters when using the high 16 double registers. --- Source/Core/Common/Src/ArmEmitter.cpp | 30 ++++++++++++++++++++------- Source/Core/Common/Src/ArmEmitter.h | 1 + 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index deaadc279c..33b14cfc44 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -972,10 +972,10 @@ u32 ARMXEmitter::EncodeVm(ARMReg Vm) ARMReg Reg = SubBase(Vm); if (quad_reg) - return ((Reg & 0x10) << 2) | (Reg & 0xF); + return ((Reg & 0x10) << 1) | (Reg & 0xF); else if (double_reg) - return ((Reg & 0x10) << 2) | (Reg & 0xF); + return ((Reg & 0x10) << 1) | (Reg & 0xF); else return ((Reg & 0x1) << 5) | (Reg >> 1); } @@ -995,6 +995,22 @@ void ARMXEmitter::WriteVFPDataOp(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm) Write32(cond | (enc.opc1 << 20) | VnEnc | VdEnc | (enc.opc2 << 4) | (quad_reg << 6) | (double_reg << 8) | VmEnc); } +void ARMXEmitter::WriteVFPDataOp6bit(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm, u32 bit6) +{ + bool quad_reg = Vd >= Q0; + bool double_reg = Vd >= D0 && Vd < Q0; + + VFPEnc enc = VFPOps[Op][quad_reg]; + if (enc.opc1 == -1 && enc.opc2 == -1) + _dbg_assert_msg_(DYNA_REC, false, "%s does not support %s", VFPOpNames[Op], quad_reg ? "NEON" : "VFP"); + u32 VdEnc = EncodeVd(Vd); + u32 VnEnc = EncodeVn(Vn); + u32 VmEnc = EncodeVm(Vm); + u32 cond = quad_reg ? (0xF << 28) : condition; + + Write32(cond | (enc.opc1 << 20) | VnEnc | VdEnc | (enc.opc2 << 4) | (bit6 << 6) | (double_reg << 8) | VmEnc); +} + void ARMXEmitter::VMLA(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(0, Vd, Vn, Vm); } void ARMXEmitter::VNMLA(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(1, Vd, Vn, Vm); } void ARMXEmitter::VMLS(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(2, Vd, Vn, Vm); } @@ -1006,11 +1022,11 @@ void ARMXEmitter::VNMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(7, Vd, void ARMXEmitter::VABS(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp(8, Vd, D0, Vm); } void ARMXEmitter::VDIV(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(9, Vd, Vn, Vm); } void ARMXEmitter::VNEG(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp(10, Vd, D1, Vm); } -void ARMXEmitter::VSQRT(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp(11, Vd, D1, Vm); } -void ARMXEmitter::VCMP(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp(12, Vd, D4, Vm); } -void ARMXEmitter::VCMPE(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp(13, Vd, D4, Vm); } -void ARMXEmitter::VCMP(ARMReg Vd){ WriteVFPDataOp(12, Vd, D5, D0); } -void ARMXEmitter::VCMPE(ARMReg Vd){ WriteVFPDataOp(13, Vd, D5, D0); } +void ARMXEmitter::VSQRT(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp6bit(11, Vd, D1, Vm, 3); } +void ARMXEmitter::VCMP(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp6bit(12, Vd, D4, Vm, 1); } +void ARMXEmitter::VCMPE(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp6bit(13, Vd, D4, Vm, 1); } +void ARMXEmitter::VCMP(ARMReg Vd){ WriteVFPDataOp6bit(12, Vd, D5, D0, 1); } +void ARMXEmitter::VCMPE(ARMReg Vd){ WriteVFPDataOp6bit(13, Vd, D5, D0, 1); } void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, s16 offset) { diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h index d137a1ee8d..71597bbfd6 100644 --- a/Source/Core/Common/Src/ArmEmitter.h +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -359,6 +359,7 @@ private: u32 EncodeVn(ARMReg Vn); u32 EncodeVm(ARMReg Vm); void WriteVFPDataOp(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm); + void WriteVFPDataOp6bit(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm, u32 bit6); void Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); From 39a8645ffce5204b248dccc979d47a21687d37df Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 17 Sep 2013 22:07:57 +0000 Subject: [PATCH 214/267] [ARM] Fix the FPR cache to not have to dump registers after every instruction. Add mullwox instruction. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp | 1 - .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 3 +++ .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 2 +- .../Core/Src/PowerPC/JitArm32/JitFPRCache.cpp | 24 +++++++------------ 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp index c7cdb81d21..8b11840682 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp @@ -483,7 +483,6 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo BKPT(0x7777); } JitArmTables::CompileInstruction(ops[i]); - fpr.Flush(); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) { // Don't do this yet diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index 38a6f0c537..3aeea58e50 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -249,6 +249,7 @@ void JitArm::arith(UGeckoInstruction inst) isUnsigned = true; case 235: // mullwx case 266: + case 747: // mullwox case 778: // both addx if (gpr.IsImm(a)) { @@ -325,6 +326,7 @@ void JitArm::arith(UGeckoInstruction inst) gpr.SetImmediate(a, ~Or(Imm[0], Imm[1])); dest = a; break; + case 747: case 235: gpr.SetImmediate(d, Mul(Imm[0], Imm[1])); break; @@ -475,6 +477,7 @@ void JitArm::arith(UGeckoInstruction inst) ORR(RA, RS, RB); MVNS(RA, RA); break; + case 747: case 235: RD = gpr.R(d); RA = gpr.R(a); diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp index 514cce035b..675907d199 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -320,7 +320,7 @@ static GekkoOPTemplate table31_2[] = {75, &JitArm::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, {11, &JitArm::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, {235, &JitArm::arith}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {747, &JitArm::Default}, //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {747, &JitArm::arith}, //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, {104, &JitArm::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {40, &JitArm::arith}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {552, &JitArm::arith}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp index 802f767f72..27363112fc 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp @@ -53,8 +53,8 @@ ARMReg *ArmFPRCache::GetPPCAllocationOrder(int &count) // the ppc side. static ARMReg allocationOrder[] = { - D4, D5, D6, D7, D8, D9, D10, D11, D12, D13, - D14, D15, D16, D17, D18, D19, D20, D21, D22, + D4, D5, D6, D7, D8, D9, D10, D11, D12, D13, + D14, D15, D16, D17, D18, D19, D20, D21, D22, D23, D24, D25, D26, D27, D28, D29, D30, D31 }; count = sizeof(allocationOrder) / sizeof(const int); @@ -126,17 +126,11 @@ bool ArmFPRCache::FindFreeRegister(u32 ®index) ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad) { u32 lastRegIndex = GetLeastUsedRegister(true); - + if (_regs[preg][PS1].GetType() != REG_NOTLOADED) { u8 a = _regs[preg][PS1].GetRegIndex(); ArmCRegs[a].LastLoad = 0; - if (_regs[preg][PS1].GetType() == REG_AWAY && preLoad) - { - s16 offset = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); - emit->VLDR(ArmCRegs[a].Reg, R9, offset); - _regs[preg][PS1].LoadToReg(a); - } return ArmCRegs[a].Reg; } @@ -144,12 +138,13 @@ ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad) if (FindFreeRegister(regindex)) { s16 offset = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); - emit->VLDR(ArmCRegs[regindex].Reg, R9, offset); ArmCRegs[regindex].PPCReg = preg; ArmCRegs[regindex].LastLoad = 0; + ArmCRegs[regindex].PS1 = PS1; _regs[preg][PS1].LoadToReg(regindex); + emit->VLDR(ArmCRegs[regindex].Reg, R9, offset); return ArmCRegs[regindex].Reg; } @@ -158,16 +153,15 @@ ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad) s16 offsetNew = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0); emit->VSTR(ArmCRegs[lastRegIndex].Reg, R9, offsetOld); - emit->VLDR(ArmCRegs[lastRegIndex].Reg, R9, offsetNew); - _regs[ArmCRegs[lastRegIndex].PPCReg][PS1].Flush(); + _regs[ArmCRegs[lastRegIndex].PPCReg][ArmCRegs[lastRegIndex].PS1].Flush(); ArmCRegs[lastRegIndex].PPCReg = preg; ArmCRegs[lastRegIndex].LastLoad = 0; ArmCRegs[lastRegIndex].PS1 = PS1; _regs[preg][PS1].LoadToReg(lastRegIndex); - + emit->VLDR(ArmCRegs[lastRegIndex].Reg, R9, offsetNew); return ArmCRegs[lastRegIndex].Reg; } @@ -185,7 +179,7 @@ void ArmFPRCache::Flush() { for (u8 a = 0; a < 32; ++a) { - if (_regs[a][0].GetType() == REG_REG) + if (_regs[a][0].GetType() != REG_NOTLOADED) { s16 offset = PPCSTATE_OFF(ps) + (a * 16); u32 regindex = _regs[a][0].GetRegIndex(); @@ -195,7 +189,7 @@ void ArmFPRCache::Flush() ArmCRegs[regindex].LastLoad = 0; _regs[a][0].Flush(); } - if (_regs[a][1].GetType() == REG_REG) + if (_regs[a][1].GetType() != REG_NOTLOADED) { s16 offset = PPCSTATE_OFF(ps) + (a * 16) + 8; u32 regindex = _regs[a][1].GetRegIndex(); From 6cc30f3b236189ef142ac7606c6e0b70c8b67582 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 18 Sep 2013 02:23:47 +0200 Subject: [PATCH 215/267] Revert "ogl: change the default buffer upload on osx+nvidia" This reverts commit 3b0b5155e8335d3645ed5860682ecb1975d8c342. It seems that both unsync upload methods are broken on osx+nvidia, so switch back to the default one :-( --- Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp index 89c3cd0f28..814a628d1c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp @@ -21,12 +21,8 @@ StreamBuffer::StreamBuffer(u32 type, size_t size, StreamType uploadType) { glGenBuffers(1, &m_buffer); - bool nvidia = false; + bool nvidia = !strcmp(g_ogl_config.gl_vendor, "NVIDIA Corporation"); -#ifndef __APPLE__ - // OSX also reports to be nvidia, but the driver is self written and doesn't act like the windows nvidia driver. - nvidia = !strcmp(g_ogl_config.gl_vendor, "NVIDIA Corporation"); -#endif if(m_uploadtype & STREAM_DETECT) { // TODO: move this to InitBackendInfo From 197b31735762a29763ece77ee35f31e36a922f81 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 17 Sep 2013 21:27:37 -0400 Subject: [PATCH 216/267] Fix indentation in function PSO_MakeSaveGameValid() in GCMemcard.cpp. Also move the iterator variable for a for loop into the loop statement in function CARD_GetSerialNo() --- Source/Core/Core/Src/HW/GCMemcard.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index c51d3221e3..4da694b123 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -1324,8 +1324,8 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2) { u32 serial[8]; - int i; - for (i = 0; i < 8; i++) + + for (int i = 0; i < 8; i++) { memcpy(&serial[i], (u8 *) &hdr+(i*4), 4); } @@ -1429,15 +1429,15 @@ s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector &Fi for (i=0; i < 256; i++) { chksum = i; - for (j=8; j > 0; j--) - { - if (chksum & 1) - chksum = (chksum>>1)^0xEDB88320; - else - chksum >>= 1; - } + for (j=8; j > 0; j--) + { + if (chksum & 1) + chksum = (chksum>>1)^0xEDB88320; + else + chksum >>= 1; + } - crc32LUT[i] = chksum; + crc32LUT[i] = chksum; } // PSO initial crc32 value From db7f8697bad630537d0ba1de250d84b9d8587236 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 18 Sep 2013 01:57:01 -0400 Subject: [PATCH 217/267] [Android] Use a simpler "startActivity()" call in DolphinEmulator.java. Turns out the other one isn't 4.0 compatible, but actually only 4.1 and up. Also, in this case, we really don't actually care about the saved instance state bundle. --- .../Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 13a6adbe4e..9c27615b14 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -59,7 +59,7 @@ public final class DolphinEmulator extends Activity if (savedInstanceState == null) { Intent GameListIntent = new Intent(this, GameListActivity.class); - startActivity(GameListIntent, savedInstanceState); + startActivity(GameListIntent); String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; String ConfigDir = BaseDir + File.separator + "Config"; From 24a44ecfb86e4c02b592908d8ec4430b9aea9c26 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 18 Sep 2013 02:36:48 -0500 Subject: [PATCH 218/267] [ANDROID] Add two new DriverDetails bugs for Adreno. V45 of the driver has broken shader compilation with UBOs in the shaders, this is most likely fixed with V53 found in the Nexus 5. Add a bug for issue surrounding on screentext and doing a glClear after swap causes screen swizzling and zero frames rendered respectively. On the Java side, pass in the dimensions of the screen swapped since there is an issue with Adreno where it rotates the output 90 degrees for some reason. Disable the GLSL shader cache on Android for now due to the inability to cleanly exit the emulator, this tends to cause the cache to get corrupted. All this together fixes rendering with Adreno 3xx GPUs with driver version v14 and above. In particular my Galaxy S4 still resets with this without the root commands, but my HTC Droid DNA and LG G2 is fine. This must be due to particular 'enhancements' that the Samsung kernel has over the other ones. The speed on Adreno has yet to be optimized, so it will most likely be slow still. Faster than the software rasterizer in any case. The ARMJIT is still broken in at this point, so not much fun can be had. --- .../dolphinemu/EmulationActivity.java | 16 ++++++- .../settings/VideoSettingsFragment.java | 22 +++++----- Source/Core/VideoCommon/Src/DriverDetails.cpp | 2 + Source/Core/VideoCommon/Src/DriverDetails.h | 16 +++++++ Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 44 +++++++++++-------- 5 files changed, 69 insertions(+), 31 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java index 4c5eb4d978..784839470a 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java @@ -3,13 +3,16 @@ package org.dolphinemu.dolphinemu; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.preference.PreferenceManager; import android.util.DisplayMetrics; import android.view.*; import android.view.WindowManager.LayoutParams; import org.dolphinemu.dolphinemu.settings.InputConfigFragment; +import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment; import java.util.List; @@ -52,7 +55,18 @@ public final class EmulationActivity extends Activity // and set on the native side of the code so the emulator can actually // load the game. Intent gameToEmulate = getIntent(); - NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight); + + // Due to a bug in Adreno, it renders the screen rotated 90 degrees when using OpenGL + // Flip the width and height when on Adreno to work around this. + // Mali isn't affected by this bug. + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + if (prefs.getString("gpuPref", "Software Rendering").equals("OGL") + && VideoSettingsFragment.SupportsGLES3() + && VideoSettingsFragment.m_GLVendor.equals("Qualcomm")) + NativeLibrary.SetDimensions((int)screenHeight, (int)screenWidth); + else + NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight); + NativeLibrary.SetFilename(gameToEmulate.getStringExtra("SelectedGame")); Running = true; diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index 9f7448765b..498e6607b1 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -6,15 +6,6 @@ package org.dolphinemu.dolphinemu.settings; -import javax.microedition.khronos.egl.EGL10; -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.egl.EGLContext; -import javax.microedition.khronos.egl.EGLDisplay; -import javax.microedition.khronos.egl.EGLSurface; -import javax.microedition.khronos.opengles.GL10; - -import org.dolphinemu.dolphinemu.R; - import android.app.Activity; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; @@ -23,12 +14,19 @@ import android.preference.ListPreference; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; +import org.dolphinemu.dolphinemu.R; + +import javax.microedition.khronos.egl.*; +import javax.microedition.khronos.opengles.GL10; /** * Responsible for handling the loading of the video preferences. */ public final class VideoSettingsFragment extends PreferenceFragment { + public static String m_GLVersion; + public static String m_GLVendor; + public static String m_GLRenderer; private Activity m_activity; /** @@ -138,9 +136,9 @@ public final class VideoSettingsFragment extends PreferenceFragment public static boolean SupportsGLES3() { VersionCheck mbuffer = new VersionCheck(); - String m_GLVersion = mbuffer.getVersion(); - String m_GLVendor = mbuffer.getVendor(); - String m_GLRenderer = mbuffer.getRenderer(); + m_GLVersion = mbuffer.getVersion(); + m_GLVendor = mbuffer.getVendor(); + m_GLRenderer = mbuffer.getRenderer(); boolean mSupportsGLES3 = false; diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp index cdecc71cd1..779edf91e8 100644 --- a/Source/Core/VideoCommon/Src/DriverDetails.cpp +++ b/Source/Core/VideoCommon/Src/DriverDetails.cpp @@ -30,6 +30,8 @@ namespace DriverDetails {VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_NODYNUBOACCESS, 14.0, -1.0, true}, {VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENCENTROID, 14.0, -1.0, true}, {VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENINFOLOG, -1.0, -1.0, true}, + {VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_ANNIHILATEDUBOS, 41.0, 46.0, true}, + {VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENSWAP, -1.0, -1.0, true}, {VENDOR_MESA, DRIVER_NOUVEAU, BUG_BROKENUBO, 900, 916, true}, {VENDOR_MESA, DRIVER_R600, BUG_BROKENUBO, 900, 913, true}, {VENDOR_MESA, DRIVER_I965, BUG_BROKENUBO, 900, 920, true}, diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h index dc0d2900eb..a9a9b40f54 100644 --- a/Source/Core/VideoCommon/Src/DriverDetails.h +++ b/Source/Core/VideoCommon/Src/DriverDetails.h @@ -99,6 +99,22 @@ namespace DriverDetails // to be broken. We just get flickering/black rendering when using pinned memory here -- degasus - 2013/08/20 // Please see issue #6105 on google code. Let's hope buffer storage solves this issues. BUG_BROKENPINNEDMEMORY, + // Bug: Entirely broken UBOs + // Affected devices: Qualcomm/Adreno + // Started Version: ? (Noticed on v45) + // Ended Version: -1 + // Uniform buffers are entirely broken on Qualcomm drivers with v45 + // Trying to use the uniform buffers causes a malloc to fail inside the driver + // To be safe, blanket drivers from v41 - v45 + BUG_ANNIHILATEDUBOS, + // Bug : Can't draw on screen text and clear correctly. + // Affected devices: Qualcomm/Adreno + // Started Version: ? + // Ended Version: ? + // Current code for drawing on screen text and clearing the framebuffer doesn't work on Adreno + // Drawing on screen text causes the whole screen to swizzle in a terrible fashion + // Clearing the framebuffer causes one to never see a frame. + BUG_BROKENSWAP, }; // Initializes our internal vendor, device family, and driver version diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index a5a50d28ff..352058c26f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -372,11 +372,15 @@ Renderer::Renderer() GLFunc::Init(); WARN_LOG(VIDEO, "Running the OpenGL ES 3 backend!"); g_Config.backend_info.bSupportsDualSourceBlend = false; - g_Config.backend_info.bSupportsGLSLUBO = true; + g_Config.backend_info.bSupportsGLSLUBO = !DriverDetails::HasBug(DriverDetails::BUG_ANNIHILATEDUBOS); g_Config.backend_info.bSupportsPrimitiveRestart = true; g_Config.backend_info.bSupportsEarlyZ = false; - + +#ifdef ANDROID + g_ogl_config.bSupportsGLSLCache = false; +#else g_ogl_config.bSupportsGLSLCache = true; +#endif g_ogl_config.bSupportsGLPinnedMemory = false; g_ogl_config.bSupportsGLSync = true; g_ogl_config.bSupportsGLBaseVertex = false; @@ -1557,31 +1561,35 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (XFBWrited) s_fps = UpdateFPSCounter(); // --------------------------------------------------------------------- - GL_REPORT_ERRORD(); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENSWAP)) + { + GL_REPORT_ERRORD(); - DrawDebugInfo(); - DrawDebugText(); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_REPORT_ERRORD(); - - // Do our OSD callbacks - OSD::DoCallbacks(OSD::OSD_ONFRAME); - OSD::DrawMessages(); - GL_REPORT_ERRORD(); + DrawDebugInfo(); + DrawDebugText(); + GL_REPORT_ERRORD(); + + // Do our OSD callbacks + OSD::DoCallbacks(OSD::OSD_ONFRAME); + OSD::DrawMessages(); + GL_REPORT_ERRORD(); + } // Copy the rendered frame to the real window GLInterface->Swap(); GL_REPORT_ERRORD(); // Clear framebuffer - glClearColor(0, 0, 0, 0); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - - GL_REPORT_ERRORD(); + if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENSWAP)) + { + glClearColor(0, 0, 0, 0); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + GL_REPORT_ERRORD(); + } if(s_vsync != g_ActiveConfig.IsVSync()) { From 28f2bd310da342ad24d3108e0c68c972d2dc65ff Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 18 Sep 2013 11:47:44 +0200 Subject: [PATCH 219/267] ogl: don't PanicAlert on shader compiler warnings --- .../Src/ProgramShaderCache.cpp | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index b99b112f2f..5cc9ec36cd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -308,12 +308,13 @@ bool ProgramShaderCache::CompileShader ( SHADER& shader, const char* vcode, cons file << s_glsl_header << vcode << s_glsl_header << pcode << infoLog; file.close(); - PanicAlert("Failed to link shaders!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s", - szTemp, - g_ogl_config.gl_vendor, - g_ogl_config.gl_renderer, - g_ogl_config.gl_version, - infoLog); + if(linkStatus != GL_TRUE) + PanicAlert("Failed to link shaders!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s", + szTemp, + g_ogl_config.gl_vendor, + g_ogl_config.gl_renderer, + g_ogl_config.gl_version, + infoLog); delete [] infoLog; } @@ -365,13 +366,14 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code ) file << s_glsl_header << code << infoLog; file.close(); - PanicAlert("Failed to compile %s shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s", - type==GL_VERTEX_SHADER ? "vertex" : "pixel", - szTemp, - g_ogl_config.gl_vendor, - g_ogl_config.gl_renderer, - g_ogl_config.gl_version, - infoLog); + if(compileStatus != GL_TRUE) + PanicAlert("Failed to compile %s shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s", + type==GL_VERTEX_SHADER ? "vertex" : "pixel", + szTemp, + g_ogl_config.gl_vendor, + g_ogl_config.gl_renderer, + g_ogl_config.gl_version, + infoLog); delete[] infoLog; } From 7aa98a383020027309a371c32a775200929b73c0 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 18 Sep 2013 12:22:56 +0200 Subject: [PATCH 220/267] Fix loading of the 'projection hack enabled' gameini setting Fixes issue 6614. --- Source/Core/VideoCommon/Src/VideoConfig.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index e81807985a..9403af8d23 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -202,7 +202,10 @@ void VideoConfig::GameIniLoad(const char* default_ini_file, const char* local_in CHECK_SETTING("Video_Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable); CHECK_SETTING("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges); - CHECK_SETTING("Video", "ProjectionHack", iPhackvalue[0]); + // XXX: iPhackvalue[0] aka. projection hack enabled is an integer. WTF. + bool phack_enabled = iPhackvalue[0]; + CHECK_SETTING("Video", "ProjectionHack", phack_enabled); + iPhackvalue[0] = phack_enabled; CHECK_SETTING("Video", "PH_SZNear", iPhackvalue[1]); CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]); CHECK_SETTING("Video", "PH_ExtraParam", iPhackvalue[3]); From 86f6e8cc1ea0dcb6306efeffe69700ed07ed8740 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 18 Sep 2013 12:27:50 +0200 Subject: [PATCH 221/267] Better fix for issue 6614: ISOProperties should store integer settings for PHack booleans. INIFile is stupid, please kill it with fire. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 33 ++++++++++----------- Source/Core/VideoCommon/Src/VideoConfig.cpp | 5 +--- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 583aeea495..500a3014fc 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1008,40 +1008,39 @@ void CISOProperties::LoadGameConfig() SetCheckboxValueFromGameini("Video", "ZTPSpeedupHack", UseZTPSpeedupHack); // First set values from default gameini, then apply values from local gameini - bool bTemp; - GameIniDefault.Get("Video", "ProjectionHack", &bTemp); - PHackEnable->SetValue(bTemp); - if (GameIniLocal.Get("Video", "ProjectionHack", &bTemp)) - PHackEnable->SetValue(bTemp); + int iTemp; + GameIniDefault.Get("Video", "ProjectionHack", &iTemp); + PHackEnable->SetValue(iTemp); + if (GameIniLocal.Get("Video", "ProjectionHack", &iTemp)) + PHackEnable->SetValue(iTemp); GameIniDefault.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear); - if (GameIniLocal.Get("Video", "PH_SZNear", &bTemp)) - PHack_Data.PHackSZNear = bTemp; + if (GameIniLocal.GetIfExists("Video", "PH_SZNear", &iTemp)) + PHack_Data.PHackSZNear = iTemp; GameIniDefault.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar); - if (GameIniLocal.Get("Video", "PH_SZFar", &bTemp)) - PHack_Data.PHackSZFar = bTemp; + if (GameIniLocal.GetIfExists("Video", "PH_SZFar", &iTemp)) + PHack_Data.PHackSZFar = iTemp; GameIniDefault.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP); - if (GameIniLocal.Get("Video", "PH_ExtraParam", &bTemp)) - PHack_Data.PHackExP = bTemp; + if (GameIniLocal.GetIfExists("Video", "PH_ExtraParam", &iTemp)) + PHack_Data.PHackExP = iTemp; std::string sTemp; GameIniDefault.Get("Video", "PH_ZNear", &PHack_Data.PHZNear); - if (GameIniLocal.Get("Video", "PH_ZNear", &sTemp)) + if (GameIniLocal.GetIfExists("Video", "PH_ZNear", &sTemp)) PHack_Data.PHZNear = sTemp; GameIniDefault.Get("Video", "PH_ZFar", &PHack_Data.PHZFar); - if (GameIniLocal.Get("Video", "PH_ZFar", &sTemp)) + if (GameIniLocal.GetIfExists("Video", "PH_ZFar", &sTemp)) PHack_Data.PHZFar = sTemp; - int iTemp; GameIniDefault.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/); EmuState->SetSelection(iTemp); - if (GameIniLocal.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/)) + if (GameIniLocal.GetIfExists("EmuState", "EmulationStateId", &iTemp)) EmuState->SetSelection(iTemp); GameIniDefault.Get("EmuState", "EmulationIssues", &sTemp); if (!sTemp.empty()) EmuIssues->SetValue(StrToWxStr(sTemp)); - if (GameIniLocal.Get("EmuState", "EmulationIssues", &sTemp)) + if (GameIniLocal.GetIfExists("EmuState", "EmulationIssues", &sTemp)) EmuIssues->SetValue(StrToWxStr(sTemp)); EmuIssues->Enable(EmuState->GetSelection() != 0); @@ -1103,7 +1102,7 @@ bool CISOProperties::SaveGameConfig() GameIniLocal.DeleteKey((section), (key)); \ } while (0) - SAVE_IF_NOT_DEFAULT("Video", "ProjectionHack", PHackEnable->GetValue(), false); + SAVE_IF_NOT_DEFAULT("Video", "ProjectionHack", (int)PHackEnable->GetValue(), 0); SAVE_IF_NOT_DEFAULT("Video", "PH_SZNear", (PHack_Data.PHackSZNear ? 1 : 0), 0); SAVE_IF_NOT_DEFAULT("Video", "PH_SZFar", (PHack_Data.PHackSZFar ? 1 : 0), 0); SAVE_IF_NOT_DEFAULT("Video", "PH_ExtraParam", (PHack_Data.PHackExP ? 1 : 0), 0); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 9403af8d23..e81807985a 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -202,10 +202,7 @@ void VideoConfig::GameIniLoad(const char* default_ini_file, const char* local_in CHECK_SETTING("Video_Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable); CHECK_SETTING("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges); - // XXX: iPhackvalue[0] aka. projection hack enabled is an integer. WTF. - bool phack_enabled = iPhackvalue[0]; - CHECK_SETTING("Video", "ProjectionHack", phack_enabled); - iPhackvalue[0] = phack_enabled; + CHECK_SETTING("Video", "ProjectionHack", iPhackvalue[0]); CHECK_SETTING("Video", "PH_SZNear", iPhackvalue[1]); CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]); CHECK_SETTING("Video", "PH_ExtraParam", iPhackvalue[3]); From d03fb11188d147688abd19d76d818a4ba08dc060 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 18 Sep 2013 07:43:31 -0400 Subject: [PATCH 222/267] Fix an incorrect opcode for an SSE instruction in x64Emitter.cpp. CVTSD2SI should write 0x2D, not 0xF2. Also format the NormalSSEOps enum. --- Source/Core/Common/Src/x64Emitter.cpp | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index e02ac2f196..5d9f6f4735 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -38,28 +38,28 @@ static const NormalOpDef nops[11] = enum NormalSSEOps { - sseCMP = 0xC2, - sseADD = 0x58, //ADD - sseSUB = 0x5C, //SUB - sseAND = 0x54, //AND - sseANDN = 0x55, //ANDN - sseOR = 0x56, - sseXOR = 0x57, - sseMUL = 0x59, //MUL, - sseDIV = 0x5E, //DIV - sseMIN = 0x5D, //MIN - sseMAX = 0x5F, //MAX - sseCOMIS = 0x2F, //COMIS - sseUCOMIS = 0x2E, //UCOMIS - sseSQRT = 0x51, //SQRT - sseRSQRT = 0x52, //RSQRT (NO DOUBLE PRECISION!!!) + sseCMP = 0xC2, + sseADD = 0x58, //ADD + sseSUB = 0x5C, //SUB + sseAND = 0x54, //AND + sseANDN = 0x55, //ANDN + sseOR = 0x56, + sseXOR = 0x57, + sseMUL = 0x59, //MUL + sseDIV = 0x5E, //DIV + sseMIN = 0x5D, //MIN + sseMAX = 0x5F, //MAX + sseCOMIS = 0x2F, //COMIS + sseUCOMIS = 0x2E, //UCOMIS + sseSQRT = 0x51, //SQRT + sseRSQRT = 0x52, //RSQRT (NO DOUBLE PRECISION!!!) sseMOVAPfromRM = 0x28, //MOVAP from RM - sseMOVAPtoRM = 0x29, //MOVAP to RM + sseMOVAPtoRM = 0x29, //MOVAP to RM sseMOVUPfromRM = 0x10, //MOVUP from RM - sseMOVUPtoRM = 0x11, //MOVUP to RM - sseMASKMOVDQU = 0xF7, - sseLDDQU = 0xF0, - sseSHUF = 0xC6, + sseMOVUPtoRM = 0x11, //MOVUP to RM + sseMASKMOVDQU = 0xF7, + sseLDDQU = 0xF0, + sseSHUF = 0xC6, sseMOVNTDQ = 0xE7, sseMOVNTP = 0x2B, }; @@ -155,7 +155,7 @@ void OpArg::WriteRex(XEmitter *emit, int opBits, int bits, int customOp) const } void OpArg::WriteRest(XEmitter *emit, int extraBytes, X64Reg _operandReg, - bool warn_64bit_offset) const + bool warn_64bit_offset) const { if (_operandReg == 0xff) _operandReg = (X64Reg)this->operandReg; @@ -1276,7 +1276,7 @@ void XEmitter::CVTPD2PS(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x5A, true, reg void XEmitter::CVTSD2SS(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x5A, false, regOp, arg);} void XEmitter::CVTSS2SD(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x5A, false, regOp, arg);} -void XEmitter::CVTSD2SI(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0xF2, false, regOp, arg);} +void XEmitter::CVTSD2SI(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x2D, false, regOp, arg);} void XEmitter::CVTDQ2PD(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0xE6, false, regOp, arg);} void XEmitter::CVTDQ2PS(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x5B, true, regOp, arg);} From af951f467e8757cd2d2fda639aa43dbd88f8dfc7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 18 Sep 2013 10:09:32 -0400 Subject: [PATCH 223/267] [InputCommon] Fix a bug in ControllerInterface::UpdateOutput() in ControllerInterface.cpp. The variable ok_count was never incremented, which caused the function to always return false. --- .../Src/ControllerInterface/ControllerInterface.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index f2a0414bf6..bc1e115c17 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -178,11 +178,11 @@ bool ControllerInterface::UpdateOutput(const bool force) size_t ok_count = 0; - std::vector::const_iterator - d = m_devices.begin(), - e = m_devices.end(); - for (;d != e; ++d) - (*d)->UpdateOutput(); + for (auto d = m_devices.cbegin(); d != m_devices.cend(); ++d) + { + if ((*d)->UpdateOutput()) + ++ok_count; + } return (m_devices.size() == ok_count); } From 6fc21175035b91047857fa68f4cc93e2ae9dc276 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 18 Sep 2013 17:20:28 -0500 Subject: [PATCH 224/267] [ARM] Enable VMOV to move from double VFP reg to two ARM registers. --- Source/Core/Common/Src/ArmEmitter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index 33b14cfc44..4299bf692e 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -1150,7 +1150,10 @@ void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src) else { // Move 64bit To Arm reg - _dbg_assert_msg_(DYNA_REC, false, "This VMOV doesn't support moving 64bit ARM From NEON"); + ARMReg Dest2 = (ARMReg)(Dest + 1); + Src = SubBase(Src); + Write32(condition | (0xC5 << 20) | (Dest2 << 16) | (Dest << 12) \ + | (0xB << 8) | ((Dest & 0x10) << 1) | (1 << 4) | (Src & 0xF)); return; } } From 452fd84bbdfa37b16dc3da3f022ad397baf6eb5d Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 18 Sep 2013 17:21:08 -0500 Subject: [PATCH 225/267] [ANDROID] Fix ARM JIT. Is due to Android using softfp instead of hardfp. --- .../Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index 7b607adeb0..c9f42ebd36 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -307,8 +307,13 @@ void JitArm::stfd(UGeckoInstruction inst) MOVI2R(rA, (u32)&Memory::Write_F64); PUSH(4, R0, R1, R2, R3); +#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1 + VMOV(R0, v0); + MOV(R2, rB); +#else VMOV(D0, v0); MOV(R0, rB); +#endif BL(rA); @@ -321,7 +326,6 @@ void JitArm::stfdu(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITLoadStoreFloatingOff) - ARMReg RA = gpr.R(inst.RA); ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); @@ -339,8 +343,13 @@ void JitArm::stfdu(UGeckoInstruction inst) MOVI2R(rA, (u32)&Memory::Write_F64); PUSH(4, R0, R1, R2, R3); +#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1 + VMOV(R0, v0); + MOV(R2, rB); +#else VMOV(D0, v0); MOV(R0, rB); +#endif BL(rA); From ae607ea1e92403e32cf254102eb4362168413a7d Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 11 Sep 2013 03:34:05 -0400 Subject: [PATCH 226/267] Fix missing md5thread.detach() --- Source/Core/Core/Src/Movie.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 3bd01896a8..9f3ca7e795 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -447,6 +447,7 @@ bool BeginRecordingInput(int controllers) Movie::g_bClearSave = true; } std::thread md5thread(GetMD5); + md5thread.detach(); GetSettings(); } g_playMode = MODE_RECORDING; From dc73222bfc7c04530e32c82b8ad49d8a7d66b055 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 18 Sep 2013 21:51:37 -0400 Subject: [PATCH 227/267] Remove suggestion to restart dolphin if a wiimote movie desyncs, since it's no longer necessary. --- Source/Core/Core/Src/Movie.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 9f3ca7e795..129785d5a2 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -1040,7 +1040,8 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, if (size != sizeInMovie) { - PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s", (u32)sizeInMovie, (u32)size, (u32)g_currentByte, (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled (in Configure > Gamecube > Device Settings), or restarting Dolphin (Dolphin currently must be restarted every time before playing back a wiimote movie).":""); + PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s", (u32)sizeInMovie, (u32)size, (u32)g_currentByte, + (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled (in Configure > Gamecube > Device Settings)." : ""); EndPlayInput(!g_bReadOnly); return false; } From 5158aea4dcd5f317ce014059ee22be032fac23c3 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 19 Sep 2013 01:07:54 +0000 Subject: [PATCH 228/267] [ARM] Fix misuse of RBIT in crXXX, meant to use MVN. --- .../Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index c1e0678910..40a3fd9fbf 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -244,11 +244,11 @@ void JitArm::crXXX(UGeckoInstruction inst) { case 33: // crnor ORR(rA, rA, rB); - RBIT(rA, rA); + MVN(rA, rA); break; case 129: // crandc - RBIT(rB, rB); + MVN(rB, rB); AND(rA, rA, rB); break; @@ -258,7 +258,7 @@ void JitArm::crXXX(UGeckoInstruction inst) case 225: // crnand AND(rA, rA, rB); - RBIT(rA, rA); + MVN(rA, rA); break; case 257: // crand @@ -267,11 +267,11 @@ void JitArm::crXXX(UGeckoInstruction inst) case 289: // creqv EOR(rA, rA, rB); - RBIT(rA, rA); + MVN(rA, rA); break; case 417: // crorc - RBIT(rB, rB); + MVN(rA, rA); ORR(rA, rA, rB); break; From 1b1b5d210040e3c43be05275caaf004bb58fbfab Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 19 Sep 2013 02:05:57 +0000 Subject: [PATCH 229/267] [ARM] MicroOps in the branching instructions. --- .../Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp index b1a63aece6..b6bde154af 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp @@ -85,7 +85,6 @@ void JitArm::rfi(UGeckoInstruction inst) LDR(rD, R9, PPCSTATE_OFF(msr)); AND(rD, rD, rB); // rD = Masked MSR - STR(rD, R9, PPCSTATE_OFF(msr)); LDR(rB, R9, PPCSTATE_OFF(spr[SPR_SRR1])); // rB contains SRR1 here @@ -230,7 +229,6 @@ void JitArm::bcctrx(UGeckoInstruction inst) //NPC = CTR & 0xfffffffc; ARMReg rA = gpr.GetReg(); - ARMReg rB = gpr.GetReg(); if(inst.LK_3) { @@ -239,10 +237,8 @@ void JitArm::bcctrx(UGeckoInstruction inst) STR(rA, R9, PPCSTATE_OFF(spr[SPR_LR])); // ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); } - MVN(rB, 0x3); // 0xFFFFFFFC LDR(rA, R9, PPCSTATE_OFF(spr[SPR_CTR])); - AND(rA, rA, rB); - gpr.Unlock(rB); + BIC(rA, rA, 0x3); WriteExitDestInR(rA); } else @@ -264,8 +260,7 @@ void JitArm::bcctrx(UGeckoInstruction inst) FixupBranch b = B_CC(branch); LDR(rA, R9, PPCSTATE_OFF(spr[SPR_CTR])); - MVN(rB, 0x3); // 0xFFFFFFFC - AND(rA, rA, rB); + BIC(rA, rA, 0x3); if (inst.LK_3){ u32 Jumpto = js.compilerPC + 4; @@ -336,9 +331,8 @@ void JitArm::bclrx(UGeckoInstruction inst) //MOV(32, R(EAX), M(&LR)); //AND(32, R(EAX), Imm32(0xFFFFFFFC)); - MVN(rB, 0x3); // 0xFFFFFFFC LDR(rA, R9, PPCSTATE_OFF(spr[SPR_LR])); - AND(rA, rA, rB); + BIC(rA, rA, 0x3); if (inst.LK){ u32 Jumpto = js.compilerPC + 4; MOVI2R(rB, Jumpto); From 930f997f041da73a81e6b4769b33311aa8ab2e37 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 19 Sep 2013 02:06:30 +0000 Subject: [PATCH 230/267] [ARM] Fix and optimize mtcrf. --- .../Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index 40a3fd9fbf..7056441856 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -110,6 +110,7 @@ void JitArm::mtcrf(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITSystemRegistersOff) + ARMReg rA = gpr.GetReg(); // USES_CR @@ -130,16 +131,17 @@ void JitArm::mtcrf(UGeckoInstruction inst) } else { + ARMReg rB = gpr.GetReg(); + MOV(rA, gpr.R(inst.RS)); for (int i = 0; i < 8; i++) { if ((crm & (0x80 >> i)) != 0) { - MOV(rA, gpr.R(inst.RS)); - LSR(rA, rA, 28 - (i * 4)); - AND(rA, rA, 0xF); - STRB(rA, R9, PPCSTATE_OFF(cr_fast[i])); + UBFX(rB, rA, 28 - (i * 4), 4); + STRB(rB, R9, PPCSTATE_OFF(cr_fast[i])); } } + gpr.Unlock(rB); } } gpr.Unlock(rA); From 85f067780a9f00503a5b6c21904565195f50282c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 19 Sep 2013 02:08:10 +0000 Subject: [PATCH 231/267] [ARM] Reenable flush per instruction with FPR cache. Something is still very wrong. --- Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp index 8b11840682..c7cdb81d21 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp @@ -483,6 +483,7 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo BKPT(0x7777); } JitArmTables::CompileInstruction(ops[i]); + fpr.Flush(); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) { // Don't do this yet From 49fff7979b5cf99f60a82af40995d35d8215bbe8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 18 Sep 2013 22:17:23 -0400 Subject: [PATCH 232/267] [Android] Make the FolderBrowser extend a ListFragment instead of a regular fragment. Lets us get rid of the need for an AdapterView.OnItemClickListener when handling list item clicks. Simplifies the implementation of the FolderBrowser a tiny bit. --- .../folderbrowser/FolderBrowser.java | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java index 648cf23d70..e28f30206d 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java @@ -7,14 +7,13 @@ package org.dolphinemu.dolphinemu.folderbrowser; import android.app.Activity; -import android.app.Fragment; +import android.app.ListFragment; import android.os.Bundle; import android.os.Environment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.ListView; import java.io.File; @@ -36,12 +35,12 @@ import org.dolphinemu.dolphinemu.gamelist.GameListActivity; * Note that this file browser does not display files * or directories that are hidden */ -public final class FolderBrowser extends Fragment +public final class FolderBrowser extends ListFragment { private Activity m_activity; private FolderBrowserAdapter adapter; - private ListView mDrawerList; - private View rootView; + private ListView mFolderBrowserList; + private ListView rootView; private static File currentDir = null; // Populates the FolderView with the given currDir's contents. @@ -94,9 +93,23 @@ public final class FolderBrowser extends Fragment dir.add(0, new FolderBrowserItem("..", getString(R.string.parent_directory), currDir.getParent())); adapter = new FolderBrowserAdapter(m_activity, R.layout.gamelist_folderbrowser_list, dir); - mDrawerList = (ListView) rootView.findViewById(R.id.gamelist); - mDrawerList.setAdapter(adapter); - mDrawerList.setOnItemClickListener(mMenuItemClickListener); + mFolderBrowserList = (ListView) rootView.findViewById(R.id.gamelist); + mFolderBrowserList.setAdapter(adapter); + } + + @Override + public void onListItemClick(ListView lv, View v, int position, long id) + { + FolderBrowserItem item = adapter.getItem(position); + if(item.isDirectory()) + { + currentDir = new File(item.getPath()); + Fill(currentDir); + } + else + { + FolderSelected(); + } } @Override @@ -105,29 +118,12 @@ public final class FolderBrowser extends Fragment if(currentDir == null) currentDir = new File(Environment.getExternalStorageDirectory().getPath()); - rootView = inflater.inflate(R.layout.gamelist_listview, container, false); + rootView = (ListView) inflater.inflate(R.layout.gamelist_listview, container, false); Fill(currentDir); - return mDrawerList; + return mFolderBrowserList; } - private final AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener() - { - public void onItemClick(AdapterView parent, View view, int position, long id) - { - FolderBrowserItem item = adapter.getItem(position); - if(item.isDirectory()) - { - currentDir = new File(item.getPath()); - Fill(currentDir); - } - else - { - FolderSelected(); - } - } - }; - @Override public void onAttach(Activity activity) { From 86d70cee152f6ce01696f8439cf874e32a8662a1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 20 Sep 2013 14:50:27 -0400 Subject: [PATCH 233/267] Turns out CVTSD2SI in x64Emitter.cpp should actually use 64 bits instead of 32. Thanks for pointing that out hk.konpie. --- Source/Core/Common/Src/x64Emitter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 5d9f6f4735..a5d7cb2f0f 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -1276,7 +1276,7 @@ void XEmitter::CVTPD2PS(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x5A, true, reg void XEmitter::CVTSD2SS(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x5A, false, regOp, arg);} void XEmitter::CVTSS2SD(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x5A, false, regOp, arg);} -void XEmitter::CVTSD2SI(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x2D, false, regOp, arg);} +void XEmitter::CVTSD2SI(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x2D, false, regOp, arg);} void XEmitter::CVTDQ2PD(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0xE6, false, regOp, arg);} void XEmitter::CVTDQ2PS(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x5B, true, regOp, arg);} From 95aac4ff6841b6557e3d74fd161bc7e96ce2b61e Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Thu, 19 Sep 2013 12:06:30 -0700 Subject: [PATCH 234/267] if a memcard is set to read only, fail more gracefully by reporting when writes to the file fail instead of saying that the file does not exist. --- Source/Core/Core/Src/HW/GCMemcard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 4da694b123..b4aa9993de 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -52,7 +52,9 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) : m_valid(false) , m_fileName(filename) { - File::IOFile mcdFile(m_fileName, "r+b"); + // Currently there is a string freeze. instead of adding a new message about needing r/w + // open file read only, if write is denied the error will be reported at that point + File::IOFile mcdFile(m_fileName, "rb"); if (!mcdFile.IsOpen()) { if (!forceCreation && !AskYesNoT("\"%s\" does not exist.\n Create a new 16MB Memcard?", filename)) From d334a9bc23a7641143937042658f64fc9c1b7a92 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 19 Sep 2013 21:10:32 -0400 Subject: [PATCH 235/267] Fix stack misalignment issues. - Call ABI_AlignStack even on x86-64. - Have ABI_AlignStack respect the difference in current alignment between the root JIT function, which has a prolog, and ProtectFunction thunks, which do not. This was causing many games to crash on start on OS X. Since this might otherwise mean changing the stack pointer before every call... - Have one prolog/epilog function rather than two (one of which definitely did not do what it was thought to do), and make it actually work like a normal one, so that the stack frame shows up properly in the debugger. There should be no performance impact. --- Source/Core/Common/Src/x64ABI.cpp | 239 ++++++++----------- Source/Core/Common/Src/x64Emitter.h | 11 +- Source/Core/Common/Src/x64Thunk.cpp | 20 +- Source/Core/VideoCommon/Src/VertexLoader.cpp | 5 +- Source/Core/VideoCommon/Src/x64DLCache.cpp | 5 +- 5 files changed, 116 insertions(+), 164 deletions(-) diff --git a/Source/Core/Common/Src/x64ABI.cpp b/Source/Core/Common/Src/x64ABI.cpp index c47ea02fb4..b5726947fc 100644 --- a/Source/Core/Common/Src/x64ABI.cpp +++ b/Source/Core/Common/Src/x64ABI.cpp @@ -10,38 +10,51 @@ using namespace Gen; // Shared code between Win64 and Unix64 -// Sets up a __cdecl function. -void XEmitter::ABI_EmitPrologue(int maxCallParams) -{ -#ifdef _M_IX86 - // Don't really need to do anything -#elif defined(_M_X64) -#if _WIN32 - int stacksize = ((maxCallParams + 1) & ~1) * 8 + 8; - // Set up a stack frame so that we can call functions - // TODO: use maxCallParams - SUB(64, R(RSP), Imm8(stacksize)); -#endif +unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog) { + // On platforms other than Windows 32-bit: At the beginning of a function, + // the stack pointer is 4/8 bytes less than a multiple of 16; however, the + // function prolog immediately subtracts an appropriate amount to align + // it, so no alignment is required around a call. + // In the functions generated by ThunkManager::ProtectFunction, we add the + // necessary subtraction (and 0x20 bytes shadow space for Win64) into this + // rather than having a separate prolog. + // On Windows 32-bit, the required alignment is only 4 bytes, so we just + // ensure that the frame size isn't misaligned. +#ifdef _M_X64 + // expect frameSize == 0 + frameSize = noProlog ? 0x28 : 0; +#elif defined(_WIN32) + frameSize = (frameSize + 3) & -4; #else -#error Arch not supported + unsigned int existingAlignment = noProlog ? 0xc : 0; + frameSize -= existingAlignment; + frameSize = (frameSize + 15) & -16; + frameSize += existingAlignment; #endif + return frameSize; } -void XEmitter::ABI_EmitEpilogue(int maxCallParams) -{ -#ifdef _M_IX86 - RET(); -#elif defined(_M_X64) -#ifdef _WIN32 - int stacksize = ((maxCallParams+1)&~1)*8 + 8; - ADD(64, R(RSP), Imm8(stacksize)); -#endif - RET(); +void XEmitter::ABI_AlignStack(unsigned int frameSize, bool noProlog) { + unsigned int fillSize = + ABI_GetAlignedFrameSize(frameSize, noProlog) - frameSize; + if (fillSize != 0) { +#ifdef _M_X64 + SUB(64, R(RSP), Imm8(fillSize)); #else -#error Arch not supported - - + SUB(32, R(ESP), Imm8(fillSize)); #endif + } +} + +void XEmitter::ABI_RestoreStack(unsigned int frameSize, bool noProlog) { + unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize, noProlog); + if (alignedSize != 0) { +#ifdef _M_X64 + ADD(64, R(RSP), Imm8(alignedSize)); +#else + ADD(32, R(ESP), Imm8(alignedSize)); +#endif + } } #ifdef _M_IX86 // All32 @@ -65,7 +78,7 @@ void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { PUSH(16, Imm16(param2)); PUSH(32, Imm32(param1)); CALL(func); - ABI_RestoreStack(1 * 2 + 1 * 4); + ABI_AlignStack(1 * 2 + 1 * 4); } void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { @@ -156,60 +169,27 @@ void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) } void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - // Note: 4 * 4 = 16 bytes, so alignment is preserved. PUSH(EBP); + MOV(32, R(EBP), R(ESP)); PUSH(EBX); PUSH(ESI); PUSH(EDI); + SUB(32, R(ESP), Imm8(0xc)); } void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { + ADD(32, R(ESP), Imm8(0xc)); POP(EDI); POP(ESI); POP(EBX); POP(EBP); } -unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { - frameSize += 4; // reserve space for return address - unsigned int alignedSize = -#ifdef __GNUC__ - (frameSize + 15) & -16; -#else - (frameSize + 3) & -4; -#endif - return alignedSize; -} - - -void XEmitter::ABI_AlignStack(unsigned int frameSize) { -// Mac OS X requires the stack to be 16-byte aligned before every call. -// Linux requires the stack to be 16-byte aligned before calls that put SSE -// vectors on the stack, but since we do not keep track of which calls do that, -// it is effectively every call as well. -// Windows binaries compiled with MSVC do not have such a restriction*, but I -// expect that GCC on Windows acts the same as GCC on Linux in this respect. -// It would be nice if someone could verify this. -// *However, the MSVC optimizing compiler assumes a 4-byte-aligned stack at times. - unsigned int fillSize = - ABI_GetAlignedFrameSize(frameSize) - (frameSize + 4); - if (fillSize != 0) { - SUB(32, R(ESP), Imm8(fillSize)); - } -} - -void XEmitter::ABI_RestoreStack(unsigned int frameSize) { - unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize); - alignedSize -= 4; // return address is POPped at end of call - if (alignedSize != 0) { - ADD(32, R(ESP), Imm8(alignedSize)); - } -} - #else //64bit // Common functions void XEmitter::ABI_CallFunction(void *func) { + ABI_AlignStack(0); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL && distance < 0xFFFFFFFF80000000ULL) { @@ -219,9 +199,11 @@ void XEmitter::ABI_CallFunction(void *func) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32((u32)param1)); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL @@ -232,9 +214,11 @@ void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32((u32)param2)); u64 distance = u64(func) - (u64(code) + 5); @@ -246,9 +230,11 @@ void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL @@ -259,9 +245,11 @@ void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); u64 distance = u64(func) - (u64(code) + 5); @@ -273,9 +261,11 @@ void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -288,9 +278,11 @@ void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(64, R(ABI_PARAM3), Imm64((u64)param3)); @@ -303,9 +295,11 @@ void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *par } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 param3, void *param4) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -319,9 +313,11 @@ void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 para } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 param3) { + ABI_AlignStack(0); MOV(64, R(ABI_PARAM1), Imm64((u64)param1)); MOV(64, R(ABI_PARAM2), Imm64((u64)param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -334,10 +330,12 @@ void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 p } else { CALL(func); } + ABI_RestoreStack(0); } // Pass a register as a parameter. void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) { + ABI_AlignStack(0); if (reg1 != ABI_PARAM1) MOV(32, R(ABI_PARAM1), R(reg1)); u64 distance = u64(func) - (u64(code) + 5); @@ -349,10 +347,12 @@ void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) { } else { CALL(func); } + ABI_RestoreStack(0); } // Pass two registers as parameters. void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2) { + ABI_AlignStack(0); if (reg2 != ABI_PARAM1) { if (reg1 != ABI_PARAM1) MOV(64, R(ABI_PARAM1), R(reg1)); @@ -373,10 +373,12 @@ void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2) { + ABI_AlignStack(0); if (!arg1.IsSimpleReg(ABI_PARAM1)) MOV(32, R(ABI_PARAM1), arg1); MOV(32, R(ABI_PARAM2), Imm32(param2)); @@ -389,10 +391,12 @@ void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2 } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) { + ABI_AlignStack(0); if (!arg1.IsSimpleReg(ABI_PARAM1)) MOV(32, R(ABI_PARAM1), arg1); u64 distance = u64(func) - (u64(code) + 5); @@ -404,42 +408,9 @@ void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) } else { CALL(func); } -} - -unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { - return frameSize; -} - -#ifdef _WIN32 - -// Win64 Specific Code -void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - //we only want to do this once - PUSH(RBX); - PUSH(RSI); - PUSH(RDI); - PUSH(RBP); - PUSH(R12); - PUSH(R13); - PUSH(R14); - PUSH(R15); - //TODO: Also preserve XMM0-3? - ABI_AlignStack(0); -} - -void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { ABI_RestoreStack(0); - POP(R15); - POP(R14); - POP(R13); - POP(R12); - POP(RBP); - POP(RDI); - POP(RSI); - POP(RBX); } -// Win64 Specific Code void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { PUSH(RCX); PUSH(RDX); @@ -449,12 +420,11 @@ void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { PUSH(R9); PUSH(R10); PUSH(R11); - //TODO: Also preserve XMM0-15? - ABI_AlignStack(0); + PUSH(R11); } void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { - ABI_RestoreStack(0); + POP(R11); POP(R11); POP(R10); POP(R9); @@ -465,66 +435,59 @@ void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { POP(RCX); } -void XEmitter::ABI_AlignStack(unsigned int /*frameSize*/) { + +#ifdef _WIN32 +// Win64 Specific Code + +void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { + //we only want to do this once + PUSH(RBP); + MOV(64, R(RBP), R(RSP)); + PUSH(RBX); + PUSH(RSI); + PUSH(RDI); + PUSH(R12); + PUSH(R13); + PUSH(R14); + PUSH(R15); SUB(64, R(RSP), Imm8(0x28)); + //TODO: Also preserve XMM0-3? } -void XEmitter::ABI_RestoreStack(unsigned int /*frameSize*/) { +void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { ADD(64, R(RSP), Imm8(0x28)); + POP(R15); + POP(R14); + POP(R13); + POP(R12); + POP(RDI); + POP(RSI); + POP(RBX); + POP(RBP); } #else // Unix64 Specific Code + void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - PUSH(RBX); PUSH(RBP); + MOV(64, R(RBP), R(RSP)); + PUSH(RBX); PUSH(R12); PUSH(R13); PUSH(R14); PUSH(R15); - PUSH(R15); //just to align stack. duped push/pop doesn't hurt. + SUB(64, R(RSP), Imm8(8)); } void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { - POP(R15); + ADD(64, R(RSP), Imm8(8)); POP(R15); POP(R14); POP(R13); POP(R12); - POP(RBP); POP(RBX); -} - -void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { - PUSH(RCX); - PUSH(RDX); - PUSH(RSI); - PUSH(RDI); - PUSH(R8); - PUSH(R9); - PUSH(R10); - PUSH(R11); - PUSH(R11); -} - -void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { - POP(R11); - POP(R11); - POP(R10); - POP(R9); - POP(R8); - POP(RDI); - POP(RSI); - POP(RDX); - POP(RCX); -} - -void XEmitter::ABI_AlignStack(unsigned int /*frameSize*/) { - SUB(64, R(RSP), Imm8(0x08)); -} - -void XEmitter::ABI_RestoreStack(unsigned int /*frameSize*/) { - ADD(64, R(RSP), Imm8(0x08)); + POP(RBP); } #endif // WIN32 diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index b068579a3a..c42c955ec4 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -652,14 +652,9 @@ public: void ABI_PushAllCallerSavedRegsAndAdjustStack(); void ABI_PopAllCallerSavedRegsAndAdjustStack(); - unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize); - void ABI_AlignStack(unsigned int frameSize); - void ABI_RestoreStack(unsigned int frameSize); - - // Sets up a __cdecl function. - // Only x64 really needs the parameter count. - void ABI_EmitPrologue(int maxCallParams); - void ABI_EmitEpilogue(int maxCallParams); + unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog = false); + void ABI_AlignStack(unsigned int frameSize, bool noProlog = false); + void ABI_RestoreStack(unsigned int frameSize, bool noProlog = false); #ifdef _M_IX86 inline int ABI_GetNumXMMRegs() { return 8; } diff --git a/Source/Core/Common/Src/x64Thunk.cpp b/Source/Core/Common/Src/x64Thunk.cpp index efb876ce81..a9c19060de 100644 --- a/Source/Core/Common/Src/x64Thunk.cpp +++ b/Source/Core/Common/Src/x64Thunk.cpp @@ -91,35 +91,27 @@ void *ThunkManager::ProtectFunction(void *function, int num_params) PanicAlert("Trying to protect functions before the emu is started. Bad bad bad."); const u8 *call_point = GetCodePtr(); - // Make sure to align stack. #ifdef _M_X64 -#ifdef _WIN32 - SUB(64, R(ESP), Imm8(0x28)); -#else - SUB(64, R(ESP), Imm8(0x8)); -#endif + // Make sure to align stack. + ABI_AlignStack(0, true); CALL((void*)save_regs); CALL((void*)function); CALL((void*)load_regs); -#ifdef _WIN32 - ADD(64, R(ESP), Imm8(0x28)); -#else - ADD(64, R(ESP), Imm8(0x8)); -#endif + ABI_RestoreStack(0, true); RET(); #else CALL((void*)save_regs); // Since parameters are in the previous stack frame, not in registers, this takes some // trickery : we simply re-push the parameters. might not be optimal, but that doesn't really // matter. - ABI_AlignStack(num_params * 4); + ABI_AlignStack(num_params * 4, true); unsigned int alignedSize = ABI_GetAlignedFrameSize(num_params * 4); for (int i = 0; i < num_params; i++) { // ESP is changing, so we do not need i - PUSH(32, MDisp(ESP, alignedSize - 4)); + PUSH(32, MDisp(ESP, alignedSize)); } CALL(function); - ABI_RestoreStack(num_params * 4); + ABI_RestoreStack(num_params * 4, true); CALL((void*)load_regs); RET(); #endif diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index babaff83a5..825e9c6558 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -217,7 +217,7 @@ void VertexLoader::CompileVertexTranslator() PanicAlert("Trying to recompile a vertex translator"); m_compiledCode = GetCodePtr(); - ABI_EmitPrologue(4); + ABI_PushAllCalleeSavedRegsAndAdjustStack(); // Start loop here const u8 *loop_start = GetCodePtr(); @@ -499,7 +499,8 @@ void VertexLoader::CompileVertexTranslator() #endif J_CC(CC_NZ, loop_start, true); - ABI_EmitEpilogue(4); + ABI_PopAllCalleeSavedRegsAndAdjustStack(); + RET(); #endif m_NativeFmt->Initialize(vtx_decl); } diff --git a/Source/Core/VideoCommon/Src/x64DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp index ae32ea5ea9..b412c2e274 100644 --- a/Source/Core/VideoCommon/Src/x64DLCache.cpp +++ b/Source/Core/VideoCommon/Src/x64DLCache.cpp @@ -409,7 +409,7 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) emitter.AlignCode4(); dl->compiled_code = emitter.GetCodePtr(); - emitter.ABI_EmitPrologue(4); + emitter.ABI_PushAllCalleeSavedRegsAndAdjustStack(); while (g_pVideoData < end) { @@ -572,7 +572,8 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) break; } } - emitter.ABI_EmitEpilogue(4); + emitter.ABI_PopAllCalleeSavedRegsAndAdjustStack(); + emitter.RET(); INCSTAT(stats.numDListsCalled); INCSTAT(stats.thisFrame.numDListsCalled); Statistics::SwapDL(); From d2c3222fcc2f4b44f01e115d4a373bbb26d6e016 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 21 Sep 2013 00:34:19 -0400 Subject: [PATCH 236/267] Fix copying Sys/Wii to User/Wii on startup. Fixes issue 6621. --- Source/Core/DolphinWX/Src/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 858ce1f588..efa838ecc5 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -250,7 +250,7 @@ bool DolphinApp::OnInit() #endif // Copy initial Wii NAND data from Sys to User. - File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, + File::CopyDir(File::GetSysDirectory() + WII_USER_DIR DIR_SEP, File::GetUserPath(D_WIIUSER_IDX)); File::CreateFullPath(File::GetUserPath(D_USER_IDX)); From 1fb373f4395d99728c7ea1d36775fd5c532824cd Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Sat, 21 Sep 2013 15:19:43 +1200 Subject: [PATCH 237/267] Stop dolphin from loading help.png It was never used, just wasting time and resources. This patch simply deletes two lines of code. --- Source/Core/DolphinWX/Src/Frame.h | 1 - Source/Core/DolphinWX/Src/FrameTools.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index a904a7aa5f..4870eb8f72 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -196,7 +196,6 @@ private: Toolbar_ConfigDSP, Toolbar_ConfigPAD, Toolbar_Wiimote, - Toolbar_Help, EToolbar_Max }; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index dff7e9650c..c146facec6 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -549,7 +549,6 @@ void CFrame::InitBitmaps() m_Bitmaps[Toolbar_Wiimote].LoadFile(dir + "wiimote.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Screenshot].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_FullScreen].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Help].LoadFile(dir + "help.png", wxBITMAP_TYPE_PNG); // Update in case the bitmap has been updated if (m_ToolBar != NULL) From d321aa7e7a6a202b400868ec04266eedbfed088e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 21 Sep 2013 11:24:33 -0500 Subject: [PATCH 238/267] Pull in translations from Transifex. --- Languages/po/ar.po | 231 ++--- Languages/po/ca.po | 314 ++----- Languages/po/cs.po | 366 +++----- Languages/po/de.po | 1247 ++++++++++++++---------- Languages/po/el.po | 363 +++---- Languages/po/es.po | 378 +++----- Languages/po/fa.po | 233 +---- Languages/po/fr.po | 470 ++++----- Languages/po/he.po | 5 +- Languages/po/hu.po | 251 +---- Languages/po/it.po | 392 +++----- Languages/po/ja.po | 357 +++---- Languages/po/ko.po | 300 ++---- Languages/po/nb.po | 752 +++++++-------- Languages/po/nl.po | 339 +++---- Languages/po/pl.po | 256 +---- Languages/po/pt.po | 254 ++--- Languages/po/pt_BR.po | 458 ++++----- Languages/po/ru.po | 317 +++---- Languages/po/sr.po | 72 +- Languages/po/sv.po | 403 ++++---- Languages/po/tr.po | 331 +++---- Languages/po/zh_CN.po | 1358 +++++++++++++-------------- Languages/po/zh_TW.po | 213 ++--- Source/Core/DolphinWX/Info.plist.in | 16 + 25 files changed, 3877 insertions(+), 5799 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index be516164de..47d512b89c 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -4,13 +4,15 @@ # # Translators: # mansoor, 2011 +# mansoor , 2013 +# moceap , 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" -"Last-Translator: glennricster \n" +"PO-Revision-Date: 2013-09-10 16:15+0000\n" +"Last-Translator: mansoor \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/dolphin-emu/" "language/ar/)\n" "Language: ar\n" @@ -22,7 +24,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516 msgid " (too many to display)" -msgstr "(كثير جدا العرض)" +msgstr "(عرض أشياء كثير جدًا)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:291 #: Source/Core/DolphinWX/Src/NetWindow.cpp:521 @@ -108,9 +110,9 @@ msgid "%s failed to open" msgstr "%s فشل في فتح" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s فشل في فتح" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -312,9 +314,8 @@ msgid "(off)" msgstr "(ايقاف)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^أضف " +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -401,7 +402,6 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -417,19 +417,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"تنبيه:\n" -"\n" -"سوف تلعب شبكة حاليا تعمل فقط بشكل صحيح عند استخدام الإعدادات التالية:\n" -" - Dual Core [ايقاف]\n" -" - Audio Throttle [إيقاف]\n" -" - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - ضبط عدد تحكم التي سيتم استخدامها وحدة التحكم القياسية\n" -"\n" -"على جميع اللاعبين محاولة استخدام نفس الإصدار دولفين و الإعـدادات.\n" -"تعطيل كافة بطاقات الذاكرة أو إرسالها لجميع اللاعبين قبل بدء.\n" -"لم يتم دعم تنفيذ ويموت.\n" -"\n" -"يجب عليك إعادة توجيه البرنامج منفذ الهوست!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -644,7 +631,7 @@ msgstr "تحليل" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:286 msgid "Angle" -msgstr "" +msgstr "الزاوية" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376 msgid "Anisotropic Filtering:" @@ -788,7 +775,7 @@ msgstr "سيء بداية الملف " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "ميزان لوح" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -1191,9 +1178,8 @@ msgstr "اتصال" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "ربط كيبورد يو اس بي" +msgstr "توصيل ميزان لوح" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1230,7 +1216,7 @@ msgstr "وحدة التحكم" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88 msgid "Continuous Scanning" -msgstr "" +msgstr "البحث المستمر" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:33 msgid "Control" @@ -1426,7 +1412,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "بساط الرقص" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1475,9 +1461,8 @@ msgid "Decompressing ISO" msgstr "فك ايزو" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "تحديث القائمة" +msgstr "تقليل حدود الإطار" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1594,16 +1579,12 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"تخطي الوجهة في كثير من الألعاب لمختلف التأثيرات الرسومية.\n" -"\n" -"إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1735,16 +1716,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Dolphin was unable to complete the requested action." -msgstr "" +msgstr "دولفين غير قادر على إكمال الإجراء المطلوب ." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = " -"Compatible)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1990,7 +1968,7 @@ msgstr "تمكين شاشة التوقف" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Enable Speaker Data" -msgstr "" +msgstr "تمكين بيانات مكبر صوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" @@ -2178,12 +2156,11 @@ msgstr "تنفيذ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "خروج" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "تصدير جميع الحفظ" +msgstr "تصدير جميع الحفظ الوي" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2214,7 +2191,6 @@ msgid "Export all saves" msgstr "تصدير جميع الحفظ" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" msgstr "فشل تصدير" @@ -2404,9 +2380,9 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "فشل لكتابة عنوان لملف %d" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2421,9 +2397,9 @@ msgid "Failed to write bkhdr" msgstr "فشل لكتابة bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "فشل في قراءة البيانات من ملف %d" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2536,7 +2512,7 @@ msgstr "فرض وحدة التحكم على النظام الياباني" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407 msgid "Force Texture Filtering" -msgstr "" +msgstr "نتقية الرسوميات بالقوة" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" @@ -2592,9 +2568,9 @@ msgid "Found %d results for '" msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "لا يمكن حفظ %s" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2670,7 +2646,7 @@ msgstr "تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:460 msgid "Game ID:" @@ -2686,7 +2662,7 @@ msgstr "اللعبة ليست على التوالي!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" -msgstr "" +msgstr "لم يتم العثور على اللعبة !" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" @@ -2990,14 +2966,12 @@ msgid "Import Save" msgstr "حفظ استيراد" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "حفظ استيراد" +msgstr " استيراد حفظ الوي" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "فشل تصدير" +msgstr "فشل الاستيراد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3020,9 +2994,8 @@ msgid "In Game" msgstr "تتعطل في اللعبة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "حد الإطار:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3121,7 +3094,7 @@ msgstr "الدقة الداخلية :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" -msgstr "" +msgstr " (بطيئة جدا) Interpreter" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" @@ -3301,58 +3274,48 @@ msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&تحميل الحالة" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "1 تحميل حالة " +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "2 تحميل حالة " +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "3 تحميل حالة " +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "4 تحميل حالة " +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "5 تحميل حالة " +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "6 تحميل حالة" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "7 تحميل حالة" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "8 تحميل حالة" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "1 تحميل حالة " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "1 تحميل حالة " +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3383,9 +3346,8 @@ msgid "Load State Slot 8" msgstr "8 تحميل حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "1 تحميل حالة " +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3756,7 +3718,7 @@ msgstr "لم يتم العثور على الايزو " #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "" +msgstr "لا يوجد مخرجات صوتية" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format @@ -3778,7 +3740,7 @@ msgstr "لا يوجد ملف تحميل" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "No free dir index entries" -msgstr "" +msgstr "لا يوجد مدخلات مجلدات فهرسية حرة" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 msgid "No recorded file" @@ -3875,7 +3837,7 @@ msgstr "عرض الرسائل التي تظهر على الشاشة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "تسجيل اون لاين" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -3915,11 +3877,11 @@ msgstr "OpenAL : لا يمكن فتح الجهاز %s" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "OpenCL Texture Decoder" -msgstr "" +msgstr "مفك رسوميات OpenCL" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "OpenMP Texture Decoder" -msgstr "" +msgstr "مفك رسوميات OpenMP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "" @@ -3941,15 +3903,11 @@ msgid "Orange" msgstr "البرتقالي" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"ترتيب الملفات في دليل الملفات لا تتطابق مع ترتيب كتلة\n" -"انقر بالزر الأيمن للتصدير كافة حفظ,\n" -"واستيراد وحفظ لبطاقة ذاكرة جديدة\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4231,9 +4189,8 @@ msgid "Record" msgstr "تسجيل" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "تسجيل الخيارات" +msgstr "مدخلات السجل" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4319,7 +4276,7 @@ msgstr "Enter" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "الاصدار:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4363,23 +4320,20 @@ msgid "Save GCI as..." msgstr "GCI حفظ باسم " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "حفظ الحالة" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "حفظ الحالة" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "1 حفظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "1 حفظ حالة" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4410,9 +4364,8 @@ msgid "Save State Slot 8" msgstr "8 حفظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "1 حفظ حالة" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4647,9 +4600,8 @@ msgid "Settings..." msgstr "إعدادات" #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملف" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4680,9 +4632,8 @@ msgid "Show &Toolbar" msgstr "أظهر شريط الأدوات" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "الافتراضي" +msgstr "المظهر الافتراضي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5102,7 +5053,7 @@ msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Texture" -msgstr "" +msgstr "الرسوميات" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462 msgid "Texture Cache" @@ -5256,15 +5207,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"لجعلها فعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " -"حد الإطار أعلى من السرعة لعبة الافتراضية " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5302,19 +5250,16 @@ msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "نسبة العرض :" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Copies" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "تبديل جميع أنواع السجل" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5415,9 +5360,8 @@ msgid "Undo Load State" msgstr "التراجع عن تحميل الحالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "التراجع عن تحميل الحالة" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5535,9 +5479,8 @@ msgid "V-Sync" msgstr "تحديد أقصى معدل الاطار" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU سرعة هاك" +msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5945,9 +5888,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "تلقى رسالة مجهولة مع معرف : %d" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -5964,52 +5906,3 @@ msgstr "zNear تصحيح: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "أو" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Accurate VBeam emulation" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" -#~ "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "تمكين الاختصارات" - -#~ msgid "Export failed, try again?" -#~ msgstr "فشل تصدير، حاول مرة أخرى؟" - -#~ msgid "Failed to Listen!!" -#~ msgstr "لم اسمع!" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "فشل تحميل hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic اعدادات" - -#~ msgid "Import failed, try again?" -#~ msgstr "فشل الاستيراد، حاول مرة أخرى؟" - -#~ msgid "In-Game" -#~ msgstr "في اللعبة" - -#~ msgid "Last Overwritten State" -#~ msgstr "الكتابة فوق آخر حالة" - -#~ msgid "Last Saved State" -#~ msgstr "آخر حالة محفوظة" - -#~ msgid "Local" -#~ msgstr "المحلية" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "إعادة تحميل حالة ويموت" - -#~ msgid "Set" -#~ msgstr "ضبط" - -#~ msgid "Wii Save Import" -#~ msgstr "استيراد حفظ الوي" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index 8237fad821..2357545831 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" -"Last-Translator: Puniasterus \n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" +"Last-Translator: delroth \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/dolphin-emu/" "language/ca/)\n" "Language: ca\n" @@ -63,12 +63,12 @@ msgstr "%1$sCopia%1$s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120 #, c-format msgid "%d samples" -msgstr "" +msgstr "mostres %d" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119 #, c-format msgid "%d samples (quality level %d)" -msgstr "" +msgstr "mostres %d (nivell de qualitat %d)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 @@ -115,9 +115,9 @@ msgid "%s failed to open" msgstr "%s no s'ha pogut obrir" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s no s'ha pogut obrir" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -321,9 +321,8 @@ msgid "(off)" msgstr "(Deshabilitat)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ Afegir" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -331,7 +330,7 @@ msgstr "0x44" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1.5x Native (960x792)" -msgstr "" +msgstr "1.5x Natiu (960x792)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148 msgid "16 bit" @@ -339,15 +338,15 @@ msgstr "16 bits" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1x Native (640x528)" -msgstr "" +msgstr "1x Natiu (640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "2.5x Native (1600x1320)" -msgstr "" +msgstr "2.5x Natiu (1600x1320)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "2x Native (1280x1056)" -msgstr "" +msgstr "2x Natiu (1280x1056)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149 msgid "32 bit" @@ -359,11 +358,11 @@ msgstr "3D Vision" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "3x Native (1920x1584)" -msgstr "" +msgstr "3x Natiu (1920x1584)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "4x Native (2560x2112)" -msgstr "" +msgstr "4x Natiu (2560x2112)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147 msgid "8 bit" @@ -371,7 +370,7 @@ msgstr "8 bits" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30 msgid "" -msgstr "" +msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "" @@ -383,7 +382,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150 msgid "" -msgstr "" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" @@ -412,7 +411,6 @@ msgstr "" "Has de connectar manualment els wiimotes." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -428,33 +426,16 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"ALERTA:\n" -"\n" -"NetPlay actualment només funciona correctament quan s'utilitza la següent " -"configuració:\n" -" -Doble nucli [Apagat]\n" -" -Regulació de so [Apagat]\n" -" -DSP-HLE amb \"Null Àudio\" o DSP-LLE\n" -" -Establiu manualment el nombre exacte dels controladors que s'utilitzaran " -"per [Controlador estàndard]\n" -"\n" -"Tots els jugadors han d'intentar utilitzar la mateixa versió dels Dolphin " -"amb la mateixa configuració. \n" -"Deshabilitar totes les targetes de memòria o enviar-los a tots els jugadors " -"abans de començar. \n" -"Suport per al Wiimote no ha estat implementat.\n" -"\n" -"Has de redireccionar el port TCP per fer d'amfitrió!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 msgid "AM-Baseboard" -msgstr "AM-placa base" +msgstr "Placa base AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" -msgstr "Codis AR " +msgstr "Codis AR" #: Source/Core/DolphinWX/Src/AboutDolphin.h:21 msgid "About Dolphin" @@ -977,12 +958,12 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" -msgstr "" +msgstr "No es pot trobar un WiiMote pel gestor de connexió %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:672 #: Source/Core/Core/Src/HW/DVDInterface.cpp:682 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" +msgstr "No es pot llegir del DVD_Plugin - DVD-Interface: Error Fatal" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 @@ -1243,9 +1224,8 @@ msgstr "Connectar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Connectar el teclat USB" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1409,7 +1389,7 @@ msgstr "Atenuar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" -msgstr "" +msgstr "El directori axtual ha canviat de %s a %s després de wxFileSelector!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" @@ -1527,9 +1507,8 @@ msgid "Decompressing ISO" msgstr "Descomprimint ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Actualitza la llista de jocs" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1610,7 +1589,7 @@ msgstr "Deshabilitar" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Desactivar destinació Alfa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1648,17 +1627,15 @@ msgstr "" "Si no n'estàs segur, deixa-ho desmarcat." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Saltar el destí del pas d'alfa que utilitzen molts de jocs per varis efectes " -"gràfics.\n" -"\n" -"Si no n'estàs segur, deixa-ho desactivat." +"Desactiva l'emulació d'una característica de maquinari anomenada destinació " +"Alfa, que s'utilitza en molts jocs per a diversos efectes gràfics. Si no " +"n'estàs segur, deixa-ho sense marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1795,13 +1772,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin no ha pogut completar l'acció sol·licitada." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = " -"ràpid, Desactivat = Compatible)" +"Duplica la velocitat de rellotge de la GPU emulada. Pot accelerar alguns " +"jocs (ON = Ràpid, OFF = Compatible)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2260,9 +2236,8 @@ msgid "Exit" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exportar totes les partides desades" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2293,9 +2268,8 @@ msgid "Export all saves" msgstr "Exportar totes les partides desades" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Fallada d'exportació" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2433,7 +2407,7 @@ msgstr "No s'ha pogut llegir Imatge.bin" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" -msgstr "" +msgstr "Error al llegir la capçalera bk" #: Source/Core/Core/Src/HW/GCMemcard.cpp:211 #, c-format @@ -2470,7 +2444,7 @@ msgstr "No s'han pogut llegir les dades des del fitxer %d" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" -msgstr "" +msgstr "Error al llegir les dades del fitxer: %s" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "" @@ -2490,7 +2464,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" -msgstr "" +msgstr "Error al llegir la capçalera" #: Source/Core/Core/Src/HW/GCMemcard.cpp:107 msgid "" @@ -2501,9 +2475,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2518,9 +2492,9 @@ msgid "Failed to write bkhdr" msgstr "No s'ha pogut escriure bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "No s'han pogut llegir les dades des del fitxer %d" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2694,9 +2668,9 @@ msgid "Found %d results for '" msgstr "Trobats %d resultats per '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "No s'ha pogut desar %s" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2941,6 +2915,15 @@ msgid "" "\n" "Sayonara!\n" msgstr "" +"Hola,\n" +"\n" +"Dolphin requereix Mac OS X 10.7 o superior.\n" +"Desafortunadament estàs utilitzant una versió antiga d'OS X.\n" +"La darrera versió de Doplhin compatible amb OS X10.6 és Dolphin 3.5\n" +"Si us plau actualitza a 10.7 o superior per utilitzar la versió més nova de " +"Dolphin.\n" +"\n" +"Adéu!\n" #: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" @@ -3018,6 +3001,10 @@ msgid "" "TitleID %016llx.\n" " Dolphin will likely hang now." msgstr "" +"IOCTL_ES_LAUNCH: Joc ha intentat de tornar a carregar IOS o un títol que no " +"està disponible en el seu bolcat de la NAND\n" +"TitleID %016llx.\n" +"Probablement Dolphin es penjarà ara." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" @@ -3100,14 +3087,12 @@ msgid "Import Save" msgstr "Desar importació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Desar importació" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Fallada d'exportació" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3134,9 +3119,8 @@ msgid "In Game" msgstr "En Joc" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Limit d'imatges/s:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3239,7 +3223,7 @@ msgstr "Resolució Interna:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" -msgstr "" +msgstr "Intèrpret (MOLT lent)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" @@ -3310,7 +3294,7 @@ msgstr "JAPÓ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" -msgstr "" +msgstr "Recompilador JIT (recomanat)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" @@ -3427,58 +3411,48 @@ msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Càrrega estat" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Carregar ranura d'estat 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Carregar ranura d'estat 2" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Carregar ranura d'estat 3" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Carregar ranura d'estat 4" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Carregar ranura d'estat 5" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Carregar ranura d'estat 6" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Carregar ranura d'estat 7" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Carregar ranura d'estat 8" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Carregar ranura d'estat 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Carregar ranura d'estat 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3509,9 +3483,8 @@ msgid "Load State Slot 8" msgstr "Carregar ranura d'estat 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Carregar ranura d'estat 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3889,7 +3862,7 @@ msgstr "No s'han trobat ISOs o WADs" #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "" +msgstr "No hi ha sortida d'àudio" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format @@ -3947,6 +3920,8 @@ msgstr "Sense establir" #, c-format msgid "Not a Wii save or read failure for file header size %x" msgstr "" +"No és una partida guardada Wii o hi ha hagut un error de lectura de la mida " +"de la capçalera del fitxer %x" #: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" @@ -4074,15 +4049,14 @@ msgid "Orange" msgstr "Taronja" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"L'ordre dels arxius en el directori no coincideix amb l'ordre de blocs\n" -"Feu clic dret i exporteu totes les partides desades,\n" -"i importeu les partides desades una targeta de memòria nova\n" +"L'ordre dels arxius en el directori no corresponen amb l'ordre de blocs\n" +"Fes clic dret i exporta tots els guardats,\n" +"i importa les partides a una nova targeta de memòria\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4364,9 +4338,8 @@ msgid "Record" msgstr "Enregistrar" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Enregistrant Opcions" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4453,7 +4426,7 @@ msgstr "Tornar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revisió:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4497,23 +4470,20 @@ msgid "Save GCI as..." msgstr "Anomena i desa GCI..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "&Desa l'estat" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "&Desa l'estat" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Desar ranura estat 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Desar ranura estat 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4544,9 +4514,8 @@ msgid "Save State Slot 8" msgstr "Desar ranura estat 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Desar ranura estat 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4787,9 +4756,8 @@ msgid "Settings..." msgstr "Configuració..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: No es troba el fitxer de configuració" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4820,9 +4788,8 @@ msgid "Show &Toolbar" msgstr "Mostrar Barra d'&eines" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Per defecte" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5194,7 +5161,7 @@ msgstr "Oscil·lació" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" -msgstr "" +msgstr "Sincronitzar subprocés de GPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" @@ -5419,16 +5386,16 @@ msgstr "" "Si no n'estàs segur, deixa-ho desactivat." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Si s'ha establert un límit al nombre d'imatges per segon major que la " -"velocitat del joc màxima (NTSC: 60, PAL: 50), també cal deshabilitar la " -"regulació de so DSP per a fer-ho efectiu." +"Això limita la velocitat de joc a un nombre específic de fotogrames per " +"segon (velocitat completa és 60 per NTSC i 50 per PAL). També pots utilitzar " +"la regulació d'àudio amb el DSP (pot arreglar els clics d'àudio, però pot " +"causar soroll constant depenent del joc)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5470,19 +5437,16 @@ msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Relació d'aspecte:" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "Còpies EFB" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Activar tots els tipus de registre de Log" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5585,9 +5549,8 @@ msgid "Undo Load State" msgstr "Desfer la càrrega de l'estat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Desfer la càrrega de l'estat" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5605,7 +5568,7 @@ msgstr "Comanda de DVD desconeguda %08x - error crític" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444 #, c-format msgid "Unknown command 0x%08x" -msgstr "" +msgstr "Comanda desconeguda 0x%08x" #: Source/Core/Common/Src/SysConf.cpp:132 #, c-format @@ -5707,9 +5670,8 @@ msgid "V-Sync" msgstr "Sincronització Vertical" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "Modificació de velocitat MMU" +msgstr "Hack de velocitat VBeam" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5954,7 +5916,7 @@ msgstr "Treballant..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Escriu memcards (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6145,9 +6107,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Missatge desconegut rebut amb id: %d" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6164,88 +6125,3 @@ msgstr "Correcció ZAprop" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| O" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Emulació acurada de Vbeam" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Permet activar certes opcions via les tecles d'accés ràpid 3 (Resolució " -#~ "interna), 4 (Relació despecte ), 5 (Copies EFB ) i 6 (Boira) dins de la " -#~ "finestra d'emulació.\n" -#~ "\n" -#~ "Si no n'estàs segur, deixa-ho desactivat." - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "No s'ha pogut establir les controls. El jugador esquerra o el joc s'està " -#~ "executant actualment! \n" -#~ "(Configurar els controls mentre el joc s'executa no està actualment " -#~ "suportat)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Activar tecles d'accés ràpid" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Activa la emulació de Dolby Pro Logic II. Només pel motor OpenAL. Pot ser " -#~ "que tinguis que renombrar soft_oal.dll a OpenAL.dll perquè funcioni." - -#~ msgid "Export failed, try again?" -#~ msgstr "Exportació fallada, intenteu de nou?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Error a l'escoltar!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "No s'ha pogut carregar bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "No s'ha pogut carregar hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Configuració del micro de GC" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "S'ha cridat HCI_CMD_INQUIRY , si us plau informeu!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = " -#~ "compatible, Desactivat = ràpid)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Fallada a l'importació, tornar a provar?" - -#~ msgid "In-Game" -#~ msgstr "En-joc" - -#~ msgid "Last Overwritten State" -#~ msgstr "Últim estat sobreescrit" - -#~ msgid "Last Saved State" -#~ msgstr "Últim estat desat" - -#~ msgid "Local" -#~ msgstr "Local" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Tornar a connectar el Wiimote al carregar l'estat" - -#~ msgid "Set" -#~ msgstr "Definir" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Salta pas Dest. Alpha" - -#~ msgid "Wii Save Import" -#~ msgstr "Importar partida guardada Wii" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 8e01049f17..b157ca5db4 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-11 08:08+0000\n" +"PO-Revision-Date: 2013-09-17 21:42+0000\n" "Last-Translator: Zbyněk Schwarz \n" "Language-Team: Czech (http://www.transifex.com/projects/p/dolphin-emu/" "language/cs/)\n" @@ -112,9 +112,9 @@ msgid "%s failed to open" msgstr "%s nelze otevřít" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s nelze otevřít" +msgstr "%s selhalo: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -316,9 +316,8 @@ msgid "(off)" msgstr "(vypnuto)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ PŘIDAT" +msgstr "+ PŘIDAT" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -407,7 +406,6 @@ msgstr "" "Vaše wiimoty musíte připojit ručně." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -425,19 +423,17 @@ msgid "" msgstr "" "POZOR:\n" "\n" -"Netplay bude v současnosti správně fungovat pouze při použití následujících " -"nastavení:\n" +"Netplay bude správně fungovat pouze při použití následujících nastavení:\n" " - Dvojité Jádro [VYPNUTO]\n" -" - Přiškrcení Zvuku [VYPNUTO]\n" -" - DSP-HLE s \"Nulovým Zvukem\" nebo DSP-LLE\n" -" - Ručně nastavit přesné číslo ovladačů, které budou použity na [Standardní " -"Ovladač]\n" +" - Jádro emulátoru DSP musí být stejné na všech počítačích!\n" +" - DSP na samostatném vlákně [VYPNUTO]\n" +" - Limit snímků NENÍ nastaven na [Zvuk]\n" "\n" -"Všichni hráči by měli používat stejné nastavení i verzi Dolphina.\n" -"Zakázat všechny paměťové karty nebo je poslat hráčům před spuštěním.\n" +"Všichni hráči by měli používat stejné nastavení i verzi Dolphin.\n" +"Všechny paměťové karty musí být mezi hráči stejné nebo zakázané.\n" "Podpora Wiimote nebyla ještě zavedena.\n" "\n" -"Musíte přesměrovat Váš TCP port na hostitele!!" +"Hostitel musí mít zvolený port TCP přesměrován/otevřen!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -754,7 +750,7 @@ msgstr "Alespoň jeden panel musí být otevřen." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Audio" -msgstr "Audio" +msgstr "Zvuk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" @@ -827,7 +823,7 @@ msgstr "Špatná hlavička souboru" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Rola-Bola" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -932,11 +928,11 @@ msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65 msgid "C Stick" -msgstr "Kr Stick" +msgstr "Kruhová páčka" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:64 msgid "C-Stick" -msgstr "Kr-Stick" +msgstr "Kruhová páčka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774 msgid "CP reg" @@ -1129,7 +1125,7 @@ msgstr "Zvolte adresář pro umístění extrakce" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:285 msgid "Circle Stick" -msgstr "Kruhový Stick" +msgstr "Kruhová páčka" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56 msgid "Classic" @@ -1233,9 +1229,8 @@ msgstr "Připojit" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Připojit USB Klávesnici" +msgstr "Připojit Rola-Bola" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1458,9 +1453,8 @@ msgid "DSP settings" msgstr "Nastavení DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP na samostatném vlákně" +msgstr "DSPLLE na samostatném vlákně" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1476,7 +1470,7 @@ msgstr "DVDLowUnencryptedRead - Fatální chyba: nelze přečíst svazek" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Taneční podložka" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1525,9 +1519,8 @@ msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Obnovit seznam her" +msgstr "Snížit limit snímků" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1609,7 +1602,7 @@ msgstr "Zakázat" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Zakázat cílovou průhlednost" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1646,15 +1639,15 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Přeskočit průchod cílové průhlednosti používaný ve většině her pro různé " -"grafické efekty.\n" +"Zakáže emulaci hardwarové funkce nazvanou Cílová průhlednost, která je " +"používána v mnoha hrách pro různé grafické efekty.\n" +"\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -1732,6 +1725,37 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Všechna práva vyhrazena (c) 2003-2013+ Dolphin Team\n" +"\n" +"Větev: %s\n" +"Revize: %s\n" +"Sestaveno: %s %s\n" +"\n" +"Dolphin je emulátor Gamecube/Wii, který původně\n" +"vytvořili uživatelé F|RES a ector.\n" +"Dnes je Dolphin svobodný software s mnoha\n" +"přispěvateli, příliš mnoho na to, aby zde byli všichni uvedeni.\n" +"Pokud máte zájem, stačí navštívit stránku projektu na\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Zvláštní poděkování patří uživatelům Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 a Hotquik za jejich\n" +"zpětné inženýrství a dokumentaci/ukázky.\n" +"\n" +"Velice děkujeme Gillesu Mouchardovim jehož emulátor\n" +"Microlib PPCm náš vývoj nastartoval.\n" +"\n" +"Děkujeme Franku Willemu za jeho PowerPC disassembler,\n" +"který jsme my a or9 pozměnili, aby mohl používat i Gecko.\n" +"\n" +"Děkujeme uživatelům hcs/destop za jejich dekodér GC ADPCM.\n" +"\n" +"Nejsme nijak spjaty s firmou Nintendo.\n" +"Gamecube a Wii jsou obchodní značky firmy Nintendo.\n" +"Emulátor je pouze pro studijní účely\n" +"a neměl by být používán ke spuštění her,\n" +"které legálně nevlastníte." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1793,13 +1817,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolhpin nemohl dokončit požadovanou činnost." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Zapnout rychlý přístup k disku. Některé hry to potřebují. (ZAPNUTO = rychlé, " -"VYPNUTO = Kompatibilní)" +"Zdvojnásobí taktovací frekvenci emulovaného GPU. Může zrychlit některé hry " +"(Zapnuto = Rychlé, Vypnuto = Kompatibilní)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1917,7 +1940,7 @@ msgstr "Upravit nastavení" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Upravit místní změny nastavení" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -2252,12 +2275,11 @@ msgstr "Spustit" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Ukončit" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exportovat všechny Uložené hry" +msgstr "Exportovat všechny uložené hry Wii" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2288,9 +2310,8 @@ msgid "Export all saves" msgstr "Exportovat všechny Uložené hry" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Export Selhal" +msgstr "Export selhal" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2410,6 +2431,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Nelze načíst bthprops.cpl! Připojení opravdových Wiimote nebude fungovat a " +"Dolphin může být nečekaně ukončen!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2417,6 +2440,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Nelze načíst hid.dll! Připojení opravdových Wiimote nebude fungovat a " +"Dolphin může být nečekaně ukončen!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2497,9 +2522,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Selhal zápis hlavičky souboru %d" +msgstr "Nelze přečíst hlavičku souboru %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2514,9 +2539,9 @@ msgid "Failed to write bkhdr" msgstr "Zápis bkhdr selhal" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Čtení dat ze souboru selhalo: %s" +msgstr "Nelze zapsat data do souboru: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2533,7 +2558,7 @@ msgstr "Rychlá" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Rychlý výpočet hloubky" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2681,7 +2706,7 @@ msgstr "Dopředu" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Přesměrování portu (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2689,9 +2714,9 @@ msgid "Found %d results for '" msgstr "Nalezeno %d výsledků pro '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Nelze uložit %s" +msgstr "Nalezeno %x souborů uložené hry" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3101,14 +3126,12 @@ msgid "Import Save" msgstr "Importovat Uloženou hru" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importovat Uloženou hru" +msgstr "Importovat uloženou hru Wii" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Export Selhal" +msgstr "Import selhal" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3135,9 +3158,8 @@ msgid "In Game" msgstr "Ve Hře" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Limit Snímků:" +msgstr "Zvýšit omezení snímků" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3370,7 +3392,7 @@ msgstr "Jazyk:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Poslední %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3383,7 +3405,7 @@ msgstr "Vlevo" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64 msgid "Left Stick" -msgstr "Levý Stick" +msgstr "Levá páčka" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273 msgid "" @@ -3428,58 +3450,48 @@ msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Nahrát Stav" +msgstr "Načíst stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Nahrát Slot Stavu 1" +msgstr "Načíst 1. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Nahrát Slot Stavu 2" +msgstr "Načíst 2. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Nahrát Slot Stavu 3" +msgstr "Načíst 3. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Nahrát Slot Stavu 4" +msgstr "Načíst 4. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Nahrát Slot Stavu 5" +msgstr "Načíst 5. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Nahrát Slot Stavu 6" +msgstr "Načíst 6. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Nahrát Slot Stavu 7" +msgstr "Načíst 7. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Nahrát Slot Stavu 8" +msgstr "Načíst 8. uložený stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Nahrát Slot Stavu 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Nahrát Slot Stavu 1" +msgstr "Načíst stav v pozici 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3510,9 +3522,8 @@ msgid "Load State Slot 8" msgstr "Nahrát Slot Stavu 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Nahrát Slot Stavu 1" +msgstr "Načíst stav v pozici 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3607,7 +3618,7 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38 msgid "Main Stick" -msgstr "Hlavní Stick" +msgstr "Hlavní páčka" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Maker ID:" @@ -4013,7 +4024,7 @@ msgstr "Zobrazovat zprávy na obrazovce" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "Online &dokumentace" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4064,10 +4075,12 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Otevře výchozí nastavení (pouze pro čtení) této hry v externím textovém " +"editoru." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." -msgstr "" +msgstr "Otevře uživatelem zadané změny nastavení v externím textovém editoru." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4079,14 +4092,13 @@ msgid "Orange" msgstr "Oranžová" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" "Pořadí souborů v Adresáři Souborů se neshoduje s pořadím bloku\n" -"Klikněte pravým tlačítkem a exportujte všechna uložení,\n" +"Klikněte pravým tlačítkem a exportujte všechna uložení\n" "a importujte je do nové paměťové karty\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 @@ -4145,7 +4157,7 @@ msgstr "Oddíl %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Oddíl neexistuje: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4334,7 +4346,7 @@ msgstr "RUSKO" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Rádius" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4350,7 +4362,7 @@ msgstr "Opravdová" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Opravdové Rola-Bola" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4368,9 +4380,8 @@ msgid "Record" msgstr "Nahrávat" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Možnosti Nahrávání" +msgstr "Zaznamenat vstup" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4456,7 +4467,7 @@ msgstr "Enter" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revize:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4465,7 +4476,7 @@ msgstr "Vpravo" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65 msgid "Right Stick" -msgstr "Pravý Stick" +msgstr "Pravá páčka" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:72 @@ -4473,12 +4484,10 @@ msgid "Rumble" msgstr "Vibrace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Spustit DSP HLE a LLE na samostatném vlákně (nedoporučeno: může způsobit " -"problémy se zvukem u HLE a zasekávání u LLE)." +"Spustit DSP LLE na samostatném vlákně (nedoporučeno: může způsobit zaseknutí)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4503,23 +4512,20 @@ msgid "Save GCI as..." msgstr "Uložit GCI jako..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Uložit Sta&v" +msgstr "Načíst nejstarší stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Uložit Sta&v" +msgstr "Uložit stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Uložit do Slotu Stavu 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Uložit do Slotu Stavu 1" +msgstr "Uložit stav do pozice 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4550,9 +4556,8 @@ msgid "Save State Slot 8" msgstr "Uložit do Slotu Stavu 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Uložit do Slotu Stavu 1" +msgstr "Uložit stav do pozice 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4802,9 +4807,8 @@ msgid "Settings..." msgstr "Nastavení..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Nelze najít soubor s nastavením" +msgstr "SetupWiiMem: Nelze vytvořit soubor nastavení" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4835,9 +4839,8 @@ msgid "Show &Toolbar" msgstr "Zobrazit Panel Nás&trojů" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Výchozí" +msgstr "Zobrazit výchozí" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5118,7 +5121,7 @@ msgstr "Zvýšit rychlost přenosu Disku" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" -msgstr "Čtvercový Stick" +msgstr "Čtvercová páčka" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" @@ -5156,7 +5159,7 @@ msgstr "Volant" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57 msgid "Stick" -msgstr "Stick" +msgstr "Páčka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 #: Source/Core/DolphinWX/Src/FrameTools.cpp:464 @@ -5201,7 +5204,7 @@ msgstr "Uložení byly úspěšně importovány" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Švédština" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5435,16 +5438,16 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Pokud nastavíte limit snímků větší než plná rychlost hry (NTSC:60, PAL:50), " -"měli byste také vypnout Přiškrcení Zvuku v DSP (v závislosti na hře může " -"spravit klikání zvuku, ale také může způsobit neustálý hluk)." +"Toto omezí rychlost hry na zadaný počet snímků za sekundu (plná rychlost je " +"60 pro NTSC a 50 pro PAL). Nebo můžete použít Zvuk pro přiškrcení DSP (v " +"závislosti na hře může spravit klikání zvuku, ale také může způsobit " +"neustálý hluk)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5485,19 +5488,16 @@ msgid "Toggle All Log Types" msgstr "Zapnout Všechny Typy Záznamů" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Poměr Stran:" +msgstr "Přepínat poměr stran" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Kopie" +msgstr "Přepínat kopie EFB" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Zapnout Všechny Typy Záznamů" +msgstr "Přepínat mlhu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5506,7 +5506,7 @@ msgstr "Přepnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Přepínat IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5600,9 +5600,8 @@ msgid "Undo Load State" msgstr "Vrátit zpět Nahrání Stavu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Vrátit zpět Nahrání Stavu" +msgstr "Vrátit zpět Uložení Stavu" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5674,6 +5673,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Použít méně přesný algoritmus k výpočtu hodnot hloubky.\n" +"V některých hrách způsobuje problémy, ale může také přinést dobré " +"zrychlení.\n" +"\n" +"Pokud si nejste jisti, nechejte toto zaškrtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5696,6 +5700,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Používá nebezpečné operace pro zrychlení vysílání vertexů v OpenGL. U " +"podporovaných grafických procesorů nejsou známy žádné problémy, jinak ale " +"způsobuje vážné problémy se stabilitou a obrazem.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odškrtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5720,9 +5729,8 @@ msgid "V-Sync" msgstr "V-Synch" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Hack Rychlosti" +msgstr "Hack rychlosti VBeam" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5742,7 +5750,7 @@ msgstr "Úroveň" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Hack vysílání vertexů" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5965,7 +5973,7 @@ msgstr "Pracuji..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Zapsat paměťové karty (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6163,12 +6171,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "neznámá konfigurace %d (očekáváno %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Přijata neznámá zpráva s id : %d" +msgstr "přijata neznámá zpráva" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6185,106 +6192,3 @@ msgstr "Korekce zNear:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| NEBO" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Precizní emulace VBeam" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Umožní přepínání jistých možností pomocí klávesových zkratek 3 (Vnitřní " -#~ "rozlišení), 4(Poměr stran), 5 (Kopie EFB) a 6 (Mlha) uvnitř okna " -#~ "emulace.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odškrtnuté." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "Nelze najít Wiimote podle bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Nelze nastavit pady. Hráč odešel, nebo hra v současnosti běží!.\n" -#~ "(nastavení padů za běhu hry není ještě podporováno)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Povolit klávesové zkratky" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Pouze " -#~ "pro podpůrnou vrstvu OpenAL. Možná bude třeba přejmenovat soft_oal.dll na " -#~ "OpenAL32.dll aby toto fungovalo." - -#~ msgid "Export failed, try again?" -#~ msgstr "Exportování selhalo, zkusit znovu?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Naslouchání Selhalo!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Nelze nahrát bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Nelze nahrát hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Nastavení GCMic" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Změněné nahrávání vyrovnávací paměti" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " -#~ "VYPNUTO = Rychlé)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Import selhal, zkusit znovu?" - -#~ msgid "In-Game" -#~ msgstr "Ve Hře" - -#~ msgid "Last Overwritten State" -#~ msgstr "Poslední Přepsaný Stav" - -#~ msgid "Last Saved State" -#~ msgstr "Poslední Uložený Stav" - -#~ msgid "Local" -#~ msgstr "Místní" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Znovu připojit Wiimote při Nahrání Stavu" - -#~ msgid "Set" -#~ msgstr "Nastavit" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Vypnout Průchod Cíl. Průhl." - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Použít pozměněnou strategii nahrávání pro proudový přenos vertexů.\n" -#~ "Většinou umožňuje zrychlení, ale specifikace OpenGL ji zakazuje a může " -#~ "způsobit vážné chyby.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte odškrtnuté." - -#~ msgid "Wii Save Import" -#~ msgstr "Import uložených pozic Wii" diff --git a/Languages/po/de.po b/Languages/po/de.po index da87aaebe5..dc68390a65 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -3,17 +3,19 @@ # This file is distributed under the same license as the dolphin-emu package. # # Translators: +# turbedi , 2013 # DasD aus der Spree , 2013 # DefenderX , 2013 # Ghabry , 2013 # JackyCola , LucasX , 2011 # no_cluez , 2013 +# Shinrai, 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-05 23:28+0000\n" +"PO-Revision-Date: 2013-09-21 12:39+0000\n" "Last-Translator: Ghabry \n" "Language-Team: German (http://www.transifex.com/projects/p/dolphin-emu/" "language/de/)\n" @@ -25,7 +27,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516 msgid " (too many to display)" -msgstr " (zu viele zum anzeigen)" +msgstr " (zu viele anzuzeigen)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:291 #: Source/Core/DolphinWX/Src/NetWindow.cpp:521 @@ -49,7 +51,7 @@ msgstr "" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." -msgstr "\"%s\" ist kein gültiges GC/Wii-Image oder kein GC/Wii-Image." +msgstr "\"%s\" ist keine gültige GCM/ISO-Datei oder kein GC/Wii-Image." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730 #, c-format @@ -64,12 +66,12 @@ msgstr "%1$sKopieren%1$s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120 #, c-format msgid "%d samples" -msgstr "" +msgstr "%d Samples" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119 #, c-format msgid "%d samples (quality level %d)" -msgstr "" +msgstr "%d Samples (Qualität %d)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 @@ -77,13 +79,13 @@ msgstr "" msgid "%s already exists, overwrite?" msgstr "" "%s ist bereits vorhanden.\n" -"Vorhandene Datei ersetzen?" +"Vorhandene Datei überschreiben?" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:154 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" -"%s konnte nicht komprimiert werden, möglicherweise ist das Image fehlerhaft." +"%s konnte nicht komprimiert werden. Möglicherweise ist das Image fehlerhaft." #: Source/Core/Core/Src/HW/GCMemcard.cpp:83 #, c-format @@ -92,7 +94,7 @@ msgid "" " Card file size is invalid (0x%x bytes)" msgstr "" "%s konnte nicht als Speicherkarte geladen werden.\n" -"Die Dateigröße der Speicherkarten-Datei ist ungültig (0x%x bytes)." +"Die Dateigröße ist ungültig (0x%x bytes)." #: Source/Core/Core/Src/HW/GCMemcard.cpp:98 #, c-format @@ -109,9 +111,9 @@ msgid "" "%s failed to load as a memorycard \n" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -"%s konnte nicht als Memory Card geladen werden\n" -"Die Datei ist nicht groß genug um eine gültige Memory Card Datei zu sein (0x" -"%x bytes)" +"%s konnte nicht als Speicherkarte geladen werden.\n" +"Die Datei ist nicht groß genug um eine gültige Speicherkartendatei zu sein " +"(0x%x bytes)." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format @@ -119,9 +121,9 @@ msgid "%s failed to open" msgstr "%s konnte nicht geöffnet werden." #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s konnte nicht geöffnet werden." +msgstr "%s fehlgeschlagen: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -131,7 +133,7 @@ msgstr "Die Datei %s ist 0 Byte groß." #: Source/Core/DiscIO/Src/CompressedBlob.cpp:146 #, c-format msgid "%s is already compressed! Cannot compress it further." -msgstr "%s ist bereits komprimiert und kann nicht erneut komprimiert werden." +msgstr "%s ist bereits komprimiert und kann nicht weiter komprimiert werden." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format @@ -220,7 +222,7 @@ msgstr "&Hilfe" #: Source/Core/DolphinWX/Src/FrameTools.cpp:182 msgid "&Hotkey Settings" -msgstr "&Tastenkürzel Einstellungen" +msgstr "&Tastenkürzel-Einstellungen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" @@ -323,9 +325,8 @@ msgid "(off)" msgstr "(aus)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ HINZUF." +msgstr "+ HINZUF." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -333,7 +334,7 @@ msgstr "0x44" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1.5x Native (960x792)" -msgstr "" +msgstr "1.5x Nativ (960x792)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148 msgid "16 bit" @@ -341,15 +342,15 @@ msgstr "16 Bit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1x Native (640x528)" -msgstr "" +msgstr "1x Nativ (640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "2.5x Native (1600x1320)" -msgstr "" +msgstr "2.5x Nativ (1600x1320)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "2x Native (1280x1056)" -msgstr "" +msgstr "2x Nativ (1280x1056)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149 msgid "32 bit" @@ -361,11 +362,11 @@ msgstr "3D Vision" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "3x Native (1920x1584)" -msgstr "" +msgstr "3x Nativ (1920x1584)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "4x Native (2560x2112)" -msgstr "" +msgstr "4x Nativ (2560x2112)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147 msgid "8 bit" @@ -414,7 +415,6 @@ msgstr "" "Du musst deine Wiimotes manuell verbinden." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -432,20 +432,19 @@ msgid "" msgstr "" "ACHTUNG:\n" "\n" -"NetPlay funktioniert derzeit nur mit den folgenden Einstellungen:\n" -" - Dual Core [Aus]\n" -" - Audio Throttle [Aus]\n" -" - DSP-HLE mit \"Null Audio\" oder DSP-LLE\n" -" - Genaue Anzahl der als [Standard Controller] benutzten Eingabegeräte muss " -"manuell festgelegt werden.\n" +"Netplay funktioniert nur mit den folgenden Einstellungen:\n" +"- Dual Core aktivieren [AUS]\n" +" - DSP-Emulationsengine muss auf allen Computern gleich sein!\n" +" - DSP in eigenem Thread [AUS]\n" +" - Framebegrenzung NICHT auf [AUDIO] gesetzt\n" "\n" -"Alle Spieler sollten die gleiche Dolphin Version und Einstellungen " +"Alle Spieler sollten die gleiche Dolphin-Version und Einstellungen " "verwenden.\n" -"Deaktiviere die Memory-Cards, oder sende sie vor dem Spielen an alle anderen " -"Spieler.\n" -"Wiimote Unterstützung wurde für NetPlay noch nicht implementiert.\n" +"Alle Speicherkarten müssen bei allen Spielern identisch oder deaktiviert " +"sein.\n" +"Wiimote-Unterstützung wurde für NetPlay noch nicht implementiert.\n" "\n" -"TCP Port zum Hoster muss geöffnet sein!!" +"Der Host muss den gewählten TCP-Port geöffnet haben!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -480,7 +479,7 @@ msgstr "" "Einige Spiele benötigen eine exakte Emulation von EFB-Kopien, für bestimmte " "Grafikeffekte oder Gameplayfunktionen.\n" "\n" -"In der Regel ist \"EFB to Texture\" ausreichend." +"Im Zweifel, wähle stattdessen EFB to Texture." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255 msgid "Action" @@ -496,7 +495,7 @@ msgid "" "%s" msgstr "" "Action Replay Code Entschlüsselungfehler:\n" -"Übereinstimmungs Check fehlgeschlagen\n" +"Übereinstimmungscheck fehlgeschlagen\n" "\n" "Fehlerhafter Code:\n" "%s" @@ -506,8 +505,8 @@ msgstr "" msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -"Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im folgendem " -"Code (%s)" +"Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Add Code " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:745 #, c-format @@ -533,14 +532,13 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -"Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im " -"geschriebennen Pointer (%s)" +"Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Write To " +"Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:792 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "" -"Action Replay Fehler: Fehlerhafte Größe (%08x) im kopierten Speicher (%s)" +msgstr "Action Replay Fehler: Ungültiger Wert (%08x) in Memory Copy (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:672 #, c-format @@ -548,24 +546,24 @@ msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" -"Action Replay Fehler: Master code and Write zu CCXXXXXX beinhaltet nicht " +"Action Replay Fehler: Master code und Write To CCXXXXXX nicht integriert " "(%s)\n" -"Master Codes werden nicht benötigt. Benutze keine Master Codes." +"Master Codes werden nicht benötigt. Benutzen Sie keine Master Codes." #: Source/Core/Core/Src/ActionReplay.cpp:184 #, c-format msgid "Action Replay Error: invalid AR code line: %s" -msgstr "Action Replay Fehler: Fehlerhafter AR-Code in Zeile: %s" +msgstr "Action Replay Fehler: Ungültiger AR-Code in Zeile: %s" #: Source/Core/Core/Src/ActionReplay.cpp:862 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" -msgstr "Action Replay: Conditional Code: ungültige Größe %08x (%s)" +msgstr "Action Replay: Conditional Code: Ungültige Größe %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:935 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" -msgstr "Action Replay: Ungültiger Normal Code %08x (%s)" +msgstr "Action Replay: Ungültiger Normal Code Typ %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:886 #, c-format @@ -575,7 +573,7 @@ msgstr "Action Replay: Normaler Code %i: ungültiger Subtype %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:828 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" -msgstr "Action Replay: Normal Code 0: ungültiger Subtype %08x (%s)" +msgstr "Action Replay: Normal Code 0: Ungültiger Subtype %08x (%s)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248 msgid "Adapter:" @@ -620,8 +618,8 @@ msgid "" msgstr "" "Füge den ermittelten Wert in den Parameter zFar ein.\n" "Es gibt zwei Möglichkeiten zum Bestimmen der Gleitkommazahl.\n" -"Beispiel: Gebe ''200'' oder ''0.0002'' direkt ein, es ergibt denn gleich " -"Effekte, der ermittelte Wert wird ''0.0002'' sein.\n" +"Beispiel: ''200'' oder ''0.0002'' direkt eingeben, das ergibt den gleichen " +"Effekt, der ermittelte Wert wird ''0.0002'' sein.\n" "Wert: (0->+/-Integer) oder (0->+/-FP[6 Nachkommastellen])\n" "\n" "NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte." @@ -638,15 +636,15 @@ msgid "" msgstr "" "Füge den ermittelten Wert in den Parameter zNear ein.\n" "Es gibt zwei Möglichkeiten zum Bestimmen der Gleitkommazahl.\n" -"Beispiel: Gebe ''200'' oder ''0.0002'' direkt ein, es ergibt denn gleich " -"Effekte, der ermittelte Wert wird ''0.0002'' sein.\n" +"Beispiel: ''200'' oder ''0.0002'' direkt eingeben, das ergibt den gleichen " +"Effekt, der ermittelte Wert wird ''0.0002'' sein.\n" "Wert: (0->+/-Integer) oder (0->+/-FP[6 Nachkommastellen])\n" "\n" "NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." +msgstr "Einstellung des benötigten analogen Drucks um Tasten zu aktivieren." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -675,7 +673,7 @@ msgstr "Alle Speicherstände (sav, s##)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" -msgstr "Alle Wii ISO Dateien (iso)" +msgstr "Alle Wii-ISO-Dateien (iso)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" @@ -691,15 +689,15 @@ msgstr "Analysiere" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:286 msgid "Angle" -msgstr "" +msgstr "Winkel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376 msgid "Anisotropic Filtering:" -msgstr "Anisotrope Filterung:" +msgstr "Anisotropische Filterung:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359 msgid "Anti-Aliasing:" -msgstr "Antialiasing:" +msgstr "Anti-Aliasing:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299 msgid "Apploader is the wrong size...is it really an apploader?" @@ -724,8 +722,9 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Schaltet einen Post-Processing Effekt wenn ein Frame beendet wurde. Wenn " -"unsicher, wähle (aus)." +"Post-Processing-Effekt anwenden, wenn ein Frame beendet wurde. \n" +"\n" +"Im Zweifel, wähle (aus)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" @@ -734,7 +733,7 @@ msgstr "Arabisch" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "Möchtest du wirklich \"%s\" löschen?" +msgstr "Möchtest du \"%s\" wirklich löschen?" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" @@ -769,11 +768,11 @@ msgstr "Audio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Audio Backend:" -msgstr "Audio Backend:" +msgstr "Audio-Backend:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28 msgid "AudioCommon: Error opening AO device.\n" -msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +msgstr "AudioCommon: Fehler beim Öffnen des AO-Geräts.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 @@ -786,11 +785,11 @@ msgstr "Automatisch (Vielfaches von 640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346 msgid "Auto (Window Size)" -msgstr "Automatisch (Fenstergröße)" +msgstr "Automatisch (Fenstermodus)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 msgid "Auto adjust Window Size" -msgstr "Lege die Größe des Fenstermodus automatisch fest." +msgstr "Fenstergröße automatisch festlegen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -798,9 +797,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Passt die Fenstergröße deine Bildschirmauflösung automatisch an.\n" +"Passt die Fenstergröße automatisch der Bildschirmauflösung an.\n" "\n" -"Wenn du dir unsicher bist lass diesen Punkt ausgeschaltet." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705 msgid "B" @@ -826,7 +825,7 @@ msgstr "Backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 msgid "Background Input" -msgstr "Hintergrund-Eingabe" +msgstr "Hintergrundeingabe" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:267 msgid "Backward" @@ -834,11 +833,11 @@ msgstr "Rückwärts" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" -msgstr "Ungültige Header-Datei" +msgstr "Ungültiger Datei-Header" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balance Board" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -909,11 +908,11 @@ msgstr "Durchsuchen" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" -msgstr "Ordner suchen und hinzufügen" +msgstr "Verzeichnis auswählen und hinzufügen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." -msgstr "ISO-Verzeichnis hinzufügen..." +msgstr "ISO-Verzeichnis auswählen..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" @@ -934,6 +933,8 @@ msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." msgstr "" +"Umgeht die Leerung des Datencaches von der DCBZ-Anweisung. Für gewöhnlich " +"deaktiviert lassen." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706 msgid "C" @@ -953,7 +954,7 @@ msgstr "CP reg" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" -msgstr "CPU Emulator Engine" +msgstr "CPU-Emulations-Engine" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Cache Display Lists" @@ -967,23 +968,23 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Kalkuliert die Lichtberechnung von 3D Grafiken eher pro Pixel als pro " +"Kalkuliert die Lichtberechnung von 3D Grafiken pro Pixel anstatt pro " "Vertex.\n" -"Verlangsamt Emulation um einige Prozent (GPU Abhängig).\n" -"Für Gewöhnlich ist das eine sichere Verbesserung, kann aber Probleme " -"verursachen.\n" +"Verlangsamt Emulation um einige Prozent (abhängig von der GPU).\n" +"Für gewöhnlich ist das eine sichere Verbesserung, kann aber gelegentlich " +"Probleme verursachen.\n" "\n" -"Wenn du dir unsicher bist, wähle es nicht aus." +"Im Zweifel deaktiviert lassen." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" -msgstr "" +msgstr "WiiMote konnte nicht bei Verbindungs-Handle %02x gefunden werden" #: Source/Core/Core/Src/HW/DVDInterface.cpp:672 #: Source/Core/Core/Src/HW/DVDInterface.cpp:682 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" +msgstr "Kann nicht von DVD_Plugin/DVD-Schnittstelle lesen: Fataler Fehler" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 @@ -999,7 +1000,7 @@ msgstr "Kann %s nicht öffnen" #: Source/Core/Core/Src/CoreTiming.cpp:128 msgid "Cannot unregister events with events pending" -msgstr "Kann während ausstehenden Events keine bereits Events de-registrieren." +msgstr "Kann während ausstehenden Events keine Events entregistrieren." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073 #, c-format @@ -1017,7 +1018,7 @@ msgid "" "Are you trying to use the same file in both slots?" msgstr "" "Diese Datei kann nicht als Speicherkarte verwendet werden.\n" -"Versuchts du möglicherweise die selbe Datei in beiden Slots zu verwenden?" +"Versuchst du möglicherweise die selbe Datei in beiden Slots zu verwenden?" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 msgid "Caps Lock" @@ -1057,11 +1058,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "Parameter sign zu zFar ändern (nach Korrektur)" +msgstr "Sign zu zFar Parameter ändern (nach Korrektur)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:42 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "Parameter sign zu zNear ändern (nach Korrektur)" +msgstr "Sign zu zNear Parameter ändern (nach Korrektur)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" @@ -1074,7 +1075,7 @@ msgstr "Chat" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34 msgid "Cheat Code" -msgstr "Cheat Code" +msgstr "Cheatcode" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 msgid "Cheat Search" @@ -1090,7 +1091,7 @@ msgstr "Prüfe die Unversehrtheit der Partition" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." -msgstr "Prüfe die Unversehrtheit der Partition..." +msgstr "Prüfe Unversehrtheit..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" @@ -1102,11 +1103,11 @@ msgstr "Chinesisch (Traditionell)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" -msgstr "Wähle ein Standard DVD-Verzeichnis:" +msgstr "Wähle ein DVD-Stammverzeichnis:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" -msgstr "Wähle ein NAND Stammverzeichnis" +msgstr "Wähle ein NAND-Stammverzeichnis:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" @@ -1122,7 +1123,7 @@ msgstr "Datei zum Öffnen auswählen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 msgid "Choose a memory card:" -msgstr "Wähle eine Memory Card:" +msgstr "Wähle eine Speicherkarte:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" @@ -1149,15 +1150,15 @@ msgstr "Klassik" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968 msgid "Clear" -msgstr "Löschen" +msgstr "Leeren" #: Source/Core/Core/Src/NetPlayServer.cpp:230 msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." msgstr "" -"Client kann während ein Spiel emmuliert wird, nicht verbunden werden! " -"NetPlay ist deaktiviert. Sie müssen zuerst manuell das Spiel beenden." +"Client kann während ein Spiel emuliert wird nicht verbunden werden! NetPlay " +"ist deaktiviert. Sie müssen zuerst manuell das Spiel beenden." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 @@ -1215,7 +1216,7 @@ msgstr "Einstellungen" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102 msgid "Configure Control" -msgstr "Steuerung bearbeiten" +msgstr "Steuerung konfigurieren" #: Source/Core/DolphinWX/Src/NetWindow.cpp:327 #: Source/Core/DolphinWX/Src/NetWindow.cpp:606 @@ -1243,13 +1244,12 @@ msgstr "Verbinden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "USB-Tastatur angeschlossen" +msgstr "Balance Bord anschließen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" -msgstr "USB-Tastatur angeschlossen" +msgstr "USB-Tastatur verbunden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format @@ -1282,7 +1282,7 @@ msgstr "Konsole" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88 msgid "Continuous Scanning" -msgstr "" +msgstr "Durchgehendes Suchen" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:33 msgid "Control" @@ -1361,7 +1361,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" -msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" +msgstr "Konnte den Befehl zum Öffnen der Dateierweiterung 'ini' nicht finden!" #: Source/Core/Core/Src/BootManager.cpp:158 msgid "" @@ -1400,7 +1400,7 @@ msgstr "Kritisch" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Crop" -msgstr "Abschneiden" +msgstr "Zuschneiden" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" @@ -1410,16 +1410,17 @@ msgid "" msgstr "" "Schneidet das Bild von 4:3 auf 5:4 bzw. von 16:9 auf 16:10 zurecht.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52 msgid "Crossfade" -msgstr "Fadenkreuz" +msgstr "Überblendung" #: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" +"Aktuelles Verzeichnis wurde gemäß wxFileSelector von %s nach %s geändert!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" @@ -1431,7 +1432,7 @@ msgstr "Benutzerdefinierter Projection-Hack Einstellungen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." -msgstr "Einige orthographische Projection Parameter anpassen." +msgstr "Einige orthographische Projection-Parameter anpassen." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" @@ -1451,7 +1452,7 @@ msgstr "DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" -msgstr "DSP Emulator Engine" +msgstr "DSP-Emulations-Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 @@ -1472,7 +1473,7 @@ msgstr "DSP-Einstellungen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "DSPLLE on Separate Thread" -msgstr "" +msgstr "DSP LLE in eigenem Thread" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1490,7 +1491,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Tanzmatte" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1539,9 +1540,8 @@ msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Spieleliste aktualisieren" +msgstr "Framebegrenzung reduzieren" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1549,11 +1549,11 @@ msgstr "Standard" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Default ISO:" -msgstr "Standard ISO:" +msgstr "Standard-ISO:" #: Source/Core/DolphinWX/Src/LogWindow.cpp:107 msgid "Default font" -msgstr "Standard Schriftart" +msgstr "Standardschriftart" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:19 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981 @@ -1567,7 +1567,7 @@ msgstr "Spielstand löschen" #: Source/Core/VideoCommon/Src/AVIDump.cpp:64 #, c-format msgid "Delete the existing file '%s'?" -msgstr "Wollen Sie die vorhandende Datei '%s' löschen?" +msgstr "Vorhandende Datei '%s' löschen?" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680 msgid "Description" @@ -1583,6 +1583,8 @@ msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." msgstr "" +"Versuch erkannt, mehr Daten von der DVD zu lesen als in den Out Buffer " +"passen. Abgeklemmt." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953 @@ -1611,8 +1613,8 @@ msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" -"Die Verzeichnis-Prüfsumme ist fehlerhaft,\n" -"und ebenfalls die Backup-Verzeichnis-Prüfsumme." +"Verzeichnis-Prüfsumme und\n" +"Backup-Verzeichnis-Prüfsumme sind fehlerhaft." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 @@ -1621,7 +1623,7 @@ msgstr "Deaktivieren" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Destination Alpha deaktivieren" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1637,9 +1639,9 @@ msgid "" msgstr "" "Deaktiviert jegliche XFB-Emulation.\n" "Dadurch wird die Emulation beschleunigt, auf Kosten von vielen Problemen in " -"davon abhängigen Spielen (insbesondere Homebrew)´.\n" +"davon abhängigen Spielen (insbesondere Homebrew).\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel aktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" @@ -1651,11 +1653,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Deaktiviert die Emulation von EFB-Kopien.\n" -"Diese werden oft für Post-Processing- oder Render to Texture-Effekte " -"verwendet. Die Option ist zwar mit einer schnelleren Emulation verbunden, " +"Diese werden oft für Post-Processing- oder Render-to-Texture-Effekte " +"verwendet. Die Option ist zwar mit einer schnelleren Emulation verbunden " "aber verursacht fast immer Probleme.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" @@ -1664,6 +1666,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Deaktiviert die Emulation einer Hardwarefunktion namens Destination Alpha, " +"welche in vielen Spielen für verschiedene grafische Effekte benutzt wird.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1672,7 +1678,7 @@ msgstr "Disc" #: Source/Core/DiscIO/Src/DriveBlob.cpp:94 #: Source/Core/DiscIO/Src/DriveBlob.cpp:113 msgid "Disc Read Error" -msgstr "Disc Lesefehler" +msgstr "Disc-Lesefehler" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 msgid "Display" @@ -1686,7 +1692,7 @@ msgid "" msgstr "" "Zeigt die vom Emulator gelesenen Eingaben an.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:67 msgid "Divide" @@ -1698,7 +1704,7 @@ msgstr "Laufende Emulation stoppen?" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" -msgstr "Dolby Pro Logic II Dekodierer" +msgstr "Dolby Pro Logic II Dekoder" #: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" @@ -1739,11 +1745,42 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin-Team\n" +"\n" +"Zweig: %s\n" +"Revision: %s\n" +"Kompiliert: %s @ %s\n" +"\n" +"Dolphin ist ein GameCube/Wii-Emulator der\n" +"ursprünglich von F|RES und ector geschrieben wurde.\n" +"Heute ist Dolphin ein Open Source-Projekt mit vielen\n" +"Mitwirkenden, zu vielen um sie alle aufzuzählen.\n" +"Wenn du interessiert bist, besuche die Projektseite\n" +"unter http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Besonderer Dank geht an Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 und Hotquik für ihr\n" +"Reverse Engineering und Dokumente / Demos.\n" +"\n" +"Großer Dank geht an Gilles Mouchard, dessen\n" +"Microlib PPC-Emulator unserer Entwicklung einen\n" +"großen Sprung nach vorne gab.\n" +"\n" +"Danke an Frank Wille für seinen PowerPC-Disassembler,\n" +"welchen or9 und wir um Gekko-Spezifika erweiterten.\n" +"\n" +"Danke an hcs/destop für ihren GC ADPCM-Dekodierer.\n" +"\n" +"Wir stehen in keiner Verbindung mit Nintendo.\n" +"GameCube und Wii sind Markenzeichen von Nintendo.\n" +"Der Emulator ist nur für Bildungszwecke und sollte nicht\n" +"für Spiele benutzt werden, die du nicht legal besitzt." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" -msgstr "Dolphin %s Grafik Einstellungen" +msgstr "Dolphin %s Grafikeinstellungen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" @@ -1755,7 +1792,7 @@ msgstr "Dolphin-Einstellungen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197 msgid "Dolphin Emulated Wiimote Configuration" -msgstr "Dolphin Emulierte-Wiimote Einstellungen" +msgstr "Dolphin Emulierte Wiimote-Einstellungen" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382 msgid "Dolphin FIFO" @@ -1763,16 +1800,16 @@ msgstr "Dolphin-FIFO" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Konfiguration" +msgstr "Dolphin GCPad-Einstellungen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:727 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Dolphin TAS Movies (*.dtm)" -msgstr "Dolphin TAS Filme (*.dtm)" +msgstr "Dolphin TAS-Filme (*.dtm)" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8 msgid "Dolphin Wiimote Configuration" -msgstr "Dolphin Wiimote Einstellungen" +msgstr "Dolphin Wiimote-Einstellungen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" @@ -1783,16 +1820,16 @@ msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -"Dolphin konnte keine GC oder Wii ISOs finden. Hier doppelklicken um nach " -"ISOs zu suchen..." +"Dolphin konnte keine GC/Wii-ISOs finden. Hier doppelklicken um nach ISOs zu " +"suchen..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" -"Dolphin ist so eingestellt, dass alle Spiele versteckt werden. Hier " -"doppelklicken um alle Spiele anzuzeigen..." +"Dolphin versteckt momentan alle Spiele. Hier doppelklicken um alle Spiele " +"anzuzeigen..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 @@ -1800,13 +1837,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin war nicht in der Lage die gewünschte Aktion auszuführen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " -"(ON = Schnell, OFF = Kompatibel)" +"Verdoppelt die Taktfrequenz der emulierten GPU. Kann einige Spiele " +"beschleunigen (AN = Geschwindigkeit, AUS = Kompatibilität) " #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1815,7 +1851,7 @@ msgstr "Unten" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45 msgid "Download Codes (WiiRD Database)" -msgstr "Codes Herunterladen (WiiRD)" +msgstr "Codes herunterladen (WiiRD-Datenbank)" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292 #, c-format @@ -1855,7 +1891,7 @@ msgstr "" "Schreibt alle während der Emulation gerenderten Bilder in eine AVI-Datei in " "User/Dump/Frames.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" @@ -1863,10 +1899,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Speichert alle während der Emulation decodierten Spiele-Texturen in den " +"Schreibt alle während der Emulation decodierten Spiele-Texturen in den " "Ordner User/Dump/Textures//.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -1874,10 +1910,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Speichert alle während der Emulation erzeugten EFB-Kopien in den Ordner User/" +"Schreibt alle während der Emulation erzeugten EFB-Kopien in den Ordner User/" "Dump/Textures/.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1891,7 +1927,7 @@ msgstr "&Beenden" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 msgid "EFB Copies" -msgstr "EFB Kopien" +msgstr "EFB-Kopien" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210 #, c-format @@ -1901,7 +1937,7 @@ msgid "" "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"FEHLER: Diese Version von Dolphin benötigt einen TAP-Win32 Treiber, mit " +"FEHLER: Diese Version von Dolphin benötigt einen TAP-Win32-Treiber, mit " "mindestens Version %d.%d -- Wenn du Dolphin kürzlich aktualisiert hast, ist " "eventuell ein Neustart nötig, damit Windows den neuen Treiber erkennt." @@ -1911,7 +1947,7 @@ msgstr "EUROPA" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "Early Memory Updates" -msgstr "Frühe Speicher Updates" +msgstr "Frühe Speicher-Updates" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" @@ -1919,7 +1955,7 @@ msgstr "Bearbeiten" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17 msgid "Edit ActionReplay Code" -msgstr "ActionReplay Code bearbeiten" +msgstr "ActionReplay-Code bearbeiten" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:286 msgid "Edit Config" @@ -1927,7 +1963,7 @@ msgstr "Einstellungen bearbeiten" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Lokale Überbrückungen bearbeiten" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -1948,7 +1984,7 @@ msgstr "Effekt" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "Embedded Frame Buffer" -msgstr "" +msgstr "Frame Buffer eingebunden" #: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" @@ -1963,11 +1999,11 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" "Aktiviert die exakte Emulation von XFB.\n" -"Dies beinträchtigt die emulationsgeschwindigkeit erheblich und verhindert " +"Dies beinträchtigt die Emulationsgeschwindigkeit erheblich und verhindert " "das Rendern in hohen Auflösungen, wird aber für die korrekte Emulation " "einiger Spiele benötigt.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel, aktiviere stattdessen die virtuelle XFB-Emulation." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" @@ -1980,11 +2016,11 @@ msgid "" msgstr "" "Emuliert XFB unter Verwendung von GPU-Texturobjekten.\n" "Dies behebt Probleme in vielen Spielen, die ohne XFB-Emulation nicht " -"funktionieren und nebenbei erheblich schneller als die exakte XFB-Emulation " -"ist. Dennoch ist diese Option für viele Spiele (insbesondere Homebrew) nicht " +"funktionieren und ist nicht so langsam wie die tatsächliche XFB-Emulation. " +"Dennoch ist diese Option für viele Spiele (insbesondere Homebrew) nicht " "ausreichend.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel aktiviert lassen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Emulated Wiimote" @@ -1992,7 +2028,7 @@ msgstr "Emulierte Wiimote" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " -msgstr "Status:" +msgstr "Emulationsstatus:" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Enable" @@ -2007,15 +2043,16 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Aktiviert, sofern von deiner GPU unterstützt, 3D-Effekte mittels " -"Stereoskopie unter Verwendung der Nvidia 3D Vision-Technologie.\n" -"Verursacht gerne Probleme und funktioniert nur im Vollbildmodus.\n" +"Aktiviert 3D-Effekte mittels Stereoskopie unter Verwendung der Nvidia 3D " +"Vision-Technologie, sofern von deiner GPU unterstützt,.\n" +"Verursacht möglicherweise Probleme.\n" +"Funktioniert nur im Vollbildmodus.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 msgid "Enable AR Logging" -msgstr "AR Logging aktivieren" +msgstr "AR-Logging aktivieren" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" @@ -2047,7 +2084,7 @@ msgstr "Idle-Skipping aktivieren" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" -msgstr "Idle-Skipping aktivieren (schneller)" +msgstr "Idle-Skipping aktivieren (Beschleunigung)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" @@ -2063,11 +2100,11 @@ msgstr "Bildschirmschoner aktivieren" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Enable Speaker Data" -msgstr "" +msgstr "Lautsprecherdaten aktivieren" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" -msgstr "Breitbildmodus" +msgstr "Breitbild aktivieren" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" @@ -2081,6 +2118,11 @@ msgid "" "\n" "If unsure, select 1x." msgstr "" +"Anisotropische Filterung aktivieren.\n" +"Verbessert die Texturenqualität bei schrägen Blickwinkeln.\n" +"Kann bei einigen wenigen Spielen Fehler verursachen.\n" +"\n" +"Im Zweifel, wähle 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "" @@ -2088,7 +2130,7 @@ msgid "" "Compatible)" msgstr "" "Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " -"(ON = Schnell, OFF = Kompatibel)" +"(AN = Geschwindigkeit, AUS = Kompatibilität)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Enable pages" @@ -2101,6 +2143,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Aktiviere dies, wenn du den ganzen Bildschirm zum Rendern verwenden " +"möchtest.\n" +"Wenn dies deaktiviert ist, wird ein Renderfenster erstellt.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" @@ -2109,14 +2156,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Aktiviere dies, wenn du das Hauptfenster von Dolphin zum Rendern verwenden " +"willst anstelle eines getrennten Renderfensters.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -"Dies aktivieren, um \"The Legend of Zelda: Twilight Princess\" zu " -"beschleunigen. Dies für JEDES andere Spiel deaktivieren." +"Aktiviere dies, um \"The Legend of Zelda: Twilight Princess\" zu " +"beschleunigen. Für JEDES andere Spiel deaktivieren." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Enables Custom Projection Hack" @@ -2127,15 +2178,15 @@ msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" -"Dolby Pro Logic II Emulation wird aktiviert, indem 5.1 Surround verwendet " +"Dolby Pro Logic II-Emulation wird aktiviert, indem 5.1 Surround verwendet " "wird. Nicht für OS X verfügbar." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" -"Dolby Pro Logic II Emulation wird aktiviert, indem 5.1 Surround verwendet " -"wird. Funktioniert nur mit OpenAL backend." +"Dolby Pro Logic II-Emulation wird aktiviert, indem 5.1 Surround verwendet " +"wird. Funktioniert nur mit OpenAL Backend." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" @@ -2144,14 +2195,19 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Aktiviert Progressiven Scan wenn er von der emulierten Software unterstützt " +"wird.\n" +"Dies betrifft die meisten Spiele nicht.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -"Aktiviert die Speicher-Verwaltungs-Einheit, die für einige Spiele gebraucht " -"wird. (ON = Kompatibel, OFF = Schnell)" +"Aktiviert die Speicher-Verwaltungseinheit, die für einige Spiele gebraucht " +"wird. (AN = Kompatibilität, AUS = Geschwindigkeit)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2159,6 +2215,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Frame Dumps mit dem FFV1-Codec komprimieren.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:40 msgid "End" @@ -2202,7 +2261,7 @@ msgstr "Fehler" #: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" -"Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " +"Fehler beim Laden der ausgewählten Sprache. Kehre nun zum Systemstandard " "zurück." #: Source/Core/Common/Src/ChunkFile.h:221 @@ -2211,8 +2270,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -"Fehler: Nach \"%s\" wurde %d (0x%X), anstatt %d (0x%X) gefunden. Spielstand " -"laden wird abgebrochen..." +"Fehler: Nach \"%s\" wurde %d (0x%X), anstatt Save Marker %d (0x%X) gefunden. " +"Spielstand laden wird abgebrochen..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329 #, c-format @@ -2221,7 +2280,8 @@ msgid "" "fonts correctly, or crash." msgstr "" "Fehler: Versuche auf Schriftart %s zuzugreifen, aber sie wurde nicht " -"geladen. Das Spiel wird die Schriftart nicht anzeigen, oder Abstürzen." +"geladen. Spiele werden die Schriftart nicht korrekt darstellen oder " +"abstürzen." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:17 msgid "Escape" @@ -2229,12 +2289,12 @@ msgstr "Escape" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30 msgid "Euphoria" -msgstr "Euphorie" +msgstr "Euphoria" #: Source/Core/Core/Src/ArmMemTools.cpp:78 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" +msgstr "Ausnahmeprotokoll - Zugriff unter Speicherplatz. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Execute" @@ -2243,12 +2303,11 @@ msgstr "Ausführen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Beenden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Alle Spielstände exportieren" +msgstr "Alle Wii-Spielstände exportieren" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2272,14 +2331,13 @@ msgstr "Spielstand exportieren" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868 msgid "Export Wii save (Experimental)" -msgstr "Wii Spielstand exportieren (Experimentell)..." +msgstr "Wii-Spielstand exportieren (Experimentell)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:793 msgid "Export all saves" msgstr "Alle Spielstände exportieren" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" msgstr "Exportieren fehlgeschlagen" @@ -2293,7 +2351,7 @@ msgstr "Erweiterung" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "External Frame Buffer" -msgstr "" +msgstr "Externer Frame Buffer" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:48 msgid "Extra Parameter" @@ -2338,7 +2396,7 @@ msgstr "Extrahiere alle Dateien" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" -msgstr "Extrahiere Ordner" +msgstr "Extrahiere Verzeichnis" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." @@ -2346,11 +2404,11 @@ msgstr "Extrahieren..." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904 msgid "FIFO Byte" -msgstr "FIFO Byte" +msgstr "FIFO-Byte" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32 msgid "FIFO Player" -msgstr "FIFO Player" +msgstr "FIFO-Player" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:163 msgid "FRANCE" @@ -2358,7 +2416,7 @@ msgstr "FRANKREICH" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "FST Size:" -msgstr "FST Größe:" +msgstr "FST-Größe:" #: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" @@ -2385,6 +2443,15 @@ msgid "" "You may use the DSP HLE engine which does not require ROM dumps.\n" "(Choose it from the \"Audio\" tab of the configuration dialog.)" msgstr "" +"DSP-ROM konnte nicht geladen werden:\t %s\n" +"\n" +"Diese Datei wird für DSP LLE benötigt.\n" +"Sie ist nicht in Dolphin enthalten, da sie urheberrechtlich geschützte Daten " +"beinhaltet.\n" +"Benutze DSPSpy um die Datei von deiner echten Konsole zu dumpen.\n" +"\n" +"Du kannst die DSP HLE-Engine benutzen, welche keine ROM-Dumps benötigt.\n" +"(Diese kannst du im Audio-Tab in den Einstellungen auswählen.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131 @@ -2392,6 +2459,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Bthprops.cpl konnte nicht geladen werden! Echte Wiimotes werden nicht " +"funktionieren und Dolphin kann unerwartet abstürzen!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2399,6 +2468,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Hid.dll konnte nicht geladen werden! Echte Wiimotes werden nicht " +"funktionieren und Dolphin kann unerwartet abstürzen!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2411,7 +2482,7 @@ msgstr "Fehler beim Lesen von banner.bin" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" -msgstr "" +msgstr "Fehler beim Lesen des BK-Headers" #: Source/Core/Core/Src/HW/GCMemcard.cpp:211 #, c-format @@ -2429,7 +2500,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"Konnte das Blockzuteilungtabellen-Backup nicht richtig lesen\n" +"Konnte das Blockzuteilungtabellen-Backup nicht korrekt lesen\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:130 @@ -2437,7 +2508,7 @@ msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" msgstr "" -"Konnte die Blockzuteilungtabellen nicht richtig lesen\n" +"Konnte die Blockzuteilungtabellen nicht korrekt lesen\n" "(0x6000-0x7FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 @@ -2448,14 +2519,14 @@ msgstr "Fehler beim Lesen von Daten aus Datei %d" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" -msgstr "" +msgstr "Fehler beim Lesen von Daten aus der Datei: %s" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -"Konnte das Backup-Verzeichnis nicht richtig lesen\n" +"Konnte das Backup-Verzeichnis nicht korrekt lesen\n" "(0x4000-0x5FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:118 @@ -2463,25 +2534,25 @@ msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -"Konnte das Verzeichnis nicht richtig lesen\n" +"Konnte das Verzeichnis nicht korrekt lesen\n" "(0x2000-0x3FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" -msgstr "" +msgstr "Fehler beim Lesen des Headers" #: Source/Core/Core/Src/HW/GCMemcard.cpp:107 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -"Konnte den Header nicht richtig lesen\n" +"Konnte den Header nicht korrekt lesen\n" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Fehler beim Schreiben eines Header für Datei %d" +msgstr "Fehler beim Lesen des Headers für Datei %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2496,9 +2567,9 @@ msgid "Failed to write bkhdr" msgstr "Fehler beim Schreiben von bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Fehler beim Lesen von Daten aus Datei %d" +msgstr "Fehler beim Schreiben von Daten in Datei: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2515,21 +2586,23 @@ msgstr "Schnell" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Schnelle Tiefenberechnung" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." -msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." +msgstr "Schnelle Version der MMU. Funktioniert nicht mit allen Spielen." #: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" +"Fataler Desync. Wiedergabe wird abgebrochen. (Fehler in PlayWiimote: %u != " +"%u, byte %u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" -msgstr "Fifo Player" +msgstr "Fifo-Player" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86 msgid "File Info" @@ -2557,12 +2630,12 @@ msgid "" "File has the extension \"%s\"\n" "valid extensions are (.raw/.gcp)" msgstr "" -"Die Datei besitzt die Erweiterung \"%s\",\n" +"Datei besitzt die Erweiterung \"%s\",\n" "gültige Erweiterungen sind (.raw/.gcp)." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 msgid "File is not recognized as a memcard" -msgstr "Diese Datei wird nicht als Memorycard anerkannt." +msgstr "Diese Datei wird nicht als Speicherkarte erkannt." #: Source/Core/DiscIO/Src/CompressedBlob.cpp:281 msgid "File not compressed" @@ -2571,7 +2644,7 @@ msgstr "Datei nicht komprimiert" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" -msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" +msgstr "FileIO: Unbekanter Öffnen-Modus : 0x%02x" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:549 msgid "Filesystem" @@ -2620,6 +2693,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Erzwingt Texturfilterung, auch wenn das emulierte Spiel dies explizit " +"deaktiviert.\n" +"Verbessert die Texturenqualität geringfügig aber verursacht Fehler in " +"einigen Spielen.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" @@ -2629,9 +2708,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n" -"Dies kann Grafikfehler verursachen!\n" +"Dies kann Grafikfehler verursachen.\n" "\n" -"Aktiviere diese Option nur, wenn du weißt, was du tust." +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" @@ -2639,13 +2718,16 @@ msgid "" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " "setting when playing Japanese games." msgstr "" +"Erzwingt den NTSC-J-Modus um die japanische ROM-Schriftart zu verwenden.\n" +"Deaktiviert benutzt Dolphin die Standardeinstellung NTSC-U und aktiviert " +"diese Option automatisch wenn japanische Spiele gespielt werden." #: Source/Core/Core/Src/HW/GCMemcard.cpp:62 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" msgstr "" -"Das Format ähnelt dem ASCII-Zeichensatz (NTSC\\PAL)?\n" +"Als ASCII-Zeichensatz formatieren (NTSC/PAL)?\n" "Wähle 'Nein' für SJIS (NTSC-J)." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:266 @@ -2654,7 +2736,7 @@ msgstr "Vorwärts" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Port öffnen (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2662,9 +2744,9 @@ msgid "Found %d results for '" msgstr "%d Ergebnisse gefunden für '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Konnte %s nicht speichern" +msgstr "%x Spielstände gefunden." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2681,7 +2763,7 @@ msgstr "Einzelbildwiedergabe" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Frame Dumps use FFV1" -msgstr "" +msgstr "Frame-Dumps verwenden FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215 msgid "Frame Info" @@ -2689,7 +2771,7 @@ msgstr "Bildinfo" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103 msgid "Frame Range" -msgstr "" +msgstr "Bildbereich" #: Source/Core/DolphinWX/Src/FrameTools.cpp:139 msgid "Frame S&kipping" @@ -2705,7 +2787,7 @@ msgstr "Bilder zum Aufzeichnen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Free Look" -msgstr "Frei Umsehen" +msgstr "Freies Umsehen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2715,12 +2797,12 @@ msgstr "Französisch" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42 msgid "Frets" -msgstr "" +msgstr "Frets" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 msgid "From" -msgstr "von" +msgstr "Von" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" @@ -2732,11 +2814,11 @@ msgstr "Vollbildauflösung:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 msgid "GCI File(*.gci)" -msgstr "GCI Datei(*.gci)" +msgstr "GCI-Datei(*.gci)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "GCPad" -msgstr "GC-Pad" +msgstr "GCPad" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667 msgid "GX_CMD_INVL_VC" @@ -2748,11 +2830,11 @@ msgstr "Spiel-ID:" #: Source/Core/Core/Src/NetPlayClient.cpp:418 msgid "Game is already running!" -msgstr "Spiel wird bereits emuliert!" +msgstr "Spiel läuft bereits!" #: Source/Core/Core/Src/NetPlayClient.cpp:592 msgid "Game isn't running!" -msgstr "Spiel wird nicht emuliert!" +msgstr "Spiel läuft nicht!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" @@ -2760,7 +2842,7 @@ msgstr "Spiel nicht gefunden!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" -msgstr "Spiel-Spezifische Einstellungen" +msgstr "Spielspezifische Einstellungen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" @@ -2768,7 +2850,7 @@ msgstr "Spieleinstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:515 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "GameCube Speicherdateien (*.gci;*.gcs;*.sav)" +msgstr "GameCube-Speicherdateien (*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" @@ -2776,7 +2858,7 @@ msgstr "Gamecube" #: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "Gamecube &Pad Settings" -msgstr "GameCube &Pad Einstellungen" +msgstr "GameCube &Pad-Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 @@ -2785,7 +2867,7 @@ msgstr "Gamecube-Speicherkarten (*.raw,*.gcp)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:471 msgid "Gamecube Pad settings" -msgstr "Gamecube Pad Einstellungen" +msgstr "Gamecube Pad-Einstellungen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 @@ -2800,6 +2882,10 @@ msgid "" "native code handler by placing the codehandler.bin file into the Sys " "directory and restarting Dolphin.)" msgstr "" +"Fehler beim Starten von GeckoCodes (CT%i CST%i) (%s)\n" +"(Fehlerhafter Code oder der Code-Typ wird noch nicht unterstützt. Versuche " +"den nativen Code-Handler zu benutzen, indem du die Datei Codehandler.bin in " +"das Sys-Verzeichnis verschiebst und Dolphin neustartest.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 @@ -2844,6 +2930,13 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Verbessert die Qualität von Texturen, die durch den Render-to-Texture-Effekt " +"generiert werden, deutlich.\n" +"Erhöhe die interne Auflösung um diesen Effekt zu verstärken.\n" +"Reduziert die Leistung geringfügig und kann Abstürze verursachen (wenn auch " +"unwahrscheinlich).\n" +"\n" +"Im Zweifel aktiviert lassen." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Greek" @@ -2896,6 +2989,15 @@ msgid "" "\n" "Sayonara!\n" msgstr "" +"Hi,\n" +"\n" +"Dolphin benötigt Mac OS X 10.7 oder besser.\n" +"Leider besitzt du eine alte Version von OS X.\n" +"Die letzte Dolphin-Version die OS X 10.6 unterstützt ist Dolphin 3.5\n" +"Bitte upgrade auf 10.7 oder besser um die neueste Dolphin-Version zu " +"benutzen.\n" +"\n" +"Sayonara!\n" #: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" @@ -2908,7 +3010,7 @@ msgid "" msgstr "" "Hi,\n" "\n" -"Dolphin benötigt einen CPU der SSE2 unterstützt.\n" +"Dolphin benötigt einen CPU der SSE2-Erweiterungen unterstützt.\n" "Leider unterstützt Ihr CPU dies nicht, deshalb wird Dolphin nicht " "ausgeführt.\n" "\n" @@ -2920,7 +3022,7 @@ msgstr "Verbergen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308 msgid "Hide Mouse Cursor" -msgstr "Mauszeiger ausblenden" +msgstr "Mauszeiger verstecken" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -2928,6 +3030,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Versteckt den Mauszeiger, wenn er sich über dem Emulationsfenster.\n" +"\n" +"Im Zweifel aktiviert lassen." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Home" @@ -2940,12 +3045,12 @@ msgstr "Host" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:31 msgid "Hotkey Configuration" -msgstr "Kurztastenbelegung" +msgstr "Tastenkürzelbelegung" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" -msgstr "Kurztasten" +msgstr "Tastenkürzel" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" @@ -2970,6 +3075,10 @@ msgid "" "TitleID %016llx.\n" " Dolphin will likely hang now." msgstr "" +"IOCTL_ES_LAUNCH: Das Spiel versucht ein IOS oder einen Titel der nicht in " +"deinem NAND-Dump verfügbar ist neu zu laden.\n" +"TitleID %016llx.\n" +"Dolphin wird sich jetzt wahrscheinlich aufhängen." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" @@ -3012,6 +3121,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +"Wenn aktiviert werden die Bounding Box-Register aktualisiert. Wird von den " +"Paper Mario-Spielen verwendet." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Ignore Format Changes" @@ -3025,6 +3136,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Ignoriere jegliche Änderung am EFB-Format.\n" +"Verbessert die Leistung in vielen Spielen ohne negative Auswirkungen, in " +"einigen wenigen erzeugt es allerdings Grafikfehler.\n" +"\n" +"Im Zweifel aktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" @@ -3034,27 +3150,30 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Ignoriert jegliche Anfragen der CPU von der EFB zu lesen oder zu schreiben.\n" +"Verbessert die Leistung in einigen Spielen, kann aber einige spielabhängige " +"oder grafische Effekte deaktivieren.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:791 msgid "Import Save" msgstr "Spielstand importieren" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Spielstand importieren" +msgstr "Wii-Spielstand importieren" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Exportieren fehlgeschlagen" +msgstr "Importieren fehlgeschlagen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -"Die importierte Datei hat die Erweiterung gsc, aber besitzt keinen korrekten " +"Importierte Datei hat die Erweiterung GSC, aber besitzt keinen korrekten " "Header." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:429 @@ -3066,7 +3185,7 @@ msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -"Importierte Datei hat die Erweiterung sav,\n" +"Importierte Datei hat die Erweiterung SAV,\n" "aber besitzt keinen korrekten Header." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 @@ -3074,9 +3193,8 @@ msgid "In Game" msgstr "Im Spiel" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Framelimit:" +msgstr "Framebegrenzung erhöhen" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3101,11 +3219,11 @@ msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" -msgstr "SD-Karte eingesetzt" +msgstr "SD-Karte einfügen" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21 msgid "Insert name here.." -msgstr "Namen hier eingeben.." +msgstr "Name hier eingeben.." #: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Install WAD" @@ -3120,7 +3238,7 @@ msgstr "Zum Wii-Menü hinzufügen" msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " +"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesen " "noch nicht." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 @@ -3129,15 +3247,15 @@ msgstr "WAD installieren..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:930 msgid "Integrity Check Error" -msgstr "" +msgstr "Fehler bei der Unversehrtheitsprüfung" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:936 msgid "Integrity check completed" -msgstr "" +msgstr "Unversehrtheitsprüfung abgeschlossen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:935 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "Unversehrtheitsprüfung abgeschlossen. Es wurden keine Fehler gefunden." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:927 #, c-format @@ -3145,10 +3263,12 @@ msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"Unversehrtheitsprüfung für Partition %d fehlgeschlagen. Der Dump ist " +"möglicherweise fehlerhaft oder wurde fehlerhaft gepatcht." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" -msgstr "Oberfläche" +msgstr "Benutzeroberfläche" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:633 msgid "Interface Settings" @@ -3156,7 +3276,7 @@ msgstr "Benutzeroberflächeneinstellungen" #: Source/Core/Core/Src/State.cpp:269 msgid "Internal LZO Error - compression failed" -msgstr "Internationaler LZO-Fehler - Komprimierung fehlgeschlagen" +msgstr "Interner LZO-Fehler - Komprimierung fehlgeschlagen" #: Source/Core/Core/Src/State.cpp:393 #, c-format @@ -3164,17 +3284,16 @@ msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -"Internationaler LZO-Fehler - Dekomprimierung fehlgeschlagen (%d) (%li, " -"%li) \n" -"Versuche diesen Status nochmal zu laden." +"Interner LZO-Fehler - Dekomprimierung fehlgeschlagen (%d) (%li, %li) \n" +"Versuche diesen Stand nochmal zu laden." #: Source/Core/Core/Src/State.cpp:530 msgid "Internal LZO Error - lzo_init() failed" -msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" +msgstr "Interner LZO-Fehler - lzo_init() fehlgeschlagen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353 msgid "Internal Resolution:" -msgstr "" +msgstr "Interne Auflösung:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" @@ -3187,7 +3306,7 @@ msgstr "Intro" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" -msgstr "" +msgstr "Ungültige Größe(%x) oder Magisches Wort (%x)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617 msgid "Invalid Value!" @@ -3213,9 +3332,9 @@ msgid "" "%s\n" " You may need to redump this game." msgstr "" -"Ungültige opening.bnr gefunden in gcm:\n" +"Ungültige opening.bnr gefunden in GCM:\n" "%s\n" -" Möglicherweise müssen Sie dieses Spiel neu dumpen." +"Möglicherweise müssen Sie dieses Spiel neu dumpen." #: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" @@ -3223,19 +3342,19 @@ msgstr "Ungültige Aufnahmedatei" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "Ungültige Suchparameter (kein Objekt ausgewählt)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454 msgid "Invalid search string (couldn't convert to number)" -msgstr "" +msgstr "Ungültiger Suchbegriff (konnte nicht zu Zahl konvertieren)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "Ungültiger Suchbegriff (nur gerade Zeichenlängen werden unterstützt)" #: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" -msgstr "Ungültiger Status" +msgstr "Ungültiger Stand" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3270,10 +3389,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Spielfenster überlappt alle anderen Fenster.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 msgid "Keep window on top" -msgstr "" +msgstr "Fenster immer im Vordergrund" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 msgid "Key" @@ -3305,7 +3427,7 @@ msgstr "Sprache:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Letzte %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3325,8 +3447,8 @@ msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -"Zum Erkennen, auf Tastenkürzel linksklicken.\n" -"Drücken Sie die Leertaste, zum löschen." +"Zum Erkennen der Tastenkürzel linksklicken.\n" +"Leertaste zum Löschen." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742 msgid "" @@ -3343,7 +3465,7 @@ msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -"Links/Rechts-Klick für mehr Optionen.\n" +"Links-/Rechtsklick für weitere Optionen.\n" "Mittlere Maustaste zum Löschen." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 @@ -3352,7 +3474,7 @@ msgstr "Kleiner als" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" -msgstr "" +msgstr "FPS beschränken" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979 msgid "Load" @@ -3363,95 +3485,84 @@ msgid "Load Custom Textures" msgstr "Lade benutzerdefinierte Texturen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "Spielstand &laden" +msgstr "Lade Status" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Status aus Slot 1 laden" +msgstr "Lade Status zuletzt 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Status aus Slot 2 laden" +msgstr "Lade Status zuletzt 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Status aus Slot 3 laden" +msgstr "Lade Status zuletzt 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Status aus Slot 4 laden" +msgstr "Lade Status zuletzt 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Status aus Slot 5 laden" +msgstr "Lade Status zuletzt 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Status aus Slot 6 laden" +msgstr "Lade Status zuletzt 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Status aus Slot 7 laden" +msgstr "Lade Status zuletzt 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Status aus Slot 8 laden" +msgstr "Lade Status zuletzt 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" -msgstr "Status aus Slot 1 laden" +msgstr "Stand aus Slot 1 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Status aus Slot 1 laden" +msgstr "Lade Status aus Slot 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" -msgstr "Status aus Slot 2 laden" +msgstr "Stand aus Slot 2 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 msgid "Load State Slot 3" -msgstr "Status aus Slot 3 laden" +msgstr "Stand aus Slot 3 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 msgid "Load State Slot 4" -msgstr "Status aus Slot 4 laden" +msgstr "Stand aus Slot 4 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 msgid "Load State Slot 5" -msgstr "Status aus Slot 5 laden" +msgstr "Stand aus Slot 5 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 msgid "Load State Slot 6" -msgstr "Status aus Slot 6 laden" +msgstr "Stand aus Slot 6 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 msgid "Load State Slot 7" -msgstr "Status aus Slot 7 laden" +msgstr "Stand aus Slot 7 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 msgid "Load State Slot 8" -msgstr "Status aus Slot 8 laden" +msgstr "Stand aus Slot 8 laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Status aus Slot 1 laden" +msgstr "Lade Status aus Slot 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." -msgstr "Status laden..." +msgstr "Stand laden..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" @@ -3460,7 +3571,7 @@ msgstr "Wii-Systemmenü laden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1412 #, c-format msgid "Load Wii System Menu %d%c" -msgstr "Wii-Systemmenü %d%c laden" +msgstr "Wii-Systemmenü laden %d%c" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" @@ -3468,10 +3579,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Benutzerdefinierte Texturen aus User/Load/Textures// laden.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:37 msgid "Load preset values from hack patterns available." -msgstr "" +msgstr "Voreinstellungswerte aus Hackvorlagen verfügbar" #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" @@ -3479,15 +3593,15 @@ msgstr "Log" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13 msgid "Log Configuration" -msgstr "" +msgstr "Log-Einstellungen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Log FPS to file" -msgstr "" +msgstr "FPS in Datei loggen" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Log Types" -msgstr "" +msgstr "Log-Typen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" @@ -3496,10 +3610,15 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Gerenderte Frames pro Sekunde in User/Logs/fps.txt loggen.\n" +"Verwenden Sie diese Funktion wenn Sie die Leistung von Dolphin messen " +"wollen.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68 msgid "Logger Outputs" -msgstr "" +msgstr "Logger-Ausgabe" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/Frame.cpp:320 @@ -3520,7 +3639,7 @@ msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" -"MD5 Konflikt\n" +"Unterschiedliche MD5-Prüfsummen\n" " %016llx%016llx != %016llx%016llx" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 @@ -3530,7 +3649,7 @@ msgstr "MMU Speed Hack" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:517 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 msgid "MadCatz Gameshark files(*.gcs)" -msgstr "MadCatz Gameshark Dateien(*.gcs)" +msgstr "MadCatz Gameshark-Dateien(*.gcs)" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38 @@ -3553,6 +3672,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Macht entfernte Objekte deutlicher indem Nebel entfernt wird, erhöht dadurch " +"die allgemeine Detailfülle.\n" +"Nebel zu deaktivieren kann einige Spiele unspielbar machen, die die korrekte " +"Nebelemulation benötigen.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116 @@ -3561,15 +3686,16 @@ msgstr "Max" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 msgid "Memcard already has a save for this title" -msgstr "Die Speicherkarte enthält bereits ein Spiel mit dem gleichen Titel." +msgstr "" +"Die Speicherkarte enthält bereits einen Speicherstand für diesen Titel." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:278 msgid "Memcard already opened" -msgstr "Memorycard ist bereits geöffnet" +msgstr "Speicherkarte ist bereits geöffnet" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924 msgid "Memory Byte" -msgstr "Seicherbyte" +msgstr "Speicherbyte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 @@ -3581,8 +3707,8 @@ msgid "" "Memory Card Manager WARNING-Make backups before using, should be fixed but " "could mangle stuff!" msgstr "" -"Memory-Card Manager WARNUNG - Erstelle Backups bevor der Benutzung. Dies " -"sollte zwar gefixt sein, aber könnte dennoch Probleme machen (mangle stuff)!" +"Speicherkarten-Manager WARNUNG - Erstelle Backups vor der Benutzung. Dies " +"sollte zwar behoben sein, aber könnte dennoch Fehler verursachen!" #: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format @@ -3594,12 +3720,12 @@ msgid "" "%s\n" "Would you like to copy the old file to this new location?\n" msgstr "" -"Der Memory Card Dateiname in Slot %c is ungültig,\n" -"die Region ist nicht festgelegt.\n" +"Der Speicherkarten-Dateiname in Slot %c is ungültig,\n" +"Region ist nicht festgelegt.\n" "\n" -"Slot %c Path wurde geändert zu:\n" +"Slot %c Pfad wurde geändert zu:\n" "%s\n" -"Möchten Sie die alte Datei, zu diesem neuen Speicherort kopieren?\n" +"Möchten Sie die alte Datei zum neuen Speicherort kopieren?\n" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 msgid "Memorycard filesize does not match the header size" @@ -3640,10 +3766,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Modifiziere Texturen um das Format anzuzeigen, in dem sie geschrieben sind. " +"Benötigt in den meisten Fällen einen Reset der Emulation.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/LogWindow.cpp:108 msgid "Monospaced font" -msgstr "Monospaced Schriftart" +msgstr "Schrift mit gleichmäßigen Zeichenabständen" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296 msgid "Motion Plus" @@ -3675,7 +3805,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:62 msgid "Multiply" -msgstr "Multiplikation" +msgstr "Multiplizieren" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659 msgid "NOP" @@ -3683,7 +3813,7 @@ msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "HINWEIS: Streamgröße entspricht nicht der tatsächlichen Datenlänge\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:116 msgid "NP Add" @@ -3723,7 +3853,7 @@ msgstr "Num Gleich" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:103 msgid "NP Home" -msgstr "" +msgstr "Num Home" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:112 msgid "NP Insert" @@ -3751,7 +3881,7 @@ msgstr "Num Rechts" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:117 msgid "NP Separator" -msgstr "" +msgstr "Num Trennzeichen" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:96 msgid "NP Space" @@ -3785,7 +3915,7 @@ msgstr "Name: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:516 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:555 msgid "Native GCI files(*.gci)" -msgstr "Native GCI Dateien(*.gci)" +msgstr "Native GCI-Dateien(*.gci)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 msgid "New Scan" @@ -3814,12 +3944,12 @@ msgstr "Keine ISOs oder WADs gefunden" #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "" +msgstr "Keine Audioausgabe" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" -msgstr "Keine Banner-Datei für Tittel %s gefunden." +msgstr "Keine Banner-Datei für Titel %s gefunden." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778 @@ -3828,7 +3958,7 @@ msgstr "Keine Beschreibung vorhanden" #: Source/Core/DolphinWX/Src/FrameAui.cpp:535 msgid "No docking" -msgstr "Nicht Andocken" +msgstr "Kein Docking" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871 msgid "No file loaded" @@ -3840,12 +3970,12 @@ msgstr "Keine freien Verzeichnis-Indexeinträge." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 msgid "No recorded file" -msgstr "" +msgstr "Keine Aufnahmedatei" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" -msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." +msgstr "Kein Spielstand-Ordner für Titel %s gefunden." #: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138 #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 @@ -3877,7 +4007,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" -msgstr "Nicht Verbunden" +msgstr "Nicht verbunden" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Notes" @@ -3894,7 +4024,7 @@ msgstr "Notizen: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:667 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31 msgid "Notice" -msgstr "Notizen" +msgstr "Hinweis" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:92 msgid "Num Lock" @@ -3911,7 +4041,7 @@ msgstr "Nunchuk" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 msgid "Nunchuk Acceleration" -msgstr "Nunchuck Beschleunigung" +msgstr "Nunchuck-Beschleunigung" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "Object" @@ -3919,7 +4049,7 @@ msgstr "Objekt" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122 msgid "Object Range" -msgstr "" +msgstr "Objektreichweite" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" @@ -3931,11 +4061,11 @@ msgstr "Offset:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" -msgstr "" +msgstr "Bildschirmnachrichten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "Online-&Dokumentation" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -3953,7 +4083,7 @@ msgstr "Beinhaltenden &Ordner öffnen..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867 msgid "Open Wii &save folder" -msgstr "&Wii Spielstand-Ordner öffnen..." +msgstr "&Wii-Spielstand-Ordner öffnen..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:459 msgid "Open file..." @@ -3975,7 +4105,7 @@ msgstr "OpenAL: Kann Gerät %s nicht öffnen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "OpenCL Texture Decoder" -msgstr "OpenCL Textur-Dekoder" +msgstr "OpenCL Texturen-Dekodierer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "OpenMP Texture Decoder" @@ -3986,10 +4116,13 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Öffnet die Standard-Konfiguration für dieses Spiel (schreibgeschützt) in " +"einem externen Texteditor." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." msgstr "" +"Öffnet die benutzerdefinierten Überbrückungen in einem externen Texteditor." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4001,16 +4134,15 @@ msgid "Orange" msgstr "Orange" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"Die Reihenfolge der Dateien im Datei-Verzeichnis übereinstimmen nicht mit " -"der Block-Reihenfolge,\n" -"klicke Rechts und exportiere alle Spielstände,\n" -"und importiere die Spielstände auf eine neue Memorycard.\n" +"Die Reihenfolge der Dateien im Datei-Verzeichnis stimmen nicht mit der Block-" +"Reihenfolge überein,\n" +"Rechtsklicke und exportiere alle Spielstände\n" +"und importiere sie auf eine neue Speicherkarte.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4022,8 +4154,8 @@ msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." msgstr "" -"Der andere Client wurde, während das Spiel läuft, getrennt! Nun ist NetPlay " -"inaktiv. Beenden Sie nun manuell das Spiel." +"Der andere Client wurde während des laufenden Spiels getrennt! NetPlay ist " +"deaktiviert. Beenden Sie das Spiel manuell." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528 msgid "Output" @@ -4069,11 +4201,11 @@ msgstr "Partition %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Partition existiert nicht: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" -msgstr "Patche" +msgstr "Patches" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Paths" @@ -4087,11 +4219,11 @@ msgstr "Pause" #: Source/Core/DolphinWX/Src/FrameTools.cpp:129 msgid "Pause at end of movie" -msgstr "" +msgstr "Pause am Ende des Films" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Per-Pixel Lighting" -msgstr "" +msgstr "Per-Pixel Lighting" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:360 msgid "Perfect" @@ -4123,7 +4255,7 @@ msgstr "Spielbar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141 msgid "Playback Options" -msgstr "" +msgstr "Wiedergabeoptionen" #: Source/Core/DolphinWX/Src/NetWindow.cpp:322 msgid "Players" @@ -4131,7 +4263,7 @@ msgstr "Spieler" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1040 msgid "Please confirm..." -msgstr "Bitte Bestätigen..." +msgstr "Bitte bestätigen..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:612 msgid "Please create a perspective before saving" @@ -4176,26 +4308,26 @@ msgstr "Portugiesisch (Brasilianisch)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Post-Processing Effect:" -msgstr "" +msgstr "Nachbearbeitungseffekt:" #: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "Vorzeitiges Filmende in PlayController. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "Vorzeitiges Filmende in PlayWiimote. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "Vorzeitiges Filmende in PlayWiimote. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:35 msgid "Presets: " -msgstr "" +msgstr "Voreinstellungen:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:192 msgid "Prev Page" @@ -4258,15 +4390,15 @@ msgstr "RUSSLAND" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Radius" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" -msgstr "Weite" +msgstr "Reichweite" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 msgid "Read-only mode" -msgstr "Nur-Lese-Modus" +msgstr "Schreibgeschützter Modus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488 msgid "Real" @@ -4274,7 +4406,7 @@ msgstr "Echt" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Echtes Balance Board" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4289,20 +4421,19 @@ msgstr "Echte Wiimotes" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801 msgid "Record" -msgstr "" +msgstr "Aufnahme" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Aufnahme abspielen" +msgstr "Eingabe aufzeichnen" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" -msgstr "" +msgstr "Aufnahmeinformationen" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189 msgid "Recording Options" -msgstr "" +msgstr "Aufnahmeoptionen" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25 msgid "Red" @@ -4324,6 +4455,13 @@ msgid "" "\n" "If unsure, select None." msgstr "" +"Verringert den durch Rasterisierung von 3D Grafiken entstandenen " +"Treppeneffekt.\n" +"Lässt das gerenderte Bild feiner aussehen.\n" +"Verlangsamt die Emulationsgeschwindigkeit deutlich und verursacht " +"gelegentlich Probleme.\n" +"\n" +"Im Zweifel, \"Keine\" auswählen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77 #: Source/Core/DolphinWX/Src/FrameTools.cpp:460 @@ -4352,10 +4490,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Szene als Drahtgittermodell rendern.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Render to Main Window" -msgstr "Im Hauptfenster Rendern" +msgstr "Im Hauptfenster rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970 @@ -4372,7 +4513,7 @@ msgstr "Eingabe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revision:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4392,6 +4533,8 @@ msgstr "Rumble" msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" +"Führt DSP LLE in einem eigenen Thread aus (nicht empfohlen: kann zum " +"Einfrieren führen)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4399,7 +4542,7 @@ msgstr "Russisch" #: Source/Core/DolphinWX/Src/FrameTools.cpp:150 msgid "Sa&ve State" -msgstr "S&tatus speichern" +msgstr "S&tand speichern" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Safe" @@ -4416,23 +4559,20 @@ msgid "Save GCI as..." msgstr "GCI speichern unter..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "S&tatus speichern" +msgstr "Ältesten Status speichern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "S&tatus speichern" +msgstr "Status speichern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "In Slot 1 speichern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "In Slot 1 speichern" +msgstr "Speichere Status in Slot 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4463,9 +4603,8 @@ msgid "Save State Slot 8" msgstr "In Slot 8 speichern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "In Slot 1 speichern" +msgstr "Speichere Status in Slot 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4491,16 +4630,16 @@ msgstr "Dekomprimierte GCM/ISO speichern" #: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." +msgstr "Spielstandfilm %s ist fehlerhaft, breche die Filmaufnahme ab..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Scaled EFB Copy" -msgstr "" +msgstr "Skalierte EFB-Kopie" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546 #, c-format msgid "Scanning %s" -msgstr "Scannen %s" +msgstr "Suche %s" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529 msgid "Scanning for ISOs" @@ -4536,13 +4675,13 @@ msgstr "Suche derzeitiges Objekt" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242 msgid "Search for hex Value:" -msgstr "" +msgstr "Suche nach Hex-Wert:" #: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113 #: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154 #, c-format msgid "Section %s not found in SYSCONF" -msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" +msgstr "Abschnitt %s nicht gefunden in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:46 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539 @@ -4556,7 +4695,7 @@ msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" -msgstr "Wähle eine Wii WAD zum Installieren aus." +msgstr "Wähle eine Wii-WAD zum Installieren aus." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" @@ -4564,6 +4703,9 @@ msgid "" "\n" "If unsure, use the first one." msgstr "" +"Wähle ein Anzeigegerät aus.\n" +"\n" +"Im Zweifel, wähle den ersten Eintrag." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:510 msgid "Select a save file to import" @@ -4599,10 +4741,17 @@ msgid "" "\n" "If unsure, select Auto." msgstr "" +"Seitenverhältnis beim Rendern auswählen:\n" +"Auto: Natives Seitenverhältnis benutzen\n" +"Erzwinge 16:9: Bild auf das Verhältnis 16:9 strecken\n" +"Erzwinge 4:3: Bild auf das Verhältnis 4:3 strecken.\n" +"An Fenster anpassen: Bild auf Fenstergröße strecken.\n" +"\n" +"Im Zweifel, wähle \"Auto\"." #: Source/Core/InputCommon/Src/InputConfig.cpp:49 msgid "Selected controller profile does not exist" -msgstr "" +msgstr "Ausgewähltes Controller-Profil existiert nicht" #: Source/Core/DolphinWX/Src/LogWindow.cpp:109 msgid "Selected font" @@ -4617,6 +4766,12 @@ msgid "" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" +"Wählt die Bildschirmauflösung für Vollbild aus.\n" +"Sollte immer größer oder gleich zur internen Auflösung sein.\n" +"Auswirkungen auf die Leistung sind vernachlässigbar.\n" +"\n" +"Im Zweifel, wähle deine Desktopauflösung,\n" +"oder die höchste Auflösung die für dich funktioniert." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" @@ -4627,6 +4782,12 @@ msgid "" "\n" "If unsure, use Direct3D 11." msgstr "" +"Bestimmt welche Grafik-API intern verwendet wird.\n" +"Direct3D 9 ist für gewöhnlich die schnellste. OpenGL ist allerdings genauer. " +"Direct3D 11 liegt irgendwo dazwischen.\n" +"Beachte, dass die Direct3D-Backends nur auf Windows verfügbar sind.\n" +"\n" +"Im Zweifel, verwende Direct3D 11." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" @@ -4637,6 +4798,12 @@ msgid "" "\n" "If unsure, use OpenGL." msgstr "" +"Bestimmt welche Grafik-API intern verwendet wird.\n" +"Direct3D 9 ist für gewöhnlich die schnellste. OpenGL ist allerdings genauer. " +"Direct3D 11 liegt irgendwo dazwischen.\n" +"Beachte, dass die Direct3D-Backends nur auf Windows verfügbar sind.\n" +"\n" +"Im Zweifel, verwende OpenGL." #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" @@ -4658,8 +4825,7 @@ msgstr "Serbisch" msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -"Serieller Port 1 - Dies ist der Port, den Geräte, wie der Net-Adapter, " -"benutzen." +"Serieller Port 1 - Dies ist der Port den Geräte wie der Net-Adapter benutzen." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871 msgid "Set as &default ISO" @@ -4681,15 +4847,16 @@ msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" +"Bestimmt die Latenzzeit (in ms): Höhere Werte können Knistergeräusche " +"reduzieren. Nur OpenAL-Backend." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Einstellungen..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" +msgstr "SetupWiiMem: Einstellungsdatei konnte nicht erstellt werden" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4701,7 +4868,7 @@ msgstr "Kurzer Name:" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92 msgid "Shoulder Buttons" -msgstr "" +msgstr "Schultertasten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" @@ -4720,9 +4887,8 @@ msgid "Show &Toolbar" msgstr "&Werkzeugleiste anzeigen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Standard" +msgstr "Standard anzeigen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -4730,7 +4896,7 @@ msgstr "Laufwerke anzeigen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" -msgstr "" +msgstr "EFB-Kopie-Regionen anzeigen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Show FPS" @@ -4746,7 +4912,7 @@ msgstr "GameCube anzeigen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 msgid "Show Input Display" -msgstr "" +msgstr "Eingabebildschirm anzeigen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" @@ -4762,11 +4928,11 @@ msgstr "Korea anzeigen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Show Language:" -msgstr "Anzeigen auf:" +msgstr "Anzeigesprache:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:220 msgid "Show Log &Configuration" -msgstr "" +msgstr "Log-Einstellungen anzeigen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:270 msgid "Show PAL" @@ -4822,7 +4988,7 @@ msgstr "Ersten Block anzeigen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:131 msgid "Show lag counter" -msgstr "" +msgstr "Lag-Zähler anzeigen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" @@ -4830,22 +4996,25 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"Nachrichten im Emulationsfenster anzeigen.\n" +"Diese Nachrichten beinhalten Speichervorgänge auf der Speicherkarte, Video-" +"Backend- und CPU-Informationen und JIT-Cache-Leerungen." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 msgid "Show save blocks" -msgstr "Blöcke anzeigen" +msgstr "Spielstandblöcke anzeigen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Show save comment" -msgstr "Kommentar anzeigen" +msgstr "Spielstandkommentar anzeigen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Show save icon" -msgstr "Symbol anzeigen" +msgstr "Spielstandsymbol anzeigen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show save title" -msgstr "Namen anzeigen" +msgstr "Spielstandtitel anzeigen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" @@ -4854,10 +5023,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Gerenderte Frames pro Sekunde als Maß der Emulationsgeschwindigkeit " +"anzeigen.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Show unknown" -msgstr "Unbekannte Anzeigen" +msgstr "Unbekannte anzeigen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" @@ -4865,10 +5038,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Verschiedene Statistiken anzeigen.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310 msgid "Sideways Wiimote" -msgstr "" +msgstr "Seitwärts gerichtete Wiimote" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" @@ -4884,11 +5060,11 @@ msgstr "BIOS überspringen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" -msgstr "" +msgstr "DCBZ-Leerung überspringen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Skip EFB Access from CPU" -msgstr "" +msgstr "EFB-Zugang von CPU überspringen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" @@ -4899,6 +5075,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Beschleunigt EFB zu RAM-Kopien geringfügig auf Kosten der " +"Emulationsgenauigkeit.\n" +"Verbessert auch gelegentlich die Bildqualität.\n" +"Wenn Fehler auftreten, erhöhe die Texturen-Cache-Genauigkeit oder " +"deaktiviere diese Option.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/FrameTools.cpp:389 #: Source/Core/DolphinWX/Src/FrameTools.cpp:403 @@ -4929,6 +5112,11 @@ msgid "" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" +"Software Rendering ist eine Größenordnung langsamer als die anderen " +"Backends.\n" +"Nur nützlich für Debug-Zwecke.\n" +"Möchtst du wirklich Software Rendering aktivieren? Im Zweifel, wähle \"Nein" +"\"." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" @@ -4942,7 +5130,7 @@ msgstr "Sound-Backend %s ist ungültig." #: Source/Core/AudioCommon/Src/DSoundStream.cpp:46 #, c-format msgid "Sound buffer creation failed: %s" -msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" +msgstr "Erstellen des Sound-Buffers fehlgeschlagen: %s" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:18 msgid "Space" @@ -4956,7 +5144,7 @@ msgstr "Spanisch" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114 msgid "Speaker Volume:" -msgstr "" +msgstr "Lautsprecher-Lautstärke" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" @@ -4969,6 +5157,14 @@ msgid "" "\n" "If unsure, select 640x528." msgstr "" +"Bestimmt die Auflösung in der gerendert wird. Eine hohe Auflösung wird die " +"Bildqualität deutlich verbessern aber geht auch sehr auf die Leistung und " +"kann in bestimmten Spielen Fehler verursachen.\n" +"\"Vielfaches von 640x528\" ist etwas langsamer als \"Fenstergröße\" aber " +"verursacht weniger Fehler. Im Allgemeinen gilt, je geringer die interne " +"Auflösung, desto besser die Leistung.\n" +"\n" +"Im Zweifel, wähle 640x528." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" @@ -4976,7 +5172,7 @@ msgstr "Disc-Übertragungsrate beschleunigen" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" -msgstr "" +msgstr "Quadrat-Stick" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Standard Controller" @@ -5030,6 +5226,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Speichert EFB-Kopien in GPU-Texturobjekten.\n" +"Dies ist nicht so genau, funktioniert aber gut genug für die meisten Spiele " +"und hat einen großen Geschwindigkeitsvorteil gegenüber EFB zu RAM.\n" +"\n" +"Im Zweifel aktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Stretch to Window" @@ -5054,7 +5255,7 @@ msgstr "Die gespeicherte Datei wurde erfolgreich importiert" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Schwedisch" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5069,6 +5270,8 @@ msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" +"Synchronisiert die GPU- und CPU-Threads um willkürliche Aufhänger mit Dual " +"Core zu vermeiden. (AN = Kompatibilität, AUS = Geschwindigkeit)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 @@ -5082,7 +5285,7 @@ msgstr "TAIWAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:128 #: Source/Core/DolphinWX/Src/TASInputDlg.h:19 msgid "TAS Input" -msgstr "" +msgstr "TAS-Eingabe" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:15 msgid "Tab" @@ -5094,11 +5297,11 @@ msgstr "Nebeneinander öffnen" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41 msgid "Table Left" -msgstr "" +msgstr "Tisch links" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42 msgid "Table Right" -msgstr "" +msgstr "Tisch rechts" #: Source/Core/DolphinWX/Src/FrameTools.cpp:363 #: Source/Core/DolphinWX/Src/FrameTools.cpp:466 @@ -5108,7 +5311,7 @@ msgstr "Screenshot erstellen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "TaruKonga (Bongos)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535 msgid "Test" @@ -5120,11 +5323,11 @@ msgstr "Textur" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462 msgid "Texture Cache" -msgstr "" +msgstr "Texturen-Cache" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" -msgstr "" +msgstr "Texturenformat-Überlagerung" #: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" @@ -5176,7 +5379,7 @@ msgstr "Die angegebene Datei (%s) existiert nicht" #: Source/Core/DolphinWX/Src/FrameAui.cpp:666 msgid "The name can not be empty" -msgstr "Der Name kann nicht leer bleiben." +msgstr "Der Name darf nicht leer bleiben." #: Source/Core/DolphinWX/Src/FrameAui.cpp:658 msgid "The name can not contain the character ','" @@ -5184,7 +5387,7 @@ msgstr "Der Name darf nicht das Zeichen \",\" enthalten" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "" +msgstr "Der resultierende entschlüsselte AR-Code enthält keine Zeilen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" @@ -5193,6 +5396,10 @@ msgid "" "\n" "If unsure, use the rightmost value." msgstr "" +"Je sicherer dies angepasst wird, desto seltener verpasst der Emulator Textur-" +"Updates vom RAM.\n" +"\n" +"Im Zweifel, den Wert ganz rechts wählen." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:432 msgid "The save you are trying to copy has an invalid file size" @@ -5205,12 +5412,12 @@ msgid "" "system default." msgstr "" "Die ausgewählte Sprache wird von Ihrem System nicht unterstützt. Kehre nun " -"zum Systemstandart zurück." +"zum Systemstandard zurück." #: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" msgstr "" -"Die Version von dem Server und Client´s NetPlay sind zueinander inkompatibel!" +"Die NetPlay-Version von Server und Client sind nicht zueinander kompatibel!" #: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" @@ -5242,7 +5449,7 @@ msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -"Es müsste ein Ticket für 00000001/00000002 vorhanden sein. Ihr NAND-Dump ist " +"Es muss ein Ticket für 00000001/00000002 vorhanden sein. Ihr NAND-Dump ist " "wahrscheinlich unvollständig." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 @@ -5259,8 +5466,8 @@ msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -"Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " -"verändern können." +"Dieser Action-Replay-Simulator unterstützt keine Codes, die Action Replay " +"selbst verändern können." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5277,6 +5484,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Diese Einstellung erlaubt es dir, die Kamera im Spiel zu bewegen.\n" +"Halte die rechte Maustaste gedrückt und bewege die Maus um die Kamera zu " +"schwenken, halte die linke Maustaste gedrückt um sie zu bewegen.\n" +"Halte SHIFT und drücke eine der WASD-Tasten um die Kamera eine bestimmte " +"Entfernung zu bewegen (SHIFT+0 um sie schneller zu bewegen und SHIFT+9 um " +"sie langsamer zu bewegen). Drücke Shift+R um die Kamera zurückzusetzen.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" @@ -5285,6 +5500,10 @@ msgid "" "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" +"Beschränkt die Spielgeschwindigkeit auf die angegebene Anzahl von Bildern " +"pro Sekunde (Volle Geschwindigkeit entspricht 60 für NTSC und 50 für PAL). " +"Alternativ kann DSP benutzt werden um den Ton zu drosseln (kann je nach " +"Spiel Knistern beheben aber auch durchgehendes Rauschen verursachen)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5293,7 +5512,7 @@ msgid "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." msgstr "" -"Teilt die Video und CPU Threads, damit diese auf unterschiedlichen Kernen " +"Teilt die Video- und CPU-Threads, damit diese auf unterschiedlichen Kernen " "laufen können.\n" "Bewirkt eine wesentliche Verbesserung der Geschwindigkeit auf PCs mit mehr " "als einem Kern,\n" @@ -5301,7 +5520,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:287 msgid "This will let you Manually Edit the INI config file" -msgstr "" +msgstr "Erlaubt manuelles Editieren der INI-Konfigurationsdatei" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:237 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:242 @@ -5320,25 +5539,23 @@ msgstr "Titel" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 msgid "To" -msgstr "" +msgstr "Zu" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Toggle All Log Types" -msgstr "" +msgstr "Alle Log-Typen umschalten" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Seitenverhältnis:" +msgstr "Seitenverhältnis umschalten" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Kopien" +msgstr "EFB-Kopien umschalten" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 msgid "Toggle Fog" -msgstr "" +msgstr "Nebel umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5347,7 +5564,7 @@ msgstr "Vollbildmodus umschalten" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "IR umschalten" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5360,7 +5577,7 @@ msgstr "Chinesisch (Traditionell)" #: Source/Core/Core/Src/Boot/Boot.cpp:414 msgid "Tried to load an unknown file type." -msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." +msgstr "Versuchte einen unbekannten Dateityp zu laden." #: Source/Core/Core/Src/HW/GCPadEmu.cpp:67 msgid "Triggers" @@ -5368,14 +5585,14 @@ msgstr "Schultertasten" #: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101 msgid "Trying to read from invalid SYSCONF" -msgstr "Versuche gerade eine ungültige SYSCONF zu Lesen" +msgstr "Versuchte eine ungültige SYSCONF zu lesen" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31 msgid "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" msgstr "" -"Versuche gerade eine ungültige SYSCONF zu Lesen\n" +"Versuchte eine ungültige SYSCONF zu lesen\n" "Wiimote BT-IDs sind nicht verfügbar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 @@ -5384,7 +5601,7 @@ msgstr "Türkisch" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33 msgid "Turntable" -msgstr "" +msgstr "Turntable" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 msgid "Type" @@ -5392,7 +5609,7 @@ msgstr "Typ" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 msgid "UDP Port:" -msgstr "UDP Port:" +msgstr "UDP-Port:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 @@ -5417,6 +5634,8 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"Konnte Patch aus eingegebenen Werten nicht erstellen.\n" +"Eintrag nicht verändert." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111 #, c-format @@ -5425,6 +5644,10 @@ msgid "" "decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" +"Konnte Zeile %lu des eingegebenen AR-Codes nicht als gültigen, " +"verschlüsselten oder entschlüsselten Code parsen. Prüfe, dass du ihn richtig " +"eingegeben hast.\n" +"Möchtest du diese Zeile ignorieren und mit dem Parsen fortfahren?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format @@ -5433,16 +5656,15 @@ msgstr "Undefiniert %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229 msgid "Undo Load State" -msgstr "Status laden rückgängig machen" +msgstr "Status Laden rückgängig machen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Status laden rückgängig machen" +msgstr "Speicherstand rückgängig machen" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Unerwarteter 0x80 Aufruf? Abbruch..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192 msgid "Unknown" @@ -5461,7 +5683,7 @@ msgstr "Unbekannter Befehl 0x%08x" #: Source/Core/Common/Src/SysConf.cpp:132 #, c-format msgid "Unknown entry type %i in SYSCONF (%s@%x)!" -msgstr "Unbekannter Eintrag-Typ %i in SYSCONF (%s@%x)!" +msgstr "Unbekannter Eintragstyp %i in SYSCONF (%s@%x)!" #: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format @@ -5486,7 +5708,7 @@ msgstr "Update" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311 msgid "Upright Wiimote" -msgstr "" +msgstr "Aufrechte Wiimote" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" @@ -5511,6 +5733,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Benutzt einen weniger genauen Algorithmus um Tiefenwerte zu berechnen.\n" +"Verursacht Fehler in einigen Spielen, kann aber einen ordentlichen " +"Geschwindigkeitsvorteil bringen.\n" +"\n" +"Im Zweifel aktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5519,6 +5746,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Verwendet mehrere Threads um Texturen zu dekodieren.\n" +"Kann die Emulation beschleunigen (vor allem auf CPUs mit mehr als zwei " +"Kernen.)\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" @@ -5528,6 +5760,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Benutzt unsichere Operationen um Vertex-Streaming in OpenGL zu " +"beschleunigen. Auf unterstützten GPUs sind keine Probleme bekannt, ansonsten " +"können aber schwerwiegende Stabilitätsprobleme und Grafikfehler auftreten.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5537,6 +5774,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Wenn eine Shaderzusammenstellung versagt wird für gewöhnlich eine " +"Fehlermeldung angezeigt.\n" +"Diese Meldung kann allerdings mit dieser Option übersprungen werden um " +"unterbrechungsfreies Spielen zu gewährleisten.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Utility" @@ -5547,9 +5790,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Speed Hack" +msgstr "VBeam Speed-Hack" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5565,11 +5807,11 @@ msgstr "Wert: " #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38 msgid "Verbosity" -msgstr "Ausführung" +msgstr "Ausführlichkeit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Vertex-Streaming-Hack" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5600,6 +5842,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Warte auf vertikale Austastung um Tearing zu reduzieren.\n" +"Reduziert die Leistung wenn die Emulationsgeschwindigkeit unter 100% liegt.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/Common/Src/MsgHandler.cpp:53 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33 @@ -5609,15 +5855,15 @@ msgstr "Warnungen" #: Source/Core/Core/Src/Boot/Boot.cpp:279 msgid "Warning - starting DOL in wrong console mode!" -msgstr "Warnung - Starte DOL im falschen Consolen-Modus!" +msgstr "Warnung - Starte DOL im falschen Konsolenmodus!" #: Source/Core/Core/Src/Boot/Boot.cpp:329 msgid "Warning - starting ELF in wrong console mode!" -msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" +msgstr "Warnung - Starte ELF im falschen Konsolenmodus!" #: Source/Core/Core/Src/Boot/Boot.cpp:209 msgid "Warning - starting ISO in wrong console mode!" -msgstr "Warnung - Starte ISO im falschen Consolen-Modus!" +msgstr "Warnung - Starte ISO im falschen Konsolenmodus!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format @@ -5652,8 +5898,8 @@ msgid "" msgstr "" "Warnung: Du hast einen Spielstand geladen, dessen Speicherpunkt hinter dem " "Ende der aktuellen Aufnahme liegt. (Byte %u > %u) (Frame %u > %u). Lade " -"einen anderen Spielstand, bevor du fortfährst oder lade diesen Spielstand im " -"schreibgeschützen Modus." +"einen anderen Spielstand bevor du fortfährst oder lade diesen Spielstand " +"nicht im schreibgeschützen Modus." #: Source/Core/Core/Src/Movie.cpp:854 #, c-format @@ -5663,9 +5909,9 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" "Warnung: Du hast einen Spielstand geladen, dessen Aufnahme bei Byte %d (0x" -"%X) nicht übereinstimmt. Lade einen anderen Spielstand, bevor du fortfährst " -"oder lade diesen Spielstand im schreibgeschützen Modus, andernfalls könnten " -"Desyncs auftreten." +"%X) nicht übereinstimmt. Lade einen anderen Spielstand bevor du fortfährst " +"oder lade diesen Spielstand nicht im schreibgeschützen Modus, andernfalls " +"könnten Desyncs auftreten." #: Source/Core/Core/Src/Movie.cpp:864 #, c-format @@ -5687,8 +5933,8 @@ msgid "" msgstr "" "Warnung: Du hast einen Spielstand geladen, dessen Aufnahme bei Frame %d " "nicht übereinstimmt. Lade einen anderen Spielstand, bevor du fortfährst oder " -"lade diesen Spielstand mit deaktiviertem Schreibschutz, andernfalls könnten " -"Desyncs auftreten.\n" +"lade diesen Spielstand nicht im schreibgeschützten Modus, andernfalls " +"könnten Desyncs auftreten.\n" "\n" "Weitere Informationen: Die aktuelle Aufnahme hat eine Länge von %d Frames " "und die Aufnahme vom Spielstand ist %d Frames lang.\n" @@ -5710,7 +5956,7 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60 msgid "Whammy" -msgstr "" +msgstr "Whammy" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409 msgid "Widescreen Hack" @@ -5718,7 +5964,7 @@ msgstr "Breitbild-Hack" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:300 msgid "Width" -msgstr "Weite" +msgstr "Breite" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Wii" @@ -5730,7 +5976,7 @@ msgstr "Wii-Konsole" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" -msgstr "" +msgstr "Wii-NAND-Root:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" @@ -5752,11 +5998,11 @@ msgstr "Wiimote %i" #: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" -msgstr "Wiimote Verbunden" +msgstr "Wiimote angeschlossen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108 msgid "Wiimote Motor" -msgstr "Wiimote Motor" +msgstr "Wiimote-Motor" #: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" @@ -5791,7 +6037,7 @@ msgstr "Arbeite..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Schreibe Speicherkarten (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -5799,7 +6045,7 @@ msgstr "In Konsole ausgeben" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54 msgid "Write to Debugger" -msgstr "" +msgstr "In Debugger ausgeben" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 msgid "Write to File" @@ -5807,7 +6053,7 @@ msgstr "In Datei ausgeben" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 msgid "Write to Window" -msgstr "" +msgstr "In Fenster ausgeben" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47 #, c-format @@ -5822,7 +6068,7 @@ msgstr "Initialisierung von XAudio2 gescheitert: %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111 #, c-format msgid "XAudio2 master voice creation failed: %#X" -msgstr "" +msgstr "Erstellung von XAudio2 Master Voice fehlgeschlagen: %#X" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776 msgid "XF reg" @@ -5838,17 +6084,17 @@ msgid "" "All Wii games will work correctly, and most GC games should also work fine, " "but the GBA/IPL/CARD UCodes will not work.\n" msgstr "" -"Du verwendest das freie DSP-ROM vom Dolphin Team.\n" -"Alle Wii- und die meisten GameCube-Spiele werden problemlos funktionen, aber " -"die GBA/IPL/CARD-UCodes nicht.\n" +"Du verwendest eine freie DSP-ROM vom Dolphin-Team.\n" +"Alle Wii- und die meisten GameCube-Spiele werden problemlos funktionieren, " +"aber die GBA/IPL/CARD-UCodes nicht.\n" #: Source/Core/Core/Src/DSP/DSPCore.cpp:116 msgid "" "You are using an old free DSP ROM made by the Dolphin Team.\n" "Only games using the Zelda UCode will work correctly.\n" msgstr "" -"Du verwendest ein veraltetes, freies DSP-ROM vom Dolphin Team.\n" -"Nur Spiele, die den Zelda-UCode verwenden werden korrekt funktionieren.\n" +"Du verwendest eine veraltete, freie DSP-ROM vom Dolphin-Team.\n" +"Nur Spiele die den Zelda-UCode verwenden, werden korrekt funktionieren.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:63 msgid "You can't close panes that have pages in them." @@ -5856,7 +6102,7 @@ msgstr "Es können keine Paletten geschlossen werden, die Seiten behinhalten." #: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" -msgstr "Sie müssen ein Spiel auswählen!" +msgstr "Du musst ein Spiel auswählen!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610 msgid "You must enter a name!" @@ -5868,7 +6114,7 @@ msgstr "Du musst eine gültige Dezimal-, Hexadezimal- oder Oktalzahl eingeben." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655 msgid "You must enter a valid profile name." -msgstr "Sie müssen einen gültigen Profilamen eingeben!" +msgstr "Du musst einen gültigen Profilnamen eingeben!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." @@ -5880,9 +6126,9 @@ msgid "" "Would you like to stop now to fix the problem?\n" "If you select \"No\", audio might be garbled." msgstr "" -"Dein DSP-ROMs haben ungültige Hashwerte.\n" -"Möchtest du die Emulation anhalten und das Problem beheben?\n" -"Wenn du \"Nein\" wählst, könnte die Audiowiedergabe merkwürdig klingen." +"Deine DSP-ROMs haben ungültige Hashwerte.\n" +"Möchtest du die Emulation beenden um das Problem zu beheben?\n" +"Wenn du \"Nein\" wählst, könnte die Audiowiedergabe verzerrt klingen." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -5909,12 +6155,12 @@ msgstr "ZTP-Hack" #: Source/Core/Core/Src/ActionReplay.cpp:377 msgid "Zero 3 code not supported" -msgstr "Zero 3 Code wird nicht unterstüzt" +msgstr "Zero 3-Code wird nicht unterstützt" #: Source/Core/Core/Src/ActionReplay.cpp:398 #, c-format msgid "Zero code unknown to dolphin: %08x" -msgstr "Der Zero Code ist in Dolphin unbekannt: %08x" +msgstr "Der Zero-Code ist Dolphin unbekannt: %08x" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504 @@ -5928,6 +6174,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[DEFEKT]\n" +"Hebe die Regionen hervor, aus denen der EFB kopiert wurde.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:78 msgid "[Custom]" @@ -5943,6 +6193,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[EXPERIMENTELL]\n" +"Versucht die Emulationsgeschwindigkeit zu beschleunigen indem es die " +"Texturendekodierung auf die GPU mit OpenCL-Framework auslagert.\n" +"Verusacht jedoch momentan Texturenfehler in verschiedenen Spielen. Es ist " +"ebenfalls in den meisten Fällen langsamer als die reguläre " +"Texturendekodierung der CPU.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" @@ -5952,6 +6210,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[EXPERIMENTELL]\n" +"Beschleunigt die Emulation ein wenig indem Displaylisten in den Cache " +"geladen werden.\n" +"Verursacht jedoch möglicherweise Probleme.\n" +"\n" +"Im Zweifel deaktiviert lassen." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:813 msgid "apploader (.img)" @@ -5969,12 +6233,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "Unbekannte Funktion %d (%d erwartet)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Unbekannte Meldung mit ID: %d" +msgstr "Unbekannte Meldung erhalten" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -5982,60 +6245,12 @@ msgstr "wxExecute gab beim Anwendungsstart -1 zurück!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:43 msgid "zFar Correction: " -msgstr "zFar Korrektion: " +msgstr "zFar-Korrektur:" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:38 msgid "zNear Correction: " -msgstr "zNear Korrektion: " +msgstr "zNear-Korrektur:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| ODER" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Genaue VBeam Emulation" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Kurztasten aktivieren" - -#~ msgid "Export failed, try again?" -#~ msgstr "Exportieren fehlgeschlagen, ein weiteres mal versuchen?" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "bthprops.cpl konnte nicht geladen werden." - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Fehler beim Laden von hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic Konfiguration" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY wurde aufgerufen, bitte berichten!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, " -#~ "OFF = Schnell)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importieren fehlgeschlagen, noch einmal versuchen?" - -#~ msgid "In-Game" -#~ msgstr "In-Game" - -#~ msgid "Last Overwritten State" -#~ msgstr "Letzter überschriebener Status" - -#~ msgid "Last Saved State" -#~ msgstr "Letzter gespeicherter Status" - -#~ msgid "Local" -#~ msgstr "Lokal" - -#~ msgid "Set" -#~ msgstr "Zuweisen" - -#~ msgid "Wii Save Import" -#~ msgstr "Wii-Spielstand importieren" diff --git a/Languages/po/el.po b/Languages/po/el.po index 25a128a4ae..1e08f1b8b6 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -5,12 +5,13 @@ # Translators: # Gpower2 , 2011 # link_to_the_past , 2013 +# Godfath3r , 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 19:05+0000\n" +"PO-Revision-Date: 2013-09-18 14:27+0000\n" "Last-Translator: link_to_the_past \n" "Language-Team: Greek (http://www.transifex.com/projects/p/dolphin-emu/" "language/el/)\n" @@ -115,9 +116,9 @@ msgid "%s failed to open" msgstr "αποτυχία ανοίγματος %s" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "αποτυχία ανοίγματος %s" +msgstr "%s απέτυχε: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -321,9 +322,8 @@ msgid "(off)" msgstr "(ανενεργό)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "+ ADD" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -401,7 +401,7 @@ msgstr "Ένα παράθυρο NetPlay είναι ήδη ανοιχτό!!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404 msgid "A game is not currently running." -msgstr "Αυτή τη στιγμή δεν εκτελείται κάπιο παιχνίδι." +msgstr "Αυτή τη στιγμή δεν εκτελείται κάποιο παιχνίδι." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85 msgid "" @@ -412,7 +412,6 @@ msgstr "" "Θα πρέπει να συνδέσετε χειροκίνητα τα wiimotes." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -431,18 +430,18 @@ msgstr "" "ΠΡΟΣΟΧΗ:\n" "\n" "Η λειτουργία NetPlay λειτουργεί σωστά μόνο με τις παρακάτω ρυθμίσεις:\n" -" - Δύο Πυρήνες [ΑΝΕΝΕΡΓΟ]\n" -" - Throttle Ήχου [ΑΝΕΝΕΡΓΟ]\n" -" - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - Χειροκίνητη εισαγωγή του ακριβούς αριθμού των ελεγκτών που θα " -"χρησιμοποιηθούν σαν [Τυπικός Ελεγκτής]\n" +" - Ενεργοποίηση Διπλού Πυρήνα [ΑΝΕΝΕΡΓΟ]\n" +" - Η Μηχανή Εξομοίωσης DSP πρέπει να είναι η ίδια σε όλους τους " +"υπολογιστές!\n" +" - DSP σε Ξεχωριστό Νήμα [ΑΝΕΝΕΡΓΟ]\n" +" - Ο Περιορισμός των Καρέ να ΜΗΝ έχει οριστεί σε [Ήχο]\n" "\n" "Όλοι οι παίκτες πρέπει να έχουν την ίδια έκδοση και ρυθμίσεις του Dolphin.\n" -"Απενεργοποιήστε όλες τις κάρτες μνήμης ή στείλτε τες σε όλους τους παίκτες " -"πριν την εκκίνηση.\n" -"Η υποστήριξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" +"Όλες οι κάρτες μνήμης πρέπει να είναι ίδιες ανάμεσα στους παίκτες ή " +"απενεργοποιημένες.\n" +"Η υποστήριξη Wiimote δεν έχει ακόμα υλοποιηθεί!\n" "\n" -"Θα πρέπει να έχετε κάνει προώθηση της πόρτας TCP στον host!!" +"Ο host θα πρέπει να έχει την επιλεγμένη TCP port ανοιχτή/προωθημένη!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -825,7 +824,7 @@ msgstr "Μη Έγκυρη Κεφαλίδα Αρχείου" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Σανίδα Ισορροπίας" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -1047,11 +1046,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "" +msgstr "Αλλαγή προσήμου της παραμέτρου zFar (μετά την διόρθωση)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:42 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "" +msgstr "Αλλαγή προσήμου της παραμέτρου zNear (μετά την διόρθωση)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" @@ -1233,9 +1232,8 @@ msgstr "Σύνδεση" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Σύνδεση Πληκτρολογίου USB" +msgstr "Σύνδεση Σανίδας Ισορροπίας" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1460,9 +1458,8 @@ msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP σε Ξεχωριστό Νήμα" +msgstr "DSPLLE σε Ξεχωριστό Νήμα" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1479,7 +1476,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Χαλάκι Χορού" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1528,9 +1525,8 @@ msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Ανανέωση λίστας παιχνιδιών" +msgstr "Μείωση Ορίου Καρέ" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1612,7 +1608,7 @@ msgstr "Απενεργοποίηση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Απενεργοποίηση Destination Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1649,15 +1645,15 @@ msgstr "" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Παράλειψη του destination alpha pass που χρησιμοποιείται από πολλά παιχνίδια " -"σε διάφορα γραφικά εφέ.\n" +"Απενεργοποιεί την εξομοίωση ενός χαρακτηριστικού του υλικού που ονομάζεται " +"destination alpha pass, και το οποίο χρησιμοποιείται από πολλά παιχνίδια για " +"διάφορα γραφικά εφέ.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -1735,6 +1731,38 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Το Dolphin είναι ένας Gamecube/Wii εξομοιωτής, ο οποίος\n" +"γράφτηκε αρχικά από τον F|RES και τον ector.\n" +"Σήμερα το Dolphin είναι ένα έργο ανοιχτού κώδικα με πολλούς\n" +"να συνεισφέρουν, πάρα πολλούς για να αναφερθούν εδώ.\n" +"Εάν σας ενδιαφέρει, απλά ελέγξτε την σελίδα του έργου στο\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Ιδιαίτερες ευχαριστίες στον Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 και Hotquik για το\n" +"reverse engineering και τα docs/demos.\n" +"\n" +"Ένα μεγάλο ευχαριστώ στον Gilles Mouchard του οποίου ο\n" +" Microlib PPC εξομοιωτής έδωσε έναυσμα στην ανάπτυξη.\n" +"\n" +"Ευχαριστώ τον Frank Wille για τον PowerPC disassembler,\n" +"τον οποίο ο or9 και εμείς τροποποιήσαμε για να συμπεριληφθούν \n" +"λεπτομέρειες για τον Gekko.\n" +"\n" +"Ευχαριστούμε τους hcs/destop για τον GC ADPCM decoder.\n" +"\n" +"Εμείς δεν συνδεόμαστε με την Nintendo με οποιονδήποτε τρόπο.\n" +"Gamecube και Wii είναι εμπορικά σήματα της Nintendo.\n" +"Ο εξομοιωτής είναι για εκπαιδευτικούς σκοπούς μόνο\n" +"και δεν πρέπει να χρησιμοποιηθεί για να παίξετε παιχνίδια \n" +"τα οποία δεν κατέχετε νόμιμα." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1796,13 +1824,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Το Dolphin δεν μπόρεσε να ολοκληρώσει την ζητούμενη ενέργεια." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Ενεργοποιεί τη γρήγορη πρόσβαση δίσκου. Απαραίτητο για μερικά παιχνίδια. " -"(ΕΝΕΡΓΟ = Γρήγορο, ΑΝΕΝΕΡΓΟ = Συμβατό)" +"Διπλασιάζει την συχνότητα του ρολογιού της εξομοιωμένης GPU. Μπορεί να " +"επιταχύνει ορισμένα παιχνίδια (ΕΝΕΡΓΟ = Ταχύτητα, ΑΝΕΝΕΡΓΟ = Συμβατότητα)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1923,7 +1950,7 @@ msgstr "Επεξεργασία Ρυθμίσεων" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Επεξεργασία Τοπικών Ρυθμίσεων" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -2263,12 +2290,11 @@ msgstr "Εκτέλεση" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Έξοδος" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Εξαγωγή όλων των αποθηκεύσεων" +msgstr "Εξαγωγή Όλων Των Αποθηκεύσεων Wii" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2299,9 +2325,8 @@ msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεύσεων" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Αποτυχία Εξαγωγής" +msgstr "Αποτυχία εξαγωγής" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2422,6 +2447,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Αποτυχία φόρτωσης του bthprops.cpl! Δεν θα δουλέψει η σύνδεση πραγματικών " +"Wiimotes και το Dolphin μπορεί να τερματιστεί αναπάντεχα!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2429,6 +2456,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Αποτυχία φόρτωσης του hid.dll! Δεν θα δουλέψει η σύνδεση πραγματικών " +"Wiimotes και το Dolphin μπορεί να τερματιστεί αναπάντεχα!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2509,9 +2538,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d" +msgstr "Αποτυχία ανάγνωσης της κεφαλίδας για το αρχείο %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2526,9 +2555,9 @@ msgid "Failed to write bkhdr" msgstr "Αποτυχία εγγραφής του bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο: %s" +msgstr "Αποτυχία εγγραφής δεδομένων στο αρχείο: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2545,7 +2574,7 @@ msgstr "Γρήγορη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Γρήγορος Υπολογισμός Βάθους" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2695,7 +2724,7 @@ msgstr "Μπροστά" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Προώθηση θύρας (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2703,9 +2732,9 @@ msgid "Found %d results for '" msgstr "Βρέθηκαν %d αποτελέσματα για '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Αποτυχία αποθήκευσης του %s" +msgstr "Βρέθηκαν %x αρχεία αποθήκευσης" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3124,14 +3153,12 @@ msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Εισαγωγή Αποθήκευσης" +msgstr "Εισαγωγή Αποθήκευσης Wii" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Αποτυχία Εξαγωγής" +msgstr "Η εισαγωγή απέτυχε" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3158,9 +3185,8 @@ msgid "In Game" msgstr "Εντός Παιχνιδιού" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Περιορισμός Καρέ:" +msgstr "Αύξηση Ορίου Καρέ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3393,7 +3419,7 @@ msgstr "Γλώσσα:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Τελευταίο %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3451,58 +3477,48 @@ msgid "Load Custom Textures" msgstr "Φόρτωση Τροποποιημένων Υφών" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Φόρτωση Σημείου Αποθήκευσης" +msgstr "Φόρτωση Σημείου Αποθήκευσης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Φόρτωση Σημείου Αποθήκευσης 1" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Φόρτωση Σημείου Αποθήκευσης 2" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Φόρτωση Σημείου Αποθήκευσης 3" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Φόρτωση Σημείου Αποθήκευσης 4" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Φόρτωση Σημείου Αποθήκευσης 5" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Φόρτωση Σημείου Αποθήκευσης 6" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Φόρτωση Σημείου Αποθήκευσης 7" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Φόρτωση Σημείου Αποθήκευσης 8" +msgstr "Φόρτωση Τελευταίας Αποθήκευσης 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Φόρτωση Σημείου Αποθήκευσης 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Φόρτωση Σημείου Αποθήκευσης 1" +msgstr "Φόρτωση Σημείου Αποθήκευσης 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3533,9 +3549,8 @@ msgid "Load State Slot 8" msgstr "Φόρτωση Σημείου Αποθήκευσης 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Φόρτωση Σημείου Αποθήκευσης 1" +msgstr "Φόρτωση Σημείου Αποθήκευσης 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3621,7 +3636,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" -msgstr "MMU Speed Hack" +msgstr "MMU Hack Ταχύτητας" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:517 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 @@ -4042,7 +4057,7 @@ msgstr "Απεικόνιση Μηνυμάτων Στην Οθόνη" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "Online &Εγχειρίδια " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4093,10 +4108,14 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Ανοίγει τις προεπιλεγμένες (μόνο για ανάγνωση) ρυθμίσεις για αυτό το " +"παιχνίδι σε έναν εξωτερικό επεξεργαστή κειμένου." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." msgstr "" +"Ανοίγει τις τοπικές ρυθμίσεις του χρήστη σε έναν εξωτερικό επεξεργαστή " +"κειμένου." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4108,7 +4127,6 @@ msgid "Orange" msgstr "Πορτοκαλί" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -4176,7 +4194,7 @@ msgstr "Κατάτμηση %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Η κατάτμηση δεν υπάρχει: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4365,7 +4383,7 @@ msgstr "ΡΩΣΙΑ" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Ακτίνα" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4381,7 +4399,7 @@ msgstr "Πραγματικό" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Πραγματική Σανίδα Ισορροπίας" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4399,9 +4417,8 @@ msgid "Record" msgstr "Εγγραφή" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Ρυθμίσεις Εγγραφής" +msgstr "Εγγραφή χειρισμών" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4487,7 +4504,7 @@ msgstr "Return" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revision:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4504,12 +4521,11 @@ msgid "Rumble" msgstr "Δόνηση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Εκτέλεση DSP HLE και LLE σε ξεχωριστό νήμα (δεν προτείνεται: μπορεί να " -"προκαλέσει προβλήματα στον ήχο με HLE και κολλήματα με LLE)." +"Εκτέλεση DSP LLE σε ξεχωριστό νήμα (δεν προτείνεται: μπορεί να προκαλέσει " +"κολλήματα)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4534,23 +4550,20 @@ msgid "Save GCI as..." msgstr "Αποθήκευση GCI ως..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +msgstr "Αποθήκευση Παλαιότερου Σημείου" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +msgstr "Αποθήκευση Σημείου" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Αποθήκευση Σημείου Αποθήκευσης 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Αποθήκευση Σημείου Αποθήκευσης 1" +msgstr "Αποθήκευση Σημείου Αποθήκευσης 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4581,9 +4594,8 @@ msgid "Save State Slot 8" msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Αποθήκευση Σημείου Αποθήκευσης 1" +msgstr "Αποθήκευση Σημείου Αποθήκευσης 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4840,9 +4852,8 @@ msgid "Settings..." msgstr "Ρυθμίσεις..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem:Αδυναμία εύρεσης αρχείου ρυθμίσεων" +msgstr "SetupWiiMem: Αδυναμία δημιουργίας αρχείου ρυθμίσεων" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4873,9 +4884,8 @@ msgid "Show &Toolbar" msgstr "Εμφάνιση Γραμμής &Εργαλείων" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Προεπιλ." +msgstr "Εμφάνιση Προεπιλογών" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5243,7 +5253,7 @@ msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Σουηδικά" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5486,17 +5496,17 @@ msgstr "" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, " -"PAL:50), χρησιμοποιήστε τον ήχο για να κάνετε Throttle μέσω DSP (μπορεί να " +"Περιορίζει την ταχύτητα του παιχνιδιού στο προκαθορισμένο αριθμό των καρέ " +"ανά δευτερόλεπτο (η πλήρης ταχύτητα είναι 60 για NTSC και 50 για PAL). " +"Εναλλακτικά, επιλέξτε το \"Ήχος\" για να κάνετε Throttle μέσω DSP (μπορεί να " "διορθώσει ορισμένα κλικαρίσματα στον ήχο άλλα και να προκαλέσει συνεχές " -"θόρυβο αναλόγα με το παιχνίδι)." +"θόρυβο ανάλογα με το παιχνίδι)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5539,19 +5549,16 @@ msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων Τύπων Καταγραφής " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Αναλογία Οθόνης:" +msgstr "Εναλλαγή Αναλογίας Οθόνης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Αντίγραφα" +msgstr "Εναλλαγή EFB Αντίγραφα" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Εναλλαγή Όλων Τύπων Καταγραφής " +msgstr "Εναλλαγή Ομίχλης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5560,7 +5567,7 @@ msgstr "Εναλλαγή Πλήρους Οθόνης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Εναλλαγή Εσωτερικής Ανάλυσης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5655,9 +5662,8 @@ msgid "Undo Load State" msgstr "Αναίρεση Φόρτωσης Σημείου Αποθ. " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Αναίρεση Φόρτωσης Σημείου Αποθ. " +msgstr "Αναίρεση Αποθήκευσης Σημείου Αποθ. " #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5729,6 +5735,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Χρησιμοποιήστε έναν λιγότερο ακριβή αλγόριθμο για τον υπολογισμό των τιμών " +"βάθους.\n" +"Προκαλεί προβλήματα σε μερικά παιχνίδια, αλλά μπορεί να δώσει μια αξιοπρεπή " +"επιτάχυνση.\n" +"\n" +"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5751,6 +5763,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Χρησιμοποιεί μη ασφαλείς πράξεις για να επιταχύνει την ροή των κορυφών στο " +"OpenGL. Δεν υπάρχουν γνωστά προβλήματα σε GPUs που το υποστηρίζουν, αλλά θα " +"προκαλέσει σοβαρά προβλήματα σταθερότητας και στα γραφικά διαφορετικά.\n" +"\n" +"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5776,9 +5793,8 @@ msgid "V-Sync" msgstr "Κάθετος Συγχρονισμός" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Speed Hack" +msgstr "VBeam Hack Ταχύτητας" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5798,7 +5814,7 @@ msgstr "Αναλυτικότητα" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Hack Ροής Κορυφών" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -6027,7 +6043,7 @@ msgstr "Σε εργασία..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Εγγραφή Καρτών Μνήμης (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6226,12 +6242,11 @@ msgstr "." #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "άγνωστο flavor %d (αναμενόταν %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" +msgstr "ελήφθη άγνωστο μήνυμα" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6248,109 +6263,3 @@ msgstr "zNear Διόρθωση: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OR" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Ακριβής VBeam εξομοίωση" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Επιτρέπει την εναλλαγή ορισμένων επιλογών με τα πλήκτρα συντόμευσης 3 " -#~ "(Εσωτερική Ανάλυση), 4 (Αναλογία Οθόνης), 5 (EFB Αντίγραφα) και 6 " -#~ "(Ομίχλη) μέσα από το παράθυρο εξομοίωσης.\n" -#~ "\n" -#~ " Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "Αποτυχία εύρεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Αδυναμία καθορισμού χειριστηρίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι " -#~ "τρέχει!\n" -#~ "(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται " -#~ "προς το παρόν)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Ενεργοποίηση Συντομεύσεων" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 " -#~ "surround. Μόνο για OpenAL backend. Μπορεί να χρειαστεί να μετονομάσετε το " -#~ "soft_oal.dll σε OpenAL32.dll για να λειτουργήσει." - -#~ msgid "Export failed, try again?" -#~ msgstr "Αποτυχία εξαγωγής, προσπάθεια ξανά;" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Αποτυχία ακρόασης!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Αποτυχία φόρτωσης bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Αποτυχία φόρτωσης hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Ρυθμίσεις Μικροφώνου GC" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παρακαλώ αναφέρετε!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Χακαρισμένο Ανέβασμα Buffer" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = " -#~ "Συμβατό, Ανενεργό = Γρήγορο)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Αποτυχία εισαγωγής, δοκιμή ξανά;" - -#~ msgid "In-Game" -#~ msgstr "Εντός Παιχνιδιού" - -#~ msgid "Last Overwritten State" -#~ msgstr "Τελευταίο Επαναγραμμένο Σημείο Αποθ." - -#~ msgid "Last Saved State" -#~ msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." - -#~ msgid "Local" -#~ msgstr "Τοπικό" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Επανασύνδεση Wiimote Κατά Την Φόρτωση Σημείου Αποθήκευσης" - -#~ msgid "Set" -#~ msgstr "Ορισμός" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Παράλειψη Dest. Alpha Pass" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Χρησιμοποιείται μια χακαρισμένη στρατηγική ανεβάσματος για την ροή των " -#~ "γωνιών.\n" -#~ "Αυτό συνήθως αυξάνει την ταχύτητα, αλλά απαγορεύεται απο τις προδιαγραφές " -#~ "του OpenGL και μπορεί να προκαλέσει μεγάλα προβλήματα.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." - -#~ msgid "Wii Save Import" -#~ msgstr "Εισαγωγή Αποθήκευσης Wii" diff --git a/Languages/po/es.po b/Languages/po/es.po index 44f2b2daea..c6d0c97155 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -8,13 +8,14 @@ # dfersd01 , 2013 # Puniasterus , 2013 # Puniasterus , 2013 +# Sithdown , 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-17 21:42+0000\n" -"Last-Translator: Puniasterus \n" +"PO-Revision-Date: 2013-09-20 12:03+0000\n" +"Last-Translator: Petiso_Carambanal \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/dolphin-emu/" "language/es/)\n" "Language: es\n" @@ -116,9 +117,9 @@ msgid "%s failed to open" msgstr "Fallo al abrir %s" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "Fallo al abrir %s" +msgstr "%s falló: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -322,9 +323,8 @@ msgid "(off)" msgstr "(off)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "+ ADD" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -413,7 +413,6 @@ msgstr "" "Tendrás que emparejar manualmente tus Wiimotes." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -429,22 +428,20 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"ALERTA:\n" +"AVISO:\n" "\n" -"NetPlay solo funcionará adecuadamente con la siguiente configuración:\n" -" - Doble núcleo [OFF]\n" -" - Audio regulado [OFF]\n" -" - DSP-HLE con \"Audio Nulo\" o DSP-LLE\n" -" - Configurar manualmente el número exacto de controles que se usarán a " -"[Control estándar]\n" +"Netplay solo funcionará con los siguientes ajustes:\n" +" - Activar Dual Core [OFF]\n" +" - DSP Emulator Engine debe ser el mismo en todos los ordenadores!\n" +" - DSP on Dedicated Thread [OFF]\n" +" - Framelimit NOT configurado a [Audio]\n" "\n" -"Todos los jugadores deben intentar tener la misma versión de Dolphin y la " -"misma configuración.\n" -"Deshabilita todas las tarjetas de memoria, o envíeselas a los jugadores " -"antes de comenzar.\n" -"El soporte para wiimote no ha sido implementado.\n" +"Todos los jugadores deben usar la misma versión de Dolphin\n" +"Todas las tarjetas de memoria deben ser idénticas entre jugadores o estar " +"desactivadas.\n" +"¡El soporte de Wiimote no está implementado!\n" "\n" -"¡¡Debes redireccionar el puerto TCP para alojar!!" +"¡El host debe elegir la apertura/reenvio de puertos TCP!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -826,7 +823,7 @@ msgstr "Motor:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 msgid "Background Input" -msgstr "Detectar entrada sin foco" +msgstr "Entrada sin foco" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:267 msgid "Backward" @@ -838,7 +835,7 @@ msgstr "Cabecera de archivo incorrecta" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balance Board" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -934,7 +931,7 @@ msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." msgstr "" -"Saltar la limpieza de la caché de la instrucción DCBZ. Normalmente deja esta " +"Salta la limpieza de la caché de la instrucción DCBZ. Normalmente deja esta " "opción deshabilitada." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706 @@ -981,7 +978,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" -msgstr "No se puede encontrar un WiiMote por el manejador de conexión %02x" +msgstr "No se puede encontrar un WiiMote por el gestor de conexión %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:672 #: Source/Core/Core/Src/HW/DVDInterface.cpp:682 @@ -1248,9 +1245,8 @@ msgstr "Conectar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Conectar teclado USB" +msgstr "Conectar la Balance Board" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1417,7 +1413,7 @@ msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52 msgid "Crossfade" -msgstr "Desvanecimiento cruzado" +msgstr "Fundido" #: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format @@ -1475,9 +1471,8 @@ msgid "DSP settings" msgstr "Configuración DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP en proceso dedicado" +msgstr "DSPLLLE en un hilo separado." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1493,7 +1488,7 @@ msgstr "DVDLowUnencryptedRead - Error fatal: fallo al leer el volumen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Alfombra de baile" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1542,9 +1537,8 @@ msgid "Decompressing ISO" msgstr "Descomprimir ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Actualizar lista de juegos" +msgstr "Reducir límite de Frames" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1626,7 +1620,7 @@ msgstr "Deshabilitar" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Desactivar destino Alfa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1664,15 +1658,14 @@ msgstr "" "Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Salta el destino del pase alfa usado en muchos juegos para varios efectos " -"gráficos.\n" +"Desactiva la emulación de una característica de hardware llamada destino " +"alfa, que se utiliza en muchos juegos para diversos efectos gráficos.\n" "\n" "Si no estás seguro, déjala sin marcar." @@ -1750,6 +1743,39 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revisión: %s\n" +"Compilado: %s @ %s\n" +"\n" +"Dolphin es un emulador de Gamecube/Wii que fue\n" +"originalmente escrito por F|RES y ector.\n" +"Hoy Dolphin es un proyecto open surce con muchos desarroladores\n" +"demasiados para ennumerarlos.\n" +"Si estas interesado consulta la web del proyecto en\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Agradecimientos especiales a Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik por su\n" +"ingeneria inversa y la documentación/demos.\n" +"\n" +"Agradecimientos enormes a Gilles Mouchard \n" +"cuyo emulador de Microlib PPC permitió a \n" +"nuestro desarrollo un comienzo rápido.\n" +"\n" +"Gracias a Frank Wille por su desamblandor de PowerPC ,\n" +"which or9 y nosotros modificamos para incluir las especificaciones de " +"Gekko.\n" +"\n" +"Gracias a hcs/destop por su decodificador de GC ADPCM.\n" +"\n" +"No estamos afiliados con Nintendo de ninguna forma.\n" +"Gamecube and Wii son marcas registradas de Nintendo.\n" +"El emulador es para fines educativos\n" +"y no debe ser usado para jugar a juegos\n" +"que no se posean legalmente." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1811,13 +1837,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin no ha podido completar la acción solicitada." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " -"Rápido, OFF = Compatible)" +"Duplica la velocidad de reloj de la GPU emulada. Puede acelerar algunos " +"juegos (ON = Rápido, OFF = Compatible)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1936,7 +1961,7 @@ msgstr "Editar configuración" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Editar cambios locales" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -2271,12 +2296,11 @@ msgstr "Ejecutar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Salir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exportar todos los guardados" +msgstr "Exportar todos los guardados de Wii" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2307,9 +2331,8 @@ msgid "Export all saves" msgstr "Exportar todos los guardados" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Fallo al exportar" +msgstr "Exportación fallada." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2428,6 +2451,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Fallo al cargar bthprops.dll. La conexión de mandos reales no funcionará y " +"Dolphin puede fallar inesperadamente." #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2435,6 +2460,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Fallo al cargar hid.dll. La conexión de mandos reales no funcionará y " +"Dolphin puede fallar inesperadamente." #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2515,9 +2542,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Fallo al escribir la cabecera para el archivo %d" +msgstr "Fallo al leer la cabecera del fichero %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2532,9 +2559,9 @@ msgid "Failed to write bkhdr" msgstr "Fallo al escribir bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Fallo al leer los datos del archivo: %s" +msgstr "Fallo al escribir los datos en el fichero %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2551,7 +2578,7 @@ msgstr "Rápido" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Cálculo de profundidad rápido" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2702,7 +2729,7 @@ msgstr "Adelante" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Reenviar puerto (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2710,9 +2737,9 @@ msgid "Found %d results for '" msgstr "%d coincidencias para '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "No se pudo guardar %s" +msgstr "Encontrados %x ficheros de guardado" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3128,14 +3155,12 @@ msgid "Import Save" msgstr "Importar Guardado" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importar Guardado" +msgstr "Importar guardado de Wii" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Fallo al exportar" +msgstr "Importación fallada" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3162,9 +3187,8 @@ msgid "In Game" msgstr "En juego" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Límite de fotogramas:" +msgstr "Aumentar límite de Frames" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3397,7 +3421,7 @@ msgstr "Idioma:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Último %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3455,58 +3479,48 @@ msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Cargar estado" +msgstr "Cargar estado" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "&Cargar estado 1" +msgstr "Cargar último estado 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "&Cargar estado 2" +msgstr "Cargar último estado 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "&Cargar estado 3" +msgstr "Cargar último estado 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "&Cargar estado 4" +msgstr "Cargar último estado 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "&Cargar estado 5" +msgstr "Cargar último estado 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "&Cargar estado 6" +msgstr "Cargar último estado 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "&Cargar estado 7" +msgstr "Cargar último estado 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "&Cargar estado 8" +msgstr "Cargar último estado 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "&Cargar estado 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "&Cargar estado 1" +msgstr "Cargar estado 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3537,9 +3551,8 @@ msgid "Load State Slot 8" msgstr "&Cargar estado 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "&Cargar estado 1" +msgstr "Cargar estado 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3653,8 +3666,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Hace que los objetos distantes más visibles mediante la eliminación de " -"niebla, lo que aumenta el detalle general.\n" +"Hace los objetos distantes más visibles mediante la eliminación de niebla, " +"lo que aumenta el detalle en general.\n" "Desactivar la niebla provocará que algunos juegos basados en la emulación de " "niebla dejen de funcionar correctamente.\n" "\n" @@ -3929,7 +3942,7 @@ msgstr "Sin salida de audio" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format msgid "No banner file found for title %s" -msgstr "No se encontró un archivo de banner para el juego %s" +msgstr "No se encontró una imagen para el juego %s" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778 @@ -4045,7 +4058,7 @@ msgstr "Mensajes en pantalla" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "&Documentación online" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4096,10 +4109,12 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Abre la configuración por defecto (modo solo lectura) para este juego en un " +"editor de texto externo." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." -msgstr "" +msgstr "Abre los cambios locales del usuario en un editor de texto externo" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4111,7 +4126,6 @@ msgid "Orange" msgstr "Naranja" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -4179,7 +4193,7 @@ msgstr "Partición %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "No existe la partición: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4368,7 +4382,7 @@ msgstr "RUSIA" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Radio" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4384,7 +4398,7 @@ msgstr "Real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Balance Board real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4402,9 +4416,8 @@ msgid "Record" msgstr "Grabar" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Opciones de grabación" +msgstr "Grabar entrada" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4490,7 +4503,7 @@ msgstr "Volver" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revisión:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4507,12 +4520,11 @@ msgid "Rumble" msgstr "Vibración" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Ejecutar DSP HLE y LLE en un proceso dedicado (no recomendado: podría causar " -"interferencias de audio con HLE y se cuelgue con LLE)." +"Ejecuta DSP LLE en un hilo dedicado (no está recomendado: puede causar " +"congelamientos)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4537,12 +4549,10 @@ msgid "Save GCI as..." msgstr "Guardar GCI como..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Guardar estado" +msgstr "Guardar el estado más antiguo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" msgstr "Guardar estado" @@ -4551,9 +4561,8 @@ msgid "Save State Slot 1" msgstr "Guardar estado 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Guardar estado 1" +msgstr "Ranura de guardado 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4584,9 +4593,8 @@ msgid "Save State Slot 8" msgstr "Guardar estado 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Guardar estado 1" +msgstr "Ranura de guardado 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4843,9 +4851,8 @@ msgid "Settings..." msgstr "Configuración..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" +msgstr "SetupWiiMem: No se puede crear el archivo de configuración" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4876,9 +4883,8 @@ msgid "Show &Toolbar" msgstr "Mostrar barra de herramien&tas" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Predeterminado" +msgstr "Mostrar valores por defecto" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5243,7 +5249,7 @@ msgstr "Los archivos de guardado se han importado con éxito." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Sueco" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5258,8 +5264,8 @@ msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" -"Sincroniza los subprocesos la GPU y la CPU para ayudar a prevenir bloqueos " -"aleatorios en el modo a Doble Núcleo. (ON = Compatible, OFF = rápido)" +"Sincroniza los procesos de la GPU y la CPU para ayudar a prevenir bloqueos " +"aleatorios en el modo a Doble Núcleo. (ON = Compatible, OFF = Rápido)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 @@ -5481,17 +5487,16 @@ msgstr "" "Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Si defines un límite de fotogramas mayor que la velocidad de juego completa " -"(NTSC: 60, PAL: 50), también debes deshabilitar la regulación de audio en " -"DSP para que tenga efecto (debería arreglar los \"clics\" de audio, pero " -"puede causar ruido constante dependiendo del juego)." +"Esto limita la velocidad de juego a un número específico de fotogramas por " +"segundo (velocidad completa es 60 para NTSC y 50 para PAL). También puedes " +"utilizar la regulación de audio con el DSP (puede arreglar los clics de " +"audio, pero puede causar ruido constante dependiendo del juego)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5533,19 +5538,16 @@ msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Relación de aspecto:" +msgstr "Activar relación de aspecto" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "Copias de EFB" +msgstr "Activar copias de EFB" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Alternar todos los tipos de registro" +msgstr "Activar niebla" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5554,7 +5556,7 @@ msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Activar IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5648,9 +5650,8 @@ msgid "Undo Load State" msgstr "Deshacer cargar estado" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Deshacer cargar estado" +msgstr "Deshacer estado guardado" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5723,6 +5724,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Usa un sistema menos preciso para calcular los valores de profundidad.\n" +"Provoca pequeños errores en unos pocos juegos pero da un notable aumento de " +"velocidad.\n" +"\n" +"Si dudas déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5745,6 +5751,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Usa operaciones inseguras para acelerar el streaming de vértices en Open GL. " +"No hay problemas conocidos en GPUs soportadas, pero causa problemas severos " +"y errores gráficos en las demás.\n" +"\n" +"Si dudas, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5770,9 +5781,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "Hack de velocidad MMU" +msgstr "Hack de velocidad VBeam" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5792,7 +5802,7 @@ msgstr "Verbosidad" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Hack del streaming de vértices" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -6018,7 +6028,7 @@ msgstr "Trabajando..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Escribir memcards (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6215,12 +6225,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "Resultado desconocido %d (esperado %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Se recibió un mensaje desconocido de id: %d" +msgstr "Mensaje desconocido recibido" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6237,108 +6246,3 @@ msgstr "Correción zNear:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OR" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Emulación de VBeam precisa" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Permite alternar algunas opciones a través de las teclas de acceso rápido " -#~ "3 (Resolución interna), 4 (Relación de apecto), 5 (Copias EFB) y 6 " -#~ "(Niebla) en la ventana de emulación.\n" -#~ "\n" -#~ "Si no estás seguro, déjala sin marcar." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "" -#~ "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "No se pudieron definir los pads. ¡El jugador se fue, o el juego aún se " -#~ "está ejecutándo!\n" -#~ "(definir los pads mientras el juego está ejecutándose no está permitido " -#~ "todavía)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Habilitar atajos" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL. " -#~ "Requiere que renombres soft_oal.dll a OpenAL32.dll para que funcione." - -#~ msgid "Export failed, try again?" -#~ msgstr "Fallo al exportar. ¿Intentar de nuevo?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "¡Fallo al escuchar!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Fallo al cargar bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Fallo al cargar hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Configuración del micro de GC" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY ha sido llamada; ¡por favor, comunícalo!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Búfer hackeado cargado" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF " -#~ "= Rápido)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Fallo al importar. ¿Probar otra vez?" - -#~ msgid "In-Game" -#~ msgstr "En juego" - -#~ msgid "Last Overwritten State" -#~ msgstr "Último estado sobrescrito" - -#~ msgid "Last Saved State" -#~ msgstr "Último estado guardado" - -#~ msgid "Local" -#~ msgstr "Local" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Reconectar Wiimote al cargar estado" - -#~ msgid "Set" -#~ msgstr "Definir" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Saltar pase de alpha en dest." - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Utilizar un búfer de carga hackeada a los vértices de flujo.\n" -#~ "Normalmente mejora la velocidad, pero esta prohibido en OpenGL y puede " -#~ "causar errores graves.\n" -#~ "\n" -#~ "Si no estás seguro, déjala desmarcada." - -#~ msgid "Wii Save Import" -#~ msgstr "Importar guardado de Wii" diff --git a/Languages/po/fa.po b/Languages/po/fa.po index 341b05a053..a831a69752 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" -"Last-Translator: Delayline \n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" +"Last-Translator: delroth \n" "Language-Team: Persian (http://www.transifex.com/projects/p/dolphin-emu/" "language/fa/)\n" "Language: fa\n" @@ -113,9 +113,9 @@ msgid "%s failed to open" msgstr "%s بازکردن با شکست مواجه شد" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s بازکردن با شکست مواجه شد" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -317,9 +317,8 @@ msgid "(off)" msgstr "(خاموش)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ اضافه کردن" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -406,7 +405,6 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -422,22 +420,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"اخطار:\n" -"\n" -"در حال حاضر نت پلی تنها زمانی به درستی کار خواهد کرد که از تنظیمات زیر " -"استفاده می کند:\n" -"- پردازنده با دو هسته یا بیشتر [خاموش]\n" -"- دریچه صدا [خاموش]\n" -"- برابرسازی سطح بالای پردازشگر صدای دلفین با \"Null Audio\" یا برابرسازی سطح " -"پائین پردازشگر صدای دلفین\n" -"- تعداد دقیق کنترولر هایی که استفاده خواهند شد را به صورت دستی تنظیم کنید " -"[کنترولر استاندارد]\n" -"تمام بازیکنان باید سعی کنند که از همان تنظیمات و نسخه دلفین استفاده کنند.\n" -"تمام کارت های حافظه را از کار بیاندازید یا پیش از شروع آنها را به تمام " -"بازیکنان بفرستید.\n" -"پشتیبانی ویموت اجرا نشده است.\n" -"\n" -"شما باید درگاه TCP را به میزبان ارسال کنید!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -1234,9 +1216,8 @@ msgstr "اتصال" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "اتصال کیبورد USB" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1521,9 +1502,8 @@ msgid "Decompressing ISO" msgstr "در حال ناهمفشرده کردن آیزو" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "به روز کردن لیست بازی" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1643,17 +1623,12 @@ msgstr "" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"از قلم انداختن مقصد آلفا پاس در بسیاری از بازی ها برای افکت های متفرقه " -"گرافیک استفاده می شود.\n" -"\n" -"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1790,13 +1765,10 @@ msgid "Dolphin was unable to complete the requested action." msgstr "دلفین نتوانست عمل خواسته شده را تکمیل کند." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"فعال کردن دسترسی سریع به دیسک. این امر برای اجرای تعداد محدودی از بازی ها " -"لازم است. (ON=سریع، OFF=سازگار)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2255,9 +2227,8 @@ msgid "Exit" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "صادر کردن همه ذخیره ها" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2288,9 +2259,8 @@ msgid "Export all saves" msgstr "صادر کردن همه ذخیره ها" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "صادر کردن با شکست مواجه شد" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2497,9 +2467,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "نوشتن سرخط برای فایل %d با شکست مواجه شد" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2514,9 +2484,9 @@ msgid "Failed to write bkhdr" msgstr "نوشتن bkhdr با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "خواندن داده از فایل با شکست مواجه شد %d" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2689,9 +2659,9 @@ msgid "Found %d results for '" msgstr "پیدا کردن نتایج %d برای '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "قادر به ذخیره کردن نیست %s" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3092,14 +3062,12 @@ msgid "Import Save" msgstr "وارد کردن ذخیره" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "وارد کردن ذخیره" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "صادر کردن با شکست مواجه شد" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3126,9 +3094,8 @@ msgid "In Game" msgstr "در بازی" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "حد فریم:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3419,58 +3386,48 @@ msgid "Load Custom Textures" msgstr "بارگذاری بافت اشیاء دلخواه" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&بارگذاری وضعیت" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "بارگذاری وضعیت - شکاف ۱" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "بارگذاری وضعیت - شکاف ۲" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "بارگذاری وضعیت - شکاف ۳" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "بارگذاری وضعیت - شکاف ۴" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "بارگذاری وضعیت - شکاف ۵" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "بارگذاری وضعیت - شکاف ۶" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "بارگذاری وضعیت - شکاف ۷" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "بارگذاری وضعیت - شکاف ۸" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "بارگذاری وضعیت - شکاف ۱" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "بارگذاری وضعیت - شکاف ۱" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3501,9 +3458,8 @@ msgid "Load State Slot 8" msgstr "بارگذاری وضعیت - شکاف ۸" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "بارگذاری وضعیت - شکاف ۱" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4064,15 +4020,11 @@ msgid "Orange" msgstr "نارنجی" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"ترتیب فایل ها در پوشه فایل با ترتیب بلوک یکسان نیست\n" -"کلیک راست کنید و تمام ذخیره ها را صادر کنید،\n" -"و ذخیره ها را به کارت حافظه ای جدید وارد کنید\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4354,9 +4306,8 @@ msgid "Record" msgstr "ضبط" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "گزینه های ضبط" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4487,23 +4438,20 @@ msgid "Save GCI as..." msgstr "ذخیره جی سی آی بعنوان..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "ذخ&یره وضعیت" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "ذخ&یره وضعیت" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "ذخیره وضعیت - شکاف ۱" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "ذخیره وضعیت - شکاف ۱" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4534,9 +4482,8 @@ msgid "Save State Slot 8" msgstr "ذخیره وضعیت - شکاف ۸" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "ذخیره وضعیت - شکاف ۱" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4779,9 +4726,8 @@ msgid "Settings..." msgstr "تنظیمات..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "برپاکردن حافظه وی: ناتوان در پیدا کردن فایل تنظیم" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4812,9 +4758,8 @@ msgid "Show &Toolbar" msgstr "نمایش نوار &ابزار" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "پیش فرز" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5409,16 +5354,12 @@ msgstr "" "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"اگر شما حد فریم را بالاتر از سرعت کامل بازی تنظیم کنید (NTSC:۶۰، PAL:۵۰). " -"استفاده کنید از دریچه صدا با استفاده از پردازشگر صدای دلفین (شاید صدا های " -"تیک را درست کند اما همچنین می تواند موجب نویز ثابت بسته به بازی شود)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5460,19 +5401,16 @@ msgid "Toggle All Log Types" msgstr "تبدیل انواع ثبت وقایع" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "نسبت طول به عرض تصویر:" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "کپی های ای اف بی" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "تبدیل انواع ثبت وقایع" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5575,9 +5513,8 @@ msgid "Undo Load State" msgstr "خنثی کردن وضعیت بارگذاری" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "خنثی کردن وضعیت بارگذاری" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5695,9 +5632,8 @@ msgid "V-Sync" msgstr "هماهنگ کردن فرکانس عمودی بازی با صفحه نمایش" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "هک کردن سرعت واحد مدیریت حافظه" +msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -6128,9 +6064,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "پیام ناشناخته با آی دی %d دریافت شد" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6147,87 +6082,3 @@ msgstr "اصلاح z نزدیک:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| یا" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "برابرسازی دقیق وی بیم" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "اجازه کنترل برخی گزینه ها توسط کلیدهای میانبر ۳ (وضوح داخلی)، ۴ (نسبت " -#~ "طول به عرض)، ۵ (کپی ای اف بی) و ۶ (مه) در داخل پنجره برابرساز را میدهد.\n" -#~ "\n" -#~ "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید." - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "قادر به ست کردن گیم پدها نیست. بازی کن بازی را ترک کرده و یا بازی در حال " -#~ "اجرا است!\n" -#~ "(ست کردن گیم پدها در حالی که بازی در حال اجرا است فعلا پشتیبانی نمی شود)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "فعال کردن شرت کاتها" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). " -#~ "فقط پشتوانه اپن ای ال (OpenAL). شاید تغییر نام soft_oal.dll به OpenAL32." -#~ "dll برای به کار انداختن این امکان احتیاج باشد." - -#~ msgid "Export failed, try again?" -#~ msgstr "صادر کردن با شکست مواجه شد، کوشش دوباره؟" - -#~ msgid "Failed to Listen!!" -#~ msgstr "پذیرفتن با شکست مواجه شد!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "بارگذاری bthprops.cpl با شکست مواجه شد" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "بارگذاری hid.dll با شکست مواجه شد" - -#~ msgid "GCMic Configuration" -#~ msgstr "پیکربندی میکروفن گیم کیوب" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIY فرا خوانده شد، لطفا گزارش دهید!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "اگر تعداد فریم های نمایش داده شده بر ثانیه نامنظم است، شاید این گزینه به " -#~ "رفع آن کمک کند. (روشن = سازگار، خاموش = سریع)" - -#~ msgid "Import failed, try again?" -#~ msgstr "وارد کردن با شکست مواجه شد، سعی دوباره؟" - -#~ msgid "In-Game" -#~ msgstr "در بازی" - -#~ msgid "Last Overwritten State" -#~ msgstr "آخرین وضعیت بازنویسی شده" - -#~ msgid "Last Saved State" -#~ msgstr "آخرین وضعیت ذخیره شده" - -#~ msgid "Local" -#~ msgstr "محلی" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "برقراری ارتباط مجدد ویموت در بارگذاری وضعیت" - -#~ msgid "Set" -#~ msgstr "ست" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "از قلم انداختن مقصد آلفا پاس" - -#~ msgid "Wii Save Import" -#~ msgstr "وارد کردن فایل ذخیره وی" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 46e89d15ab..d4b0978439 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -4,13 +4,19 @@ # # Translators: # FRtranslator , 2013 +# FRtranslator , 2013 +# RyDroid , 2013 +# RyDroid , 2013 +# RyDroid , 2013 +# toadjaune , 2013 +# toadjaune , 2013 # Vinet Sebastien , 2011 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-18 10:41+0000\n" +"PO-Revision-Date: 2013-09-12 20:17+0000\n" "Last-Translator: FRtranslator \n" "Language-Team: French (http://www.transifex.com/projects/p/dolphin-emu/" "language/fr/)\n" @@ -22,7 +28,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516 msgid " (too many to display)" -msgstr "(trop nombreux pour être affichés)" +msgstr " (trop nombreux pour être affichés)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:291 #: Source/Core/DolphinWX/Src/NetWindow.cpp:521 @@ -114,9 +120,9 @@ msgid "%s failed to open" msgstr "Impossible d'ouvrir %s" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "Impossible d'ouvrir %s" +msgstr "%s a échoué: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -159,7 +165,7 @@ msgstr "&& AND" #: Source/Core/DolphinWX/Src/FrameTools.cpp:303 msgid "&About..." -msgstr "&A propos..." +msgstr "&À propos..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:100 msgid "&Boot from DVD Drive..." @@ -191,7 +197,7 @@ msgstr "&Supprimer les ISO sélectionnés" #: Source/Core/DolphinWX/Src/FrameTools.cpp:172 msgid "&Emulation" -msgstr "&Emulation" +msgstr "&Émulation" #: Source/Core/DolphinWX/Src/FrameTools.cpp:114 msgid "&File" @@ -311,16 +317,15 @@ msgstr "(-)+zNear" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:86 msgid "(UNKNOWN)" -msgstr "Inconnu" +msgstr "(Inconnu)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385 msgid "(off)" msgstr "(aucun)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "+ ADD" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -409,7 +414,6 @@ msgstr "" "Vous devez jumeler manuellement vos Wiimotes." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -425,22 +429,21 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"ATTENTION :\n" +"ALERTE :\n" "\n" -"NetPlay fonctionnera correctement uniquement avec ces paramètres :\n" -" - Dual Core désactivé\n" -" - Audio Throttle désactivé\n" -" - DSP-HLE avec \"Null Audio\" ou le DSL-LLE\n" -" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans " -"[Contrôleur standard]\n" +"Netplay marchera seulement avec les paramètres suivants :\n" +" - Double cœur activé [OFF]\n" +" - Le moteur d'émulation DSP doit être le même sur tous les ordinateurs !\n" +" - DSP sur un thread dédié [OFF]\n" +" - La limite de frame pas fixée en fonction de l'[audio]\n" "\n" -"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et " -"les mêmes paramètres.\n" -"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les " -"joueurs avant de démarrer.\n" -"La prise en charge de la Wiimote n'est pas encore implémentée.\n" +"Tous les joueurs devraient utiliser la même version de Dolphin et les mêmes " +"paramètres.\n" +"Toutes les cartes mémoires doivent être identiques entre joueurs, ou " +"désactivées.\n" +"La prise en charge de la Wiimote n'a pas été implémentée !\n" "\n" -"Vous devez indiquer le port TCP à l'hôte !!" +"L'hôte doit avoir le port TCP choisi ouvert/transmis !\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -454,7 +457,7 @@ msgstr "Codes AR" #: Source/Core/DolphinWX/Src/AboutDolphin.h:21 msgid "About Dolphin" -msgstr "A propos de Dolphin" +msgstr "À propos de Dolphin" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Acceleration" @@ -472,7 +475,7 @@ msgid "" "\n" "If unsure, check EFB to Texture instead." msgstr "" -"Emule fidèlement les copies d'EFB.\n" +"Émule fidèlement les copies d'EFB.\n" "Certains jeux requièrent ceci pour certains effets graphiques ou " "fonctionnalités dans le jeu.\n" "\n" @@ -491,10 +494,10 @@ msgid "" "Culprit Code:\n" "%s" msgstr "" -"Erreur de décryption du Code Action Replay :\n" +"Erreur de décryptage du Code Action Replay :\n" "Echec de vérification de la parité\n" "\n" -"Culprit Code:\n" +"Code coupable :\n" "%s" #: Source/Core/Core/Src/ActionReplay.cpp:657 @@ -521,7 +524,7 @@ msgid "" "Fill (%s)" msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " -"l'écriture de la RAM et Remplir (%s)" +"Écriture dans la RAM et Remplir (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:597 #, c-format @@ -529,7 +532,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Écrire " "vers Pointeur (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:792 @@ -676,7 +679,7 @@ msgstr "Tous les fichiers ISO Wii (iso)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 msgid "All compressed GC/Wii ISO files (gcz)" -msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" +msgstr "Tous les fichiers ISO compressés de GC/Wii (gcz)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:107 msgid "All files (*.*)|*.*" @@ -745,7 +748,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " +"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 @@ -837,7 +840,7 @@ msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balance Board" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -871,7 +874,7 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:174 msgid "Block Allocation Table checksum failed" msgstr "" -"Echec de la vérification de la somme de contrôle de la Table d'Allocation de " +"Échec de la vérification de la somme de contrôle de la Table d'Allocation de " "Blocs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 @@ -944,7 +947,7 @@ msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65 msgid "C Stick" -msgstr "Stick-C" +msgstr "Stick C" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:64 msgid "C-Stick" @@ -1248,9 +1251,8 @@ msgstr "Connecter" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Connecter le clavier USB" +msgstr "Connecter la Balance Board" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1299,7 +1301,7 @@ msgstr "Convertir en GCI" #: Source/Core/Core/Src/CoreParameter.cpp:384 msgid "Copy failed" -msgstr "Echec de la copie" +msgstr "Échec de la copie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 #, c-format @@ -1475,9 +1477,8 @@ msgid "DSP settings" msgstr "Paramètres DSP (audio)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP sur un thread dédié" +msgstr "DSP LLE sur un thread dédié" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1493,7 +1494,7 @@ msgstr "DVDLowUnencryptedRead - Erreur fatale : impossible de lire le volume" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Dance Mat" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1522,7 +1523,7 @@ msgstr "Débug" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Debugging" -msgstr "Débug" +msgstr "Débugage" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:66 msgid "Decimal" @@ -1542,9 +1543,8 @@ msgid "Decompressing ISO" msgstr "Décompression de l'ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Rafraîchir la liste des jeux" +msgstr "Baisser la limite d'image/s" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1626,7 +1626,7 @@ msgstr "Désactiver" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Désactiver Destination Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1663,15 +1663,14 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " -"divers effets graphiques.\n" +"Désactive l'émulation d'une fonctionnalité matérielle nommée Passe alpha de " +"destination, utilisée dans beaucoup de jeux pour divers effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -1749,6 +1748,37 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ par l'équipe de Dolphin\n" +"\n" +"Branche : %s\n" +"Révision: %s\n" +"Compilé le %s @ %s\n" +"\n" +"Dolphin est un émulateur de Gamecube et Wii,\n" +"écrit à l'origine par by F|RES et ector.\n" +"Aujourd'hui, Dolphin est un projet open source\n" +"avec beaucoup de contributeurs, trop pour être cités.\n" +"Si vous êtes intéressés, rendez-vous sur le page du projet à\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Remerciements particuliers à Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 et Hotquik pour leurs démos\n" +"de rétro-ingénieurie et leurs docs et démos.\n" +"\n" +"Grands mercis à Gilles Mouchard dont l'émulateur Microlib PPC\n" +"a donné un coup de pouce au début du développement.\n" +"\n" +"Merci à Frank Wille pour son désassembleur PowerPC,\n" +"que or9 et nous avons modifié pour inclure les spécificités Gekko.\n" +"\n" +"Merci à hcs/destop pour leur décodeur GC ADPCM.\n" +"\n" +"Nous ne sommes d'aucune manière affiliés à Nintendo.\n" +"Gamecube et Wii sont des marques déposées de Nintendo.\n" +"Cet émulateur est à des fins d'éducation uniquement\n" +"et ne devrait pas être utilisé pour jouer à des jeux\n" +"que vous ne possédez pas légalement." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1810,13 +1840,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin n'a pas pu exécuter l'action demandée." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " -"ARRÊT = Compatible)" +"Double la fréquence d'horloge du GPU émulé. Peut accélérer certains jeux " +"(Coché = rapide, Décoché = compatible)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1924,23 +1953,23 @@ msgstr "Premières mises à jour de mémoire" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" -msgstr "Editer" +msgstr "Éditer" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17 msgid "Edit ActionReplay Code" -msgstr "Editer le code ActionReplay" +msgstr "Éditer le code ActionReplay" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:286 msgid "Edit Config" -msgstr "Editer la configuration" +msgstr "Éditer la configuration" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Modifier les paramètres personnalisés" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" -msgstr "Editer le patch" +msgstr "Éditer le patch" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" @@ -1949,7 +1978,7 @@ msgstr "Modifier la perspective actuelle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 msgid "Edit..." -msgstr "Editer..." +msgstr "Éditer..." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Effect" @@ -1971,7 +2000,7 @@ msgid "" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" -"Emule précisément les XFB.\n" +"Émule précisément les XFB.\n" "Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais " "est nécessaire pour émuler certains jeux correctement.\n" "\n" @@ -1986,11 +2015,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Emule les XFB en utilisant les objets de texture du GPU.\n" +"Émule les XFB en utilisant les objets de texture du GPU.\n" "Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans " "être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne " "pas fonctionner pour beaucoup d'autres jeux (particulièrement les " "applications homebrew).\n" +"\n" "Dans le doute, sélectionnez cette case." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 @@ -1999,7 +2029,7 @@ msgstr "Wiimote émulée" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " -msgstr "Etat de l'émulation :" +msgstr "État de l'émulation :" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Enable" @@ -2047,7 +2077,7 @@ msgstr "Activer le Dual Core" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" -msgstr "Activer le Dual Core (plus rapide)" +msgstr "Activer le double cœur (plus rapide)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" @@ -2063,7 +2093,7 @@ msgstr "Activer le MMU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" -msgstr "Activer le Progressive Scan" +msgstr "Activer le balayage progressif" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" @@ -2222,7 +2252,7 @@ msgstr "Entrée 1/%d" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194 msgid "Equal" -msgstr "Egal" +msgstr "Égal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 @@ -2275,12 +2305,11 @@ msgstr "Exécuter" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Quitter" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exporter toutes les sauvegardes" +msgstr "Exporter toutes les sauvegardes Wii" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2311,9 +2340,8 @@ msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Echec de l'exportation" +msgstr "L'exportation a échoué" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2333,7 +2361,7 @@ msgstr "Paramètres supplémentaires" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "Paramètre supplémentaire utile dans ''Metroid: Other M'' uniquement." +msgstr "Paramètre supplémentaire utile dans ''Metroid: Other M'' uniquement." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." @@ -2349,15 +2377,15 @@ msgstr "Extraire le DOL..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." -msgstr "Extraire un dossier..." +msgstr "Extraire le dossier..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." -msgstr "Extraire un fichier..." +msgstr "Extraire le fichier..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." -msgstr "Extraire une partition..." +msgstr "Extraire la partition..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format @@ -2424,7 +2452,7 @@ msgstr "" "Utilisez DSPSpy pour extraire le fichier de votre console.\n" "\n" "Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas " -"d'extration de ROM.\n" +"d'extraction de ROM.\n" "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108 @@ -2433,6 +2461,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Impossible de charger bthprops.cpl ! Vous ne pourrez pas connecter de " +"Wiimote et Dolphin peut planter inopinément !" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2440,6 +2470,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Impossible de charger hid.dll ! Vous ne pourrez pas connecter de Wiimote et " +"Dolphin peut planter inopinément !" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2521,9 +2553,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Impossible d'écire l'entête du fichier %d" +msgstr "Impossible de lire l'entête du fichier %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2538,9 +2570,9 @@ msgid "Failed to write bkhdr" msgstr "Impossible d'écrire bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Impossible de lire les données du fichier %s" +msgstr "Impossible d'écrire dans le fichier: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2557,7 +2589,7 @@ msgstr "Rapide" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Calcul rapide de la profondeur" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2707,7 +2739,7 @@ msgstr "Avant" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Faire suivre le port (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2715,9 +2747,9 @@ msgid "Found %d results for '" msgstr "Trouvé %d résultats pour '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Impossible de sauvegarder %s" +msgstr "%x fichiers de sauvegarde trouvés" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2853,7 +2885,7 @@ msgid "" "native code handler by placing the codehandler.bin file into the Sys " "directory and restarting Dolphin.)" msgstr "" -"Echec de l'exécution du GeckoCode (CT%i CST%i) (%s)\n" +"Échec de l'exécution du GeckoCode (CT%i CST%i) (%s)\n" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge. Essayez " "avec le code natif en plaçant le fichier codehandler.bin dans le répertoire " "Sys, puis redémarrez Dolphin.)" @@ -3136,14 +3168,12 @@ msgid "Import Save" msgstr "Importer une sauvegarde" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importer une sauvegarde" +msgstr "Importer la sauvegarde Wii" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Echec de l'exportation" +msgstr "Échec de l'importation" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3170,9 +3200,8 @@ msgid "In Game" msgstr "Dans le jeu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Image/s max :" +msgstr "Augmenter la limite d'image/s" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3334,7 +3363,7 @@ msgstr "" #: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" -msgstr "Etat non valide" +msgstr "État non valide" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3407,7 +3436,7 @@ msgstr "Langue :" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Dernier %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3465,58 +3494,48 @@ msgid "Load Custom Textures" msgstr "Charger textures personnalisées" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Charger l'état" +msgstr "Charger l'état" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Charger l'état du Slot 1" +msgstr "Charger le dernier état 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Charger l'état du Slot 2" +msgstr "Charger le dernier état 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Charger l'état du Slot 3" +msgstr "Charger le dernier état 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Charger l'état du Slot 4" +msgstr "Charger le dernier état 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Charger l'état du Slot 5" +msgstr "Charger le dernier état 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Charger l'état du Slot 6" +msgstr "Charger le dernier état 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Charger l'état du Slot 7" +msgstr "Charger le dernier état 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Charger l'état du Slot 8" +msgstr "Charger le dernier état 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Charger l'état du Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Charger l'état du Slot 1" +msgstr "Charger le dernier état 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3547,9 +3566,8 @@ msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Charger l'état du Slot 1" +msgstr "Charger le dernier état 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4058,7 +4076,7 @@ msgstr "Afficher les messages informatifs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "&Documentation en ligne" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4109,10 +4127,14 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Ouvre la configuration par défaut pour ce jeu dans un éditeur de texte " +"externe (lecture seule)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." msgstr "" +"Ouvre la configuration personnalisée pour ce jeu dans un éditeur de texte " +"externe" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4124,7 +4146,6 @@ msgid "Orange" msgstr "Orange" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -4133,7 +4154,7 @@ msgstr "" "L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre " "des blocs\n" "Faites un clic droit et exportez toutes les sauvegardes,\n" -"et importez les sauvegardes vers une nouvelle carte mémoire\n" +"puis importez les sauvegardes vers une nouvelle carte mémoire\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4192,7 +4213,7 @@ msgstr "Partition %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "La partition n'existe pas : %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4381,7 +4402,7 @@ msgstr "Russie" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Radius" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4397,7 +4418,7 @@ msgstr "Réel" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Balance Board physique" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4415,9 +4436,8 @@ msgid "Record" msgstr "Enregistrer" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Options d'enregistrement" +msgstr "Entrée mémoire" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4504,7 +4524,7 @@ msgstr "Entrée" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Révision :" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4521,12 +4541,11 @@ msgid "Rumble" msgstr "Rumble" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Exécute les DSP HLE et LLE sur un thread dédié (non recommandé : peut " -"provoquer des pépins avec le HLE et des blocages avec le LLE)." +"Éxécuter DSP LLE sur un thread dédié (non recommandé : peut causer des " +"blocages)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4551,23 +4570,20 @@ msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Sau&vegarder l'état" +msgstr "Sauvegarder l'ancien état" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Sau&vegarder l'état" +msgstr "Sauvegarder l'état" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Sauvegarder l'état vers le Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Sauvegarder l'état vers le Slot 1" +msgstr "Sauvegarder l'état au Slot 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4598,9 +4614,8 @@ msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Sauvegarder l'état vers le Slot 1" +msgstr "Sauvegarder l'état au Slot 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4684,7 +4699,7 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:46 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539 msgid "Select" -msgstr "Select" +msgstr "Sélectionner" #: Source/Core/DolphinWX/Src/FrameTools.cpp:725 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 @@ -4857,9 +4872,8 @@ msgid "Settings..." msgstr "Configurer..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" +msgstr "SetupWiiMem: Impossible de créer le fichier de paramètres" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4890,9 +4904,8 @@ msgid "Show &Toolbar" msgstr "Afficher la barre d'&outils" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Par défaut" +msgstr "Afficher les paramètres par défaut" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5201,11 +5214,11 @@ msgstr "Commencer l'enregistrement" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302 msgid "State" -msgstr "Etat" +msgstr "État" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161 msgid "State Saves" -msgstr "Etats" +msgstr "États sauvegardés" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" @@ -5237,7 +5250,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Stretch to Window" -msgstr "Etirer à la fenêtre" +msgstr "Étirer à la fenêtre" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47 msgid "Strum" @@ -5258,7 +5271,7 @@ msgstr "Fichiers de sauvegarde importés avec succès" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Suédois" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5494,17 +5507,16 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus " -"élevée que la vitesse du jeu (NTSC:60, PAL:50), activer le contrôle audio " -"pour DSP (peut éliminer les clics audio mais peut causer un bruit constant " -"selon les jeux)." +"Ceci limite la vitesse du jeu au nombre spécifié d'images par seconde (60 i/" +"s pour le NTSC, 50 i/s pour le PAL). Vous pouvez à la place utiliser Audio " +"pour gérer via le DSP (peut éliminer les problèmes audio, mais peut " +"provoquer un bruit constant selon les jeux).²" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5548,19 +5560,16 @@ msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Format d'écran :" +msgstr "Activer le ratio hauteur/largeur" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "Copies de l'EFB" +msgstr "Activer les copies EFB" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Activer tous les types de journaux" +msgstr "Activer le brouillard" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5569,7 +5578,7 @@ msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Activer l'IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5663,9 +5672,8 @@ msgid "Undo Load State" msgstr "&Annuler le lancement d'état" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "&Annuler le lancement d'état" +msgstr "Annuler la sauvegarde de l'état" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5738,6 +5746,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Utiliser un algorithme moins précis pour calculer les valeurs de " +"profondeur.\n" +"Provoque des soucis dans quelques jeux mais peut donner une bonne " +"accélération.\n" +"\n" +"Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5760,6 +5774,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Utilise des opérations peu sûres pour accélérer le streaming des vertex dans " +"OpenGL. Il n'y a pas de problèmes connus sur les GPU pris en charge, mais " +"dans le cas contraire il causera des problèmes sévères de stabilité et " +"graphiques . \n" +"\n" +"Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5785,9 +5805,8 @@ msgid "V-Sync" msgstr "Synchro verticale" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "Hack de vitesse pour le MMU" +msgstr "Hack de vitesse VBeam" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5799,7 +5818,7 @@ msgstr "Valeur :" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577 msgid "Value: " -msgstr "Valeur" +msgstr "Valeur :" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38 msgid "Verbosity" @@ -5807,7 +5826,7 @@ msgstr "Niveau de détail" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Hack de flux de vertex" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5825,11 +5844,11 @@ msgstr "Volume" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" +msgstr "Échec de l'installation du WAD : erreur lors de la création de %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" -msgstr "Echec de l'installation du WAD : erreur lors de la création du ticket" +msgstr "Échec de l'installation du WAD : erreur lors de la création du ticket" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" @@ -6033,38 +6052,38 @@ msgstr "Travail..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Écriture carte mémoire (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" -msgstr "Ecrire dans la console" +msgstr "Écrire dans la console" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54 msgid "Write to Debugger" -msgstr "Ecrire dans le débugueur" +msgstr "Écrire dans le débugueur" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 msgid "Write to File" -msgstr "Ecrire dans le fichier" +msgstr "Écrire dans le fichier" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 msgid "Write to Window" -msgstr "Ecrire dans la fenêtre" +msgstr "Écrire dans la fenêtre" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47 #, c-format msgid "XAudio2 CreateSourceVoice failed: %#X" -msgstr "Echec de XAudio2 CreateSourceVoice : %#X" +msgstr "Échec de XAudio2 CreateSourceVoice : %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101 #, c-format msgid "XAudio2 init failed: %#X" -msgstr "Echec de l'initialisation de XAudio2 : %#X" +msgstr "Échec de l'initialisation de XAudio2 : %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111 #, c-format msgid "XAudio2 master voice creation failed: %#X" -msgstr "Echec de la création de la voix principale dans XAudio2 : %#X" +msgstr "Échec de la création de la voix principale dans XAudio2 : %#X" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776 msgid "XF reg" @@ -6149,7 +6168,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" -msgstr "ZTP hack" +msgstr "Hack ZTP" #: Source/Core/Core/Src/ActionReplay.cpp:377 msgid "Zero 3 code not supported" @@ -6230,12 +6249,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "flavor inconnu %d (%d attendu)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Reception d'un message inconnu avec l'ID : %d" +msgstr "Message inconnu reçu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6251,110 +6269,4 @@ msgstr "Correction zNear :" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" -msgstr "| OR" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Emulation fidèle VBeam" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Permet d'activer certaines options via les raccourcis clavier dans la " -#~ "fenêtre d'émulation : 3 (résolution interne), 4 (ratio d'image), 5 (Copie " -#~ "d'EFB), et 6 (Brouillard) .\n" -#~ "\n" -#~ "Dans le doute, décochez cette case." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "" -#~ "Impossible de trouver la Wiimote par bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu " -#~ "est en cours d'exécution !\n" -#~ "(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " -#~ "pris en charge)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Activer les touches de raccourci" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " -#~ "Uniquement avec le moteur OpenAL. Il peut être nécessaire de renommer le " -#~ "fichier soft_oal.dll en OpenAL32.dll pour que cela fonctionne." - -#~ msgid "Export failed, try again?" -#~ msgstr "L'exportation a échoué. Essayer de nouveau ?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Ecoute impossible !" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Impossible de charger bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Impossible de charger hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Configuration du micro GC" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "Appel de HCI_CMD_INQUIRY, veuillez nous le signaler !" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Hack de Transmission du Buffer" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON " -#~ "= Compatible, OFF = Vitesse)" - -#~ msgid "Import failed, try again?" -#~ msgstr "L'importation a échoué. Essayer de nouveau ?" - -#~ msgid "In-Game" -#~ msgstr "Dans le jeu" - -#~ msgid "Last Overwritten State" -#~ msgstr "Dernier état écrasé" - -#~ msgid "Last Saved State" -#~ msgstr "Dernier état sauvegardé" - -#~ msgid "Local" -#~ msgstr "Local" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Reconnecter la Wiimote lors du chargement d'un état" - -#~ msgid "Set" -#~ msgstr "Paramétrer" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Ignorer Passe Alpha de dest." - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Utiliser une stratégie hackée d'envoi pour transmettre les sommets.\n" -#~ "Cela permet d'accélérer le rendu, mais est interdit par les " -#~ "spécifications d'OpenGL et peut provoquer de gros bugs graphiques.\n" -#~ "\n" -#~ "Dans le doute, décochez cette case." - -#~ msgid "Wii Save Import" -#~ msgstr "Importer une sauvegarde Wii" +msgstr "| OU" diff --git a/Languages/po/he.po b/Languages/po/he.po index dbc66e9b49..cc191c6f4f 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -9,9 +9,10 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" "Last-Translator: delroth \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/dolphin-emu/" +"language/he/)\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index f1c21fedb7..3f7b03fc89 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" -"Last-Translator: Delirious \n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" +"Last-Translator: delroth \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/dolphin-emu/" "language/hu/)\n" "Language: hu\n" @@ -113,9 +113,9 @@ msgid "%s failed to open" msgstr "%s megnyitása sikertelen" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s megnyitása sikertelen" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -317,9 +317,8 @@ msgid "(off)" msgstr "(ki)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ HOZZÁADÁS" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -408,7 +407,6 @@ msgstr "" "Kézileg kell csatlakoztatni a Wiimote irányítókat." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -424,22 +422,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"FIGYELEM:\n" -"\n" -"A NetPlay jelenleg csak a következő beállítások használatával működik " -"megfelelően:\n" -" - Kétmagos mód [KI]\n" -" - Hang szabályozás [KI]\n" -" - DSP-HLE \"Null Audio\" használatával vagy DSP-LLE\n" -" - Kézileg legyen beállítva az irányítók pontos száma, amik használva " -"lesznek, mint [szabvány irányító]\n" -"\n" -"Minden játékosnak azonos Dolphin verziót és beállításokat kell használnia.\n" -"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a " -"játék megkezdése előtt.\n" -"Wiimote támogatás még nem működik.\n" -"\n" -"Továbbítani kell a TCP portot a host számára!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -1240,9 +1222,8 @@ msgstr "Csatlakozás" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "USB billentyűzet csatlakoztatása" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1524,9 +1505,8 @@ msgid "Decompressing ISO" msgstr "ISO kitömörítés" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Játéklista frissítése" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1647,17 +1627,12 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"A sok játékban különféle grafikai effektusokhoz használt destination alpha " -"pass figyelmen kívül hagyása.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1794,13 +1769,10 @@ msgid "Dolphin was unable to complete the requested action." msgstr "A Dolphin nem tudta elvégezni a kívánt műveletet." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, " -"KI = kompatibilis)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2260,9 +2232,8 @@ msgid "Exit" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Minden mentés exportálása" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2293,9 +2264,8 @@ msgid "Export all saves" msgstr "Minden mentés exportálása" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Exportálás sikertelen" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2502,9 +2472,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Fejléc írása sikertelen a(z) %d fájl számára" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2519,9 +2489,9 @@ msgid "Failed to write bkhdr" msgstr "A bkhdr írása sikertelen" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "%d fájlból történő adatok kiolvasása nem sikerült" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2695,9 +2665,9 @@ msgid "Found %d results for '" msgstr "Találat: %d eredmény ehhez: '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "%s nem menthető el" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3100,14 +3070,12 @@ msgid "Import Save" msgstr "Mentés importálása" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Mentés importálása" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Exportálás sikertelen" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3134,9 +3102,8 @@ msgid "In Game" msgstr "Elindul" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Képkocka korlát:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3429,58 +3396,48 @@ msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Állás betöltése" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Állás betöltése az 1. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Állás betöltése a 2. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Állás betöltése a 3. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Állás betöltése a 4. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Állás betöltése az 5. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Állás betöltése a 6. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Állás betöltése a 7. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Állás betöltése a 8. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Állás betöltése az 1. helyről" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Állás betöltése az 1. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3511,9 +3468,8 @@ msgid "Load State Slot 8" msgstr "Állás betöltése a 8. helyről" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Állás betöltése az 1. helyről" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4081,15 +4037,11 @@ msgid "Orange" msgstr "Narancs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"A fájlok sorrendje a fájl könyvtárban nem azonos a blokkok sorrendjével\n" -"Jobb kattintás az összes fájl exportálásához,\n" -"és az állásmentések importálásához az új memóriakártyára\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4371,9 +4323,8 @@ msgid "Record" msgstr "Rögzítés" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Rögzítési beállítások" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4503,23 +4454,20 @@ msgid "Save GCI as..." msgstr "GCI mentése másként..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Ál&lás mentése" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Ál&lás mentése" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Állás mentés az 1. helyre" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Állás mentés az 1. helyre" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4550,9 +4498,8 @@ msgid "Save State Slot 8" msgstr "Állás mentés a 8. helyre" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Állás mentés az 1. helyre" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4803,9 +4750,8 @@ msgid "Settings..." msgstr "Beállítások..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Nem található a beállítási fájl" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4836,9 +4782,8 @@ msgid "Show &Toolbar" msgstr "Eszközsor &mutatása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Alap" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5439,17 +5384,12 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Ha a képkocka korlátozást magasabbra állítottad a játék teljes sebességénél " -"(NTSC: 60, PAL: 50), akkor válaszd a Hang lehetőséget a lassításhoz a DSP " -"használatával (javíthatja a hang kattogást, de ugyanakkor folyamatos zajt is " -"okozhat játékfüggően). " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5491,19 +5431,16 @@ msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Képarány:" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB másolatok" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Minden napló típus kijelölése" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5606,9 +5543,8 @@ msgid "Undo Load State" msgstr "Állás betöltés törlése" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Állás betöltés törlése" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5729,9 +5665,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU sebesség növelő hack" +msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -6177,9 +6112,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6196,104 +6130,3 @@ msgstr "zNear javítás: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| VAGY" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Pontos VBeam emuláció" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Bizonyos opciók elérhetővé válnak gyorsbillentyűkkel: 3. (Belső " -#~ "felbontás), 4. (Képarány), 5. (EFB másolat) és 6. (Köd) a emulációs " -#~ "ablakon belül.\n" -#~ "\n" -#~ "Ha bizonytalan vagy, hagyd kijelöletlenül." - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Irányítók beállítása nem sikerült. A játékos kilépett vagy a játék épp " -#~ "fut!\n" -#~ "(irányítók beállítása még nem támogatott miközben a játék fut)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Gyorsbillentyűk használata" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Csak " -#~ "OpenAl feldolgozó esetén. Működéshez szükség lehet a soft_oal.dll " -#~ "átnevezésére OpenAL32.dll névre." - -#~ msgid "Export failed, try again?" -#~ msgstr "Exportálás sikertelen. Újra megpróbálod?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Meghallgatás sikertelen!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "A bthprops.cpl betöltése sikertelen" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "A hid.dll betöltése sikertelen" - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic beállítások" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY kiadva, kérlek jelentsd!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Hekkelt puffer feltöltés" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = " -#~ "kompatibilis, KI = gyors)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importálás sikertelen, megpróbálod újra?" - -#~ msgid "In-Game" -#~ msgstr "Elindul" - -#~ msgid "Last Overwritten State" -#~ msgstr "Az utolsó felülírt mentés" - -#~ msgid "Last Saved State" -#~ msgstr "Utolsó mentett állás" - -#~ msgid "Local" -#~ msgstr "Helyi" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Wiimote újracsatlakoztatása állás betöltéskor" - -#~ msgid "Set" -#~ msgstr "Beáll." - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Dest. Alpha Pass kihagyása" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Egy hekkelt feltöltési stratégiát használ az adatfolyam tetőpontokhoz.\n" -#~ "Ez többnyire gyorsítás, de nem engedélyezett az OpenGL kikötések által és " -#~ "komoly hibákat okozhat.\n" -#~ "\n" -#~ "Ha bizonytalan vagy, hagyd kijelöletlenül." - -#~ msgid "Wii Save Import" -#~ msgstr "Wii mentés importálása" diff --git a/Languages/po/it.po b/Languages/po/it.po index aa9c9dbade..e3239a16d8 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-16 08:31+0000\n" +"PO-Revision-Date: 2013-09-10 17:08+0000\n" "Last-Translator: Mewster \n" "Language-Team: Italian (http://www.transifex.com/projects/p/dolphin-emu/" "language/it/)\n" @@ -114,9 +114,9 @@ msgid "%s failed to open" msgstr "Fallito il tentativo di aprire %s" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "Fallito il tentativo di aprire %s" +msgstr "%s fallito: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -318,9 +318,8 @@ msgid "(off)" msgstr "(nessuno)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "+ ADD" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -409,7 +408,6 @@ msgstr "" "Devi connettere manualmente i tuoi wiimote." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -427,12 +425,11 @@ msgid "" msgstr "" "ATTENZIONE:\n" "\n" -"La modalità NetPlay funzionerà correttamente solo quando verranno utilizzate " -"le seguenti impostazioni:\n" -" - Dual Core [OFF]\n" -" - DSP-HLE impostato su \"Null Audio\" oppure DSP-LLE\n" -" - Impostare manualmente il numero esatto dei controller che verranno " -"utilizzati come [Controller Standard]\n" +"La modalità NetPlay funzionerà solamente con le seguenti impostazioni:\n" +" - Abilita Dual Core [SPENTO]\n" +" - DSP Emulator Engine uguale per ogni computer!\n" +" - DSP su Thread Dedicato [SPENTO]\n" +" - Framelimiter NON settato su [Audio]\n" "\n" "Tutti i giocatori devono cercare di utilizzare le stesse impostazioni e " "versioni di Dolphin.\n" @@ -440,7 +437,7 @@ msgstr "" "tutti i giocatori prima di iniziare.\n" "Il supporto per il Wiimote non è stato implementato.\n" "\n" -"E' necessario inoltrare la porta TCP all'host!!" +"L'host deve inoltre avere aperto/inoltrato le porte TCP scelte!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -839,7 +836,7 @@ msgstr "File Header corrotto" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balance Board" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -1221,7 +1218,7 @@ msgstr "Configura" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102 msgid "Configure Control" -msgstr "Configura Controllo" +msgstr "Configura Vibrazione" #: Source/Core/DolphinWX/Src/NetWindow.cpp:327 #: Source/Core/DolphinWX/Src/NetWindow.cpp:606 @@ -1249,9 +1246,8 @@ msgstr "Collega" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Collega Tastiera USB" +msgstr "Collega Balance Board" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1475,9 +1471,8 @@ msgid "DSP settings" msgstr "Impostazioni DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP su Thread Dedicato" +msgstr "DSPLLE su Thread Separato" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1493,7 +1488,7 @@ msgstr "DVDLowUnencryptedRead - Errore Fatale: fallita lettura dal volume" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Dance Mat" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1542,9 +1537,8 @@ msgid "Decompressing ISO" msgstr "Decompressione ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Aggiorna l'elenco dei giochi" +msgstr "Diminuisci limite Frame" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1626,7 +1620,7 @@ msgstr "Disabilita" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Disabilita Destination Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1663,7 +1657,6 @@ msgstr "" "Nel dubbio, lascia deselezionato." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" @@ -1749,6 +1742,38 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revisione: %s\n" +"Compilato il: %s @ %s\n" +"\n" +"Dolphin è un emulatore Gamecube/Wii,\n" +"originariamente creato da F|RES ed ector.\n" +"Oggi Dolphin è un progetto open source dai tanti\n" +"collaboratori, troppi per essere elencati.\n" +"Se sei interessato, vai a vedere la pagina del progetto\n" +"su http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Ringraziamenti speciali a Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 e Hotquik per i loro\n" +"reverse engineering e documentazioni/demo.\n" +"\n" +"Grandi ringraziamenti a Gilles Mouchard il cui emulatore\n" +"Microlib PPC ha contribuito allo sviluppo iniziale.\n" +"\n" +"Grazie a Frank Wille per il suo disassembler PowerPC,\n" +"che or9 e noi abbiamo modificato per includere\n" +"le specifiche di Gekko\n" +"\n" +"Grazie a hcs/destop per i loro decoder GC ADPCM.\n" +"\n" +"Non siamo associati in alcun modo con Nintendo.\n" +"Gamecube e Wii sono marchi di proprietà di Nintendo.\n" +"L'emulatore esiste per scopi educativi, e non\n" +"dovrebbe essere utilizzato per giocare a giochi\n" +"che non possiedi legalmente." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1809,13 +1834,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin è impossibilitato a completare l'azione richiesta." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Abilita l'accesso rapido al disco. Necessario per alcuni giochi. (ON = " -"Velocità, OFF = Compatibilità)" +"Raddoppia la velocità di clock della GPU emulata. Potrebbe velocizzare " +"alcuni giochi (ON = Velocità. OFF = Compatibilità)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1918,7 +1942,7 @@ msgstr "EUROPA" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "Early Memory Updates" -msgstr "Aggiornamenti di Memoria Preliminari" +msgstr "Aggiornamenti Anticipati della Memoria" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" @@ -1934,7 +1958,7 @@ msgstr "Modifica Configurazione" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Modifica Sovrascritture Locali" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -1998,7 +2022,7 @@ msgstr "Wiimote Emulato" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " -msgstr "Stato dell'Emulazione: " +msgstr "Stato d'Emulazione: " #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Enable" @@ -2226,7 +2250,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:150 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240 msgid "Error" -msgstr "Errore/i" +msgstr "Errore" #: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." @@ -2274,12 +2298,11 @@ msgstr "Esegui" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Esci" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Esporta tutti i salvataggi" +msgstr "Esporta tutti i Salvataggi Wii" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2310,9 +2333,8 @@ msgid "Export all saves" msgstr "Esporta tutti i salvataggi" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Esportazione non Riuscita" +msgstr "Esportazione non riuscita" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2433,6 +2455,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Impossibile caricare bthprops.cpl! Non sarà possibile connettere veri " +"Wiimote e Dolphin stesso potrebbe crashare!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2440,6 +2464,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Impossibile caricare hid.dll! Non sarà possibile connettere veri Wiimote e " +"Dolphin stesso potrebbe crashare!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2520,9 +2546,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Fallita la scrittura dell'intestazione del file %d" +msgstr "Fallita lettura dell'header del file %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2537,9 +2563,9 @@ msgid "Failed to write bkhdr" msgstr "Scrittura bkhdr non riuscita" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Fallita lettura dei dati dal file: %s" +msgstr "Fallita scrittura di dati sul file: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2556,7 +2582,7 @@ msgstr "Rapida" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Calcolo Rapido di Profondità" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2707,7 +2733,7 @@ msgstr "in Avanti" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Forward port (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2715,9 +2741,9 @@ msgid "Found %d results for '" msgstr "Trovati %d risultati per '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Impossibile salvare %s" +msgstr "Trovati %x file di salvataggio" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3136,14 +3162,12 @@ msgid "Import Save" msgstr "Importa Salvataggio" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importa Salvataggio" +msgstr "Importa Salvataggi Wii" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Esportazione non Riuscita" +msgstr "Importazione non riuscita" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3170,9 +3194,8 @@ msgid "In Game" msgstr "In Game" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Framelimiter:" +msgstr "Aumenta limite Frame" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3407,7 +3430,7 @@ msgstr "Lingua:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Salvataggio in %i Posizione" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3465,58 +3488,48 @@ msgid "Load Custom Textures" msgstr "Carica Texture Personalizzate" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Carica Stato di Gioco" +msgstr "Carica Stato di Gioco" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Carica Stato di Gioco da Slot 1" +msgstr "Carica Stato di Gioco in Posizione 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Carica Stato di Gioco da Slot 2" +msgstr "Carica Stato di Gioco in Posizione 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Carica Stato di Gioco da Slot 3" +msgstr "Carica Stato di Gioco in Posizione 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Carica Stato di Gioco da Slot 4" +msgstr "Carica Stato di Gioco in Posizione 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Carica Stato di Gioco da Slot 5" +msgstr "Carica Stato di Gioco in Posizione 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Carica Stato di Gioco da Slot 6" +msgstr "Carica Stato di Gioco in Posizione 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Carica Stato di Gioco da Slot 7" +msgstr "Carica Stato di Gioco in Posizione 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Carica Stato di Gioco da Slot 8" +msgstr "Carica Stato di Gioco in Posizione 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Carica Stato di Gioco da Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Carica Stato di Gioco da Slot 1" +msgstr "Carica Stato di Gioco nello Slot 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3547,9 +3560,8 @@ msgid "Load State Slot 8" msgstr "Carica Stato di Gioco da Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Carica Stato di Gioco da Slot 1" +msgstr "Carica Stato di Gioco nello Slot 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3634,7 +3646,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" -msgstr "Hack Velocità MMU" +msgstr "Speed Hack MMU" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:517 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 @@ -3696,7 +3708,7 @@ msgid "" "Memory Card Manager WARNING-Make backups before using, should be fixed but " "could mangle stuff!" msgstr "" -"Gestore Scheda di Memoria - AVVISO: Eseguire una copia di sicurezza prima " +"Gestore Schede di Memoria - AVVISO: Eseguire una copia di sicurezza prima " "dell'uso!" #: Source/Core/Core/Src/CoreParameter.cpp:376 @@ -3709,8 +3721,8 @@ msgid "" "%s\n" "Would you like to copy the old file to this new location?\n" msgstr "" -"Il Nome file della Scheda di Memoria nell'Ingresso %c non è corretto\n" -"Regione non specificata\n" +"Il Nome file della Memory Card nell'Ingresso %c non è corretto\n" +"Regionalità non specificata\n" "\n" "Il percorso dell'Ingresso %c è stato cambiato in\n" "%s\n" @@ -4054,7 +4066,7 @@ msgstr "Mostra Messaggi su Schermo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "&Documentazione Online" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4105,10 +4117,14 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Apre il file di configurazione (in sola lettura) predefinito per questo " +"gioco in un editor di testo separato." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." msgstr "" +"Apre le sovrascritture specificate dall'utente in un editor di testo " +"separato." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4120,17 +4136,14 @@ msgid "Orange" msgstr "Arancione" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"L'ordine dei file nella File Directory non corrisponde con l'ordine dei " -"blocchi\n" -"Clicca col tasto destro del mouse ed esporta tutti i salvataggi,\n" -"successivamente eseguire l'importazione di questi ultimi in una nuova memory " -"card\n" +"L'ordine dei file nella cartella non corrisponde all'ordine dei blocchi\n" +"Clicca il tasto destro ed esporta tutti i salvataggi,\n" +"e importali in una nuova memory card.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4189,7 +4202,7 @@ msgstr "Partizione %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Partizione inesistente: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4378,11 +4391,11 @@ msgstr "RUSSIA" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Radius" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" -msgstr "Gamma" +msgstr "Intensità" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 msgid "Read-only mode" @@ -4394,7 +4407,7 @@ msgstr "Reale" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Balance Board Reale" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4412,9 +4425,8 @@ msgid "Record" msgstr "Registra" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Opzioni di Registrazione" +msgstr "Registra input" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4500,7 +4512,7 @@ msgstr "Invio" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revisione:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4517,12 +4529,10 @@ msgid "Rumble" msgstr "Vibrazione" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Avvia DSP HLE e LLE su un thread dedicato (non consigliato: potrebbe causare " -"glitch al sonoro con HLE e bloccarsi con LLE)" +"Esegue DSP LLE su un thread dedicato (non consigliato: potrebbe bloccarsi)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4547,23 +4557,20 @@ msgid "Save GCI as..." msgstr "Salva GCI come.." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Sal&va Stato di Gioco" +msgstr "Salva sul più vecchio Stato di Gioco" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Sal&va Stato di Gioco" +msgstr "Salva Stato di Gioco" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Salva Stato di Gioco nello Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Salva Stato di Gioco nello Slot 1" +msgstr "Salva Stato di Gioco nello Slot 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4594,9 +4601,8 @@ msgid "Save State Slot 8" msgstr "Salva Stato di Gioco nello Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Salva Stato di Gioco nello Slot 1" +msgstr "Salva Stato di Gioco nello Slot 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4850,9 +4856,8 @@ msgid "Settings..." msgstr "Impostazioni..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Impossible trovare il file di configurazione" +msgstr "SetupWiiMem: Impossibile creare file di configurazione" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4883,9 +4888,8 @@ msgid "Show &Toolbar" msgstr "Mostra Barra degli St&rumenti" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Default" +msgstr "Mostra Predefiniti" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5082,7 +5086,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:403 #, c-format msgid "Slot %i" -msgstr "Ingresso %i" +msgstr "Slot %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:706 msgid "Slot A" @@ -5162,7 +5166,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" -msgstr "Aumenta la velocità di trasferimento del Disco" +msgstr "Aumenta la velocità di trasferimento dal Disco" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:231 msgid "Square Stick" @@ -5249,7 +5253,7 @@ msgstr "I file di salvataggio sono stati importati con successo." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Svedese" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5447,9 +5451,8 @@ msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" -"Queste impostazioni sovrascrivono quelle generiche di Dolphin. \n" -"Per impostazione 'indeterminata' si intende che il gioco utilizza " -"l'impostazione di Dolphin." +"Queste impostazioni possono sovrascrivere quelle settate in Dolphin. \n" +"L'opzione 'indeterminato' utilizzerà le impostazioni di Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:345 msgid "" @@ -5485,15 +5488,17 @@ msgstr "" "Nel dubbio, lascia deselezionato." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Imposta un limite ai frame disegnati ogni secondo diverso dal valore " -"standard (NTSC:60, PAL:50)" +"Limita la velocità del gioco a uno specifico numero di frame ogni secondo " +"(il massimo della velocità è 60 per lo standard NTSC e 50 per PAL). In " +"alternativa, usa Audio per velocizzare in accordo con il DSP (potrebbe " +"correggere l'audio a scatti ma potrebbe causare un rumore costante a seconda " +"del gioco)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5502,17 +5507,14 @@ msgid "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." msgstr "" -"Consente di separare il processo (thread) dedicato al Video da quello " -"adibito\n" -"ai calcoli della CPU in modo da poterli eseguire su nuclei (cores) " -"distinti.\n" -"Migliora la velocità sui PC con più di un core,\n" -"ma può anche provocare occasionali crash/difetti." +"Consente di avviare su thread diversi i calcoli dedicati all'output video e " +"quelli dedicati alla CPU per poterli eseguire su core distinti.\n" +"Migliora la velocità sui PC multiprocessore, ma può anche ma può anche " +"provocare occasionali crash o malfunzionamenti." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:287 msgid "This will let you Manually Edit the INI config file" -msgstr "" -"Questo vi permetterà di modificare manualmente il file di configurazione INI" +msgstr "Permette di modificare manualmente il file di configurazione INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:237 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:242 @@ -5538,19 +5540,16 @@ msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Rapporto d'Aspetto:" +msgstr "Imposta Aspetto" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "Copie EFB" +msgstr "Imposta Copie EFB" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Seleziona/Deseleziona tutti i Tipi di Log" +msgstr "Imposta Nebbia" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5559,7 +5558,7 @@ msgstr "Visualizza a Schermo Intero" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Imposta IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5653,9 +5652,8 @@ msgid "Undo Load State" msgstr "Annulla Caricamento Stato di Gioco" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Annulla Caricamento Stato di Gioco" +msgstr "Annulla Salvataggio dello Stato di Gioco" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5729,6 +5727,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Utilizza un algoritmo meno preciso per calcolare i valori di profondità.\n" +"Causa problemi in alcuni giochi ma potrebbe fornire un buon aumento di " +"velocità.\n" +"\n" +"Nel dubbio, lascia selezionato." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5751,6 +5754,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Utilizza operazioni instabili per velocizzare il vertex streaming in OpenGL. " +"Non ci sono problemi conosciuti sulle GPU supportate, ma nelle altre causerà " +"seri problemi grafici e di stabilità.\n" +"\n" +"Nel dubbio, lascia deselezionato." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5776,9 +5784,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "Hack Velocità MMU" +msgstr "Speed Hack VBeam" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5798,7 +5805,7 @@ msgstr "Verboso" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Vertex Streaming Hack" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -6024,7 +6031,7 @@ msgstr "Attività in corso..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Scrivi Memory Card (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6220,16 +6227,15 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "caratteristica sconosciuta %d (ci si aspettava %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Messaggio ricevuto sconosciuto avente id : %d" +msgstr "messaggio sconosciuto ricevuto" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" -msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" +msgstr "wxExecute ritorna -1 all'avvio dell'applicazione!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:43 msgid "zFar Correction: " @@ -6242,109 +6248,3 @@ msgstr "Correzione zNear: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OR" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Emulazione VBeam accurata" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Permettere l'attivazione di alcune impostazioni internamente alla " -#~ "finestra d'emulazione tramite i tasti rapidi 3 (Risoluzione Interna), 4 " -#~ "(Rapporto d'Aspetto), 5 (Copia EFB) e 6 (Nebbia).\n" -#~ "\n" -#~ "Nel dubbio, lascia deselezionato." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "" -#~ "Impossibile trovare il WiiMote sul bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Impossibile impostare i pad. Il giocatore è uscito oppure il gioco è " -#~ "attualmente in esecuzione!\n" -#~ "(l'impostazione dei pads durante l'esecuzione del gioco è una funzione al " -#~ "momento non supportata)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Abilita Tasti di Scelta Rapida" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Solo " -#~ "con motore OpenAL. Potrebbe essere necessario rinominare soft_oal.dll in " -#~ "OpenAL32.dll perché funzioni." - -#~ msgid "Export failed, try again?" -#~ msgstr "Esportazione non riuscita, riprovare?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Fallita operazione di Ascolto!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Caricamento bthprops.cpl non riuscito" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Caricamento hid.dll non riuscito" - -#~ msgid "GCMic Configuration" -#~ msgstr "Configurazione GCMic" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "Chiamata a HCI_CMD_INQUIRY, si prega di segnalarlo!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr " Upload Modificato del Buffer" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Se il framerate risulta incoerente o incostante, questa opzione potrebbe " -#~ "porvi rimedio. (ON = Compatibilità, OFF = Velocità)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importazione non riuscita, riprovare?" - -#~ msgid "In-Game" -#~ msgstr "In-Game" - -#~ msgid "Last Overwritten State" -#~ msgstr "Ultimo Stato di Gioco Sovrascritto" - -#~ msgid "Last Saved State" -#~ msgstr "Ultimo Stato di Gioco Salvato" - -#~ msgid "Local" -#~ msgstr "Locale" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Riconnetti il Wiimote al Caricamento di uno Stato di Gioco" - -#~ msgid "Set" -#~ msgstr "Imposta" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Salta Destination Alpha" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Utilizza una strategia particolare di uploading per il vertex stream.\n" -#~ "Di solito velocizza l'emulazione, ma è vietato dalle specifiche OpenGL e " -#~ "potrebbe causare pesanti artefatti.\n" -#~ "\n" -#~ "Nel dubbio, lascia deselezionato." - -#~ msgid "Wii Save Import" -#~ msgstr "Importa Salvataggi Wii" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index a8a4a22684..17f4bdfe3e 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-16 23:40+0000\n" +"PO-Revision-Date: 2013-09-20 13:38+0000\n" "Last-Translator: DanbSky \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/dolphin-emu/" "language/ja/)\n" @@ -113,9 +113,9 @@ msgid "%s failed to open" msgstr "%s を開くのに失敗" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s を開くのに失敗" +msgstr "%s failed: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -317,9 +317,8 @@ msgid "(off)" msgstr "オフ" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ (...に加えて)" +msgstr "+ (...に加えて)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -408,7 +407,6 @@ msgstr "" "手動でWii リモコンを接続する必要があります。" #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -427,17 +425,17 @@ msgstr "" "~ネットプレイに関しての注意事項~\n" "\n" "現在ネットプレイは以下の設定でしかうまく動作しません。\n" -" - デュアルコア処理 【無効】\n" -" - Audio Throttle 【無効】\n" -" - サウンド出力API を \"No Audio Output\"に設定、または DSP-LLE を使用\n" -" - コントローラの数を正しく設定する。また現在は [標準コントローラ] のみ動作\n" +" - デュアルコア動作を行う 【無効】\n" +" - DSPエミュレータ方式は全てのプレイヤーで統一しておく\n" +" - DSP on Dedicated Thread【無効】\n" +" - フレームリミットは「サウンド」”以外”に設定すること\n" "\n" "全てのプレーヤーはDolphinのバージョンを同一に揃え、設定も統一すること。\n" "メモリーカードは無効にしておくか、参加するプレーヤーに同一のものを前もって配" "布しておく。\n" -"Wii リモコンのサポートは実装されていません。\n" +"Wii リモコンの入力サポートは実装されていません。\n" "\n" -"TCPポートの開放を忘れずに!" +"ホスト側は、TCPポートの開放を忘れずに!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -826,7 +824,7 @@ msgstr "ファイルヘッダの不良" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "バランスWii ボード" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -1233,9 +1231,8 @@ msgstr "接続" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "USBキーボードの接続をエミュレート" +msgstr "バランスWii ボードを接続" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1459,9 +1456,8 @@ msgid "DSP settings" msgstr "サウンドに関する設定を行います" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP on Dedicated Thread" +msgstr "DSPLLE on Separate Thread" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1477,7 +1473,7 @@ msgstr "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "マットコントローラ" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1526,9 +1522,8 @@ msgid "Decompressing ISO" msgstr "復元中..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "ゲームリストを再更新します" +msgstr "フレームリミットを下げる" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1610,7 +1605,7 @@ msgstr "無効化" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Disable Destination Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1646,15 +1641,14 @@ msgstr "" "よく分からなければ、チェックを入れないでください。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"多くのタイトルで画面効果に使用されている、アルファ透過処理をスキップ しま" -"す。\n" +"アルファバッファと呼ばれるハードウェア機能のエミュレーションを 無効化します。" +"多くのゲームでは画面エフェクトのために使われています。\n" "\n" "よく分からなければ、チェックを入れないでください。" @@ -1732,6 +1726,37 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revision: %s\n" +"Compiled: %s @ %s\n" +"\n" +"Dolphin is a Gamecube/Wii emulator, which was\n" +"originally written by F|RES and ector.\n" +"Today Dolphin is an open source project with many\n" +"contributors, too many to list.\n" +"If interested, just go check out the project page at\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Special thanks to Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 and Hotquik for their\n" +"reverse engineering and docs/demos.\n" +"\n" +"Big thanks to Gilles Mouchard whose Microlib PPC\n" +"emulator gave our development a kickstart.\n" +"\n" +"Thanks to Frank Wille for his PowerPC disassembler,\n" +"which or9 and we modified to include Gekko specifics.\n" +"\n" +"Thanks to hcs/destop for their GC ADPCM decoder.\n" +"\n" +"We are not affiliated with Nintendo in any way.\n" +"Gamecube and Wii are trademarks of Nintendo.\n" +"The emulator is for educational purposes only\n" +"and should not be used to play games you do\n" +"not legally own." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1793,13 +1818,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "要求された操作を完了することができませんでした。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"ディスクの読み取り速度を向上させます。必要になるタイトルはわずかです [有効=" -"ロード時間短縮/無効=互換性・安定性重視]" +"GPUのクロックレートを2倍にして動作させます。いくつかのタイトルで速度の向上が" +"狙えます。[有効=動作速度向上/無効=互換性重視]" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1969,7 +1993,7 @@ msgid "" "If unsure, leave this checked." msgstr "" "GPUテクスチャオブジェクトとしてXFBをエミュレートします。\n" -"XFBエミュレーションが必要なタイトルのほとんどを【Real】設定よりも高速に 動作" +"XFBエミュレーションが必要なタイトルのほとんどを 【Real】設定よりも高速に動作" "させることが可能です。 \n" "ただ、Homebrewアプリなどの元々XFBが必要でないゲームは上手く動作 しなくなりま" "す。\n" @@ -2000,7 +2024,7 @@ msgstr "" "立体視表示を有効にします。使用するにはGPUによる Nvidia 3D Vision のサポートが" "必要です。\n" "ほとんどの場合何かしらの問題が発生するでしょう。\n" -"この機能はフルスクリーン表示時のみ動作します。\n" +"この機能は全画面表示時のみ動作します。\n" "\n" "よく分からなければ、チェックを入れないでください。" @@ -2250,12 +2274,11 @@ msgstr "Execute" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Dolphin を終了" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "全てのセーブデータをエクスポート" +msgstr "全てのWiiセーブデータをエクスポート" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2286,7 +2309,6 @@ msgid "Export all saves" msgstr "全てのセーブデータをエクスポート" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" msgstr "エクスポートに失敗" @@ -2407,6 +2429,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"実機リモコンの利用に必要なファイル bthprops.cpl の読み込みに失敗しました。" +"Dolphin を強制終了します" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2414,11 +2438,13 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"実機リモコンの利用に必要なファイル hid.dll の読み込みに失敗しました。Dolphin " +"を強制終了します" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format msgid "Failed to read %s" -msgstr "" +msgstr "Failed to read %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189 msgid "Failed to read banner.bin" @@ -2494,9 +2520,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Failed to write header for file %d" +msgstr "ファイル %d のヘッダ読み込みに失敗" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2511,9 +2537,9 @@ msgid "Failed to write bkhdr" msgstr "Failed to write bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Failed to read data from file: %s" +msgstr "次のファイルへの書き込みに失敗: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2530,7 +2556,7 @@ msgstr "Fast" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Fast Depth Calculation" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2681,7 +2707,7 @@ msgstr "前方" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "ポート開放を自動で設定 (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2689,9 +2715,9 @@ msgid "Found %d results for '" msgstr "検索結果:%d 件 '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "%s をセーブできませんでした" +msgstr " %x 個のセーブデータが見つかりました" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3103,14 +3129,12 @@ msgid "Import Save" msgstr "セーブデータをインポート" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "セーブデータをインポート" +msgstr "Wii セーブデータのインポート" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "エクスポートに失敗" +msgstr "インポートに失敗" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3137,9 +3161,8 @@ msgid "In Game" msgstr "ソコソコ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "フレームリミット:" +msgstr "フレームリミットを上げる" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3230,7 +3253,7 @@ msgid "" "Try loading the state again" msgstr "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" -"もう一度ロードを試してみてください" +"もう一度ステートロードを試してみてください" #: Source/Core/Core/Src/State.cpp:530 msgid "Internal LZO Error - lzo_init() failed" @@ -3373,7 +3396,7 @@ msgstr "GUI言語:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "%iつ前のステートをロード" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3431,58 +3454,48 @@ msgid "Load Custom Textures" msgstr "カスタムテクスチャを読み込む" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "ステートロード(&L)" +msgstr "ステートロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "ステートロード - スロット 1" +msgstr "1つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "ステートロード - スロット 2" +msgstr "2つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "ステートロード - スロット 3" +msgstr "3つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "ステートロード - スロット 4" +msgstr "4つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "ステートロード - スロット 5" +msgstr "5つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "ステートロード - スロット 6" +msgstr "6つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "ステートロード - スロット 7" +msgstr "7つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "ステートロード - スロット 8" +msgstr "8つ前のステートをロード" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "ステートロード - スロット 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "ステートロード - スロット 1" +msgstr "ステートロード - スロット 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3513,9 +3526,8 @@ msgid "Load State Slot 8" msgstr "ステートロード - スロット 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "ステートロード - スロット 1" +msgstr "ステートロード - スロット 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4012,7 +4024,7 @@ msgstr "オンスクリーンメッセージを表示" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "オンラインガイドを表示(&D)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4078,15 +4090,14 @@ msgid "Orange" msgstr "オレンジ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"ディレクトリ内のファイル順序が、ブロックの順序と一致していません\n" -"右クリックから『全てのセーブデータをエクスポート』を実行して、\n" -"新しいメモリーカードにセーブデータを移行してください\n" +"ファイルディレクトリ内のファイル順序が、ブロック順序と一致しません\n" +"右クリックメニューから全てのセーブデータをエクスポートし、\n" +"新しくメモリーカードを作成して、そこへインポートを行ってください\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4145,7 +4156,7 @@ msgstr "パーティション %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "パーティションが存在しません: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4334,7 +4345,7 @@ msgstr "ロシア" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "範囲" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4350,7 +4361,7 @@ msgstr "Real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "実機バランスWii ボードを接続" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4368,9 +4379,8 @@ msgid "Record" msgstr "録画" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "録画オプション" +msgstr "入力を記録" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4457,7 +4467,7 @@ msgstr "Return" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "リビジョン" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4474,12 +4484,10 @@ msgid "Rumble" msgstr "振動" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"DSPの処理を別スレッドに分離して行います (非推奨:音の問題やフリーズ等のリスク" -"有)" +"DSP-LLEの処理を別スレッドに分離して行います (非推奨:フリーズの原因になります)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4504,23 +4512,20 @@ msgid "Save GCI as..." msgstr "セーブデータの保存先を選択" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "ステートセーブ(&V)" +msgstr "最古のステートに上書き保存" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "ステートセーブ(&V)" +msgstr "ステートセーブ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "ステートセーブ - スロット 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "ステートセーブ - スロット 1" +msgstr "ステートセーブ - スロット 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4551,9 +4556,8 @@ msgid "Save State Slot 8" msgstr "ステートセーブ - スロット 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "ステートセーブ - スロット 1" +msgstr "ステートセーブ - スロット 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4713,7 +4717,7 @@ msgid "" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" -"フルスクリーン表示時の解像度を選択します。\n" +"全画面表示時の解像度を選択します。\n" "内部解像度と同じか、それより上の解像度を選択してください。 高解像度であっても" "動作速度にはほとんど影響しません。\n" "\n" @@ -4802,9 +4806,8 @@ msgid "Settings..." msgstr "設定" #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Cant find setting file" +msgstr "SetupWiiMem: Cant create setting file" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4835,9 +4838,8 @@ msgid "Show &Toolbar" msgstr "ツールバー(&T)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "既定" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5200,7 +5202,7 @@ msgstr "セーブファイルのインポートに成功" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "スウェーデン語" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5331,7 +5333,7 @@ msgstr "',' を含む名前は使用できません" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "復号化しましたが、このコードには一つも行が含まれていません。" +msgstr "復号化しましたが、このコードにはひとつも行が含まれていません。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" @@ -5444,6 +5446,10 @@ msgid "" "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" +"指定したFPSの値にゲームスピードを合わせるオプションです。(ノート:NTSCは60、" +"PALは50がフルスピード)【サウンド】を選択するとDSPの処理に沿った速度となり、こ" +"れは一部のゲームでクリックノイズを改善しますが、別のノイズを生み出す可能性が" +"あります。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5484,28 +5490,25 @@ msgid "Toggle All Log Types" msgstr "全てのログ情報を選択/解除" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "アスペクト比:" +msgstr "アスペクト比 設定切替" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Copies" +msgstr "EFB Copies 設定切替" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "全てのログ情報を選択/解除" +msgstr "フォグ処理 設定切替" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" -msgstr "フルスクリーン表示切り替え" +msgstr "全画面表示 切替" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "内部解像度 設定切替" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5596,12 +5599,11 @@ msgstr "未定義 %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229 msgid "Undo Load State" -msgstr "ステートロード前の状態に戻す" +msgstr "直前のステートロードの取消" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "ステートロード前の状態に戻す" +msgstr "直前のステートセーブの取消" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5656,7 +5658,7 @@ msgstr "EuRGB60 (PAL60) モードを使用" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295 msgid "Use Fullscreen" -msgstr "フルスクリーンで表示" +msgstr "全画面で表示" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580 msgid "Use Hex" @@ -5673,6 +5675,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"不正確なアルゴリズムで深度の値を求めるようにします。\n" +"いくつかのタイトルで問題が発生しますが、動作速度の向上が 期待できます。\n" +"\n" +"よく分からなければ、チェックを外さないでください。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5694,6 +5700,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"推奨されない方法でOpenGLの頂点ストリームの処理速度を向上させます。\n" +"サポートされているGPUでは特に問題になりませんが、そうでない場合は このオプ" +"ションは深刻な不具合をもたらします。\n" +"\n" +"よく分からなければ、チェックを入れないでください。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5719,9 +5730,8 @@ msgid "V-Sync" msgstr "垂直同期 (V-Sync)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Speed Hack" +msgstr "VBeam Speed Hack" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5741,7 +5751,7 @@ msgstr "Verbosityモード" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Vertex Streaming Hack" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5943,7 +5953,7 @@ msgstr "動作中..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "メモリーカードへの書込を許可" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6138,12 +6148,11 @@ msgstr " " #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "unknown flavor %d (expected %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "次のIDから不明なメッセージを受信 : %d" +msgstr "unknown message received" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6160,111 +6169,3 @@ msgstr "zNear 補正値:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| (...もしくは)" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Accurate VBeam emulation" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "エミュレーション中に数字キー(テンキーでない方)を押すことで、 一部のオプ" -#~ "ションをリアルタイムに変更できるようになります。\n" -#~ "\n" -#~ "3-内部解像度\n" -#~ "4-アスペクト比\n" -#~ "5-EFB\n" -#~ "6-Fog\n" -#~ "\n" -#~ "よく分からなければ、チェックを入れないでください。" - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "現在パッド設定を行えません。 プレーヤーが残っているかゲームが起動中で" -#~ "す!\n" -#~ "(ゲーム中の設定変更は現在サポートされていません)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "ホットキーを使用" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。" -#~ "OpenALのみ対応。『soft_oal.dll』を『OenAL32.dll』にリネームすることで動作" -#~ "します" - -#~ msgid "Export failed, try again?" -#~ msgstr "エクスポートに失敗しました。リトライしますか?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Listenに失敗!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Failed to load bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Failed to load hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "マイクの設定" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY is called, please report!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Hacked Buffer Upload" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "FPSが安定しないゲームで効果があります [有効=互換性向上/無効=動作速度向" -#~ "上]" - -#~ msgid "Import failed, try again?" -#~ msgstr "インポートに失敗しました。リトライしますか?" - -#~ msgid "In-Game" -#~ msgstr "ゲーム内" - -#~ msgid "Last Overwritten State" -#~ msgstr "最後に上書きしたステートセーブ" - -#~ msgid "Last Saved State" -#~ msgstr "最新のステートセーブ" - -#~ msgid "Local" -#~ msgstr "ローカル" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "ステートロード時にWii リモコンを再接続" - -#~ msgid "Set" -#~ msgstr "適用" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Skip Dest. Alpha Pass" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "頂点ストリームのアップロード方法を工夫し、速度を向上させます。\n" -#~ "ただしOpenGLの仕様から外れているので、大きなバグの 原因になる可能性もあり" -#~ "ます。\n" -#~ "\n" -#~ "よく分からなければ、チェックを入れないでください。" - -#~ msgid "Wii Save Import" -#~ msgstr "Wiiのセーブデータをインポート" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index b21e1d780f..9d786d2dae 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-11 01:47+0000\n" -"Last-Translator: Siegfried \n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" +"Last-Translator: delroth \n" "Language-Team: Korean (http://www.transifex.com/projects/p/dolphin-emu/" "language/ko/)\n" "Language: ko\n" @@ -112,9 +112,9 @@ msgid "%s failed to open" msgstr "%s가 열기에 실패했습니다" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s가 열기에 실패했습니다" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -316,9 +316,8 @@ msgid "(off)" msgstr "(끔)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "+ ADD" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -407,7 +406,6 @@ msgstr "" "위모트를 수동으로 연결해야합니다." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -423,21 +421,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"알림:\n" -"\n" -"넷플레이는 다음 설정들을 사용할 때만이 현재 제대로 작동할 겁니다:\n" -" - 듀얼 코어 [끔]\n" -" - 오디오 병목 [끔]\n" -" - DSP-HLE \"소리 없음\"으로 혹은 DSP-LLE\n" -" - 수동으로 [스텐다드 컨트롤러]에 사용되어질 정확한 컨트롤러들의 수를 설정하" -"세요\n" -"\n" -"모든 플레이어들은 같은 돌핀 버전과 설정들을 사용하도록 시도해야합니다.\n" -"모든 메모리 카드를 끄거나 시작하기전에 그것들을 모든 플레이어들에게 보내세" -"요.\n" -"위모트 지원은 시행되지 않었습니다.\n" -"\n" -"TCP 포트를 호스트에 전달해야합니다!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -826,7 +809,7 @@ msgstr "배드 파일 헤더" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "밸런스 보드" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -1230,9 +1213,8 @@ msgstr "연결" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "USB 키보드 연결" +msgstr "밸런스 보드 연결" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1454,9 +1436,8 @@ msgid "DSP settings" msgstr "DSP 설정" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "전용 쓰레드상에 DSP" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1472,7 +1453,7 @@ msgstr "DVD저수준비암호화읽기 - 치명적 에러: 볼륨에서 읽기 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "댄스 매트" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1521,9 +1502,8 @@ msgid "Decompressing ISO" msgstr "ISO 압축해제하기" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "게임 목록 새로 고침" +msgstr "프레임 제한 감소" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1605,7 +1585,7 @@ msgstr "비활성" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "목적지 알파 비활성" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1640,15 +1620,14 @@ msgstr "" "모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"다양한 그래픽 효과들을 위해 많은 게임들에서 사용되는 \"목표 알파 패스\"를 스" -"킵합니다.\n" +"다양한 그래픽 효과들을 위해 많은 게임들에서 사용되는, 목적지 알파라 불리는 하" +"드웨어 특성의 에뮬레이션을 비활성화합니다.\n" "\n" "모르겠으면, 이것을 언체크로 두세요." @@ -1787,12 +1766,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "돌핀이 요청된 액션을 완수할 수 없었습니다." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"빠른 디스크 엑세스 활성. 일부 게임들에서 요구됨. (켬 = 빠른, 끔 = 호환성)" +"에뮬된 GPU 클럭 속도를 두배로 합니다. 일부 게임들이 빨라질지도 (켬 = 빠름, " +"끔 = 호환성)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2239,12 +2218,11 @@ msgstr "실행" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "나가기" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "모든 저장들을 내보내기" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2275,9 +2253,8 @@ msgid "Export all saves" msgstr "모든 저장들을 내보내기" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "내보내기 실패했습니다" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2396,6 +2373,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"bthprops.cpl 로드에 실패했습니다! 리얼 위모트 연결이 작동하지 않습니다 그래" +"서 돌핀이 갑자기 깨질지도 모릅니다!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2403,6 +2382,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"hid.dll 로드에 실패했습니다! 리얼 위모트 연결이 작동하지 않습니다 그래서 돌핀" +"이 갑자기 깨질지도 모릅니다!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2483,9 +2464,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "%d 파일에 대한 헤더 쓰기에 실패했습니다" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2500,9 +2481,9 @@ msgid "Failed to write bkhdr" msgstr "bkhdr를 쓰기에 실패" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "파일: %s 에서 데이터 읽기에 실패했습니다" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2519,7 +2500,7 @@ msgstr "빠름" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "빠른 깊이 계산" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2667,7 +2648,7 @@ msgstr "앞으로" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "앞 포트(UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2675,9 +2656,9 @@ msgid "Found %d results for '" msgstr "%d 개 찾았습니다 '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "%s 를 저장할 수 없었습니다" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3089,14 +3070,12 @@ msgid "Import Save" msgstr "저장을 가져오기" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "저장을 가져오기" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "내보내기 실패했습니다" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3123,9 +3102,8 @@ msgid "In Game" msgstr "게임안" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "프레임제한:" +msgstr "프레임 제한 증가" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3358,7 +3336,7 @@ msgstr "언어:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "최근 %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3416,58 +3394,48 @@ msgid "Load Custom Textures" msgstr "커스텀 텍스처 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "상태 로드(&L)" +msgstr "상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "슬롯1 상태 로드" +msgstr "최근 1 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "슬롯2 상태 로드" +msgstr "최근 2 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "슬롯3 상태 로드" +msgstr "최근 3 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "슬롯4 상태 로드" +msgstr "최근 4 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "슬롯5 상태 로드" +msgstr "최근 5 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "슬롯6 상태 로드" +msgstr "최근 6 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "슬롯7 상태 로드" +msgstr "최근 7 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "슬롯8 상태 로드" +msgstr "최근 8 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "슬롯1 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "슬롯1 상태 로드" +msgstr "최근 10 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3498,9 +3466,8 @@ msgid "Load State Slot 8" msgstr "슬롯8 상태 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "슬롯1 상태 로드" +msgstr "최근 9 상태 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4066,12 +4033,14 @@ msgid "Orange" msgstr "주황" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" -msgstr "파일 디렉토리안에 파일의 순서가 블럭 순서와 맞지 않습니다\n" +msgstr "" +"파일 디렉토리 안에 파일들 순서가 블럭 순서와 맞지 않습니다\n" +"우클릭하시고 모든 세이브들을 내보네세요,\n" +"그리고 새로운 메모리카드로 세이브들을 가져오세요\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4130,7 +4099,7 @@ msgstr "파티션 %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "파티션이 존재하지 않습니다: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4319,7 +4288,7 @@ msgstr "러시아" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "반지름" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4335,7 +4304,7 @@ msgstr "실제" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "리얼 밸런스 보드" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4353,9 +4322,8 @@ msgid "Record" msgstr "녹화" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "녹화 옵션" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4441,7 +4409,7 @@ msgstr "Enter" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "개정판:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4458,12 +4426,9 @@ msgid "Rumble" msgstr "진동" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"DSP HLE와 LLE를 전용 쓰레드상에서 구동합니다 (권장되지 않습니다: HLE로는 오디" -"오 결함들을 유발하고 LLE로는 얼어버릴지 모릅니다)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4488,23 +4453,20 @@ msgid "Save GCI as..." msgstr "다른 이름으로 GCI 저장..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "상태 저장(&v) " +msgstr "가장 오래된 상태 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "상태 저장(&v) " +msgstr "상태 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "슬롯1 상태 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "슬롯1 상태 저장" +msgstr "슬롯 10 상태 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4535,9 +4497,8 @@ msgid "Save State Slot 8" msgstr "슬롯8 상태 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "슬롯1 상태 저장" +msgstr "슬롯 9 상태 저장" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4786,9 +4747,8 @@ msgid "Settings..." msgstr "설정..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: 설정 파일을 찾을 수 없음" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4819,9 +4779,8 @@ msgid "Show &Toolbar" msgstr "툴바 표시(&T)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "기본" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5181,7 +5140,7 @@ msgstr "세이브 파일들을 성공적으로 가져왔음" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "스웨덴어" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5414,16 +5373,15 @@ msgstr "" "모르겠으면. 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"프레임제한을 게임 풀 스피드 (NTSC:60, PAL:50)보다 더 높게 설정하려면, DSP를 " -"이용해 오디오 병목을 사용하세요 (게임에 따라서는 소리 끊김들을 고칠지 모르지" -"만 또한 지속적인 잡음을 유발할 수도 있습니다)." +"이것은 게임 스피드를 명시된 초당 프레임 수치로 제한합니다 (풀 스피드는 NTSC " +"60 PAL 50 입니다). 대안으로, DSP (오디오 클릭들을 고치나 또한 게임에 따라서" +"는 지속적인 노이즈를 유발할 수 있는)를 이용하는 오디오 병목을 사용합니다." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5465,19 +5423,16 @@ msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "종횡비:" +msgstr "화면 비율 토글" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB 복사" +msgstr "EFB 복사 토글" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "모든 로그 타입 토글" +msgstr "안개 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5486,7 +5441,7 @@ msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "IR 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5580,9 +5535,8 @@ msgid "Undo Load State" msgstr "상태 로드 되돌림" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "상태 로드 되돌림" +msgstr "상태 저장 풀기" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5655,6 +5609,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"깊이 값들을 계산하기 위해 덜 적확한 알고리즘을 사용합니다.\n" +"소수 게임들에서 이슈들을 유발하지만 괜찮은 속도증가를 줄것입니다.\n" +"\n" +"모르겠으면, 이것을 체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5700,9 +5658,8 @@ msgid "V-Sync" msgstr "수직-동기화" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU 스피드 핵" +msgstr "VBeam 스피드 핵" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5722,7 +5679,7 @@ msgstr "상세설명" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "버텍스 스트리밍 핵" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5943,7 +5900,7 @@ msgstr "작동중..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "메모리카드를 기록합니다 (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6140,9 +6097,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "id : %d의 알려지지 않은 메시지를 받었다" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6159,105 +6115,3 @@ msgstr "z근거리 정정:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OR" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "정확한 VBeam 에뮬레이션" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "에뮬레이션 창안에서 3(내부 해상도), 4(종횡비), 5(EFB 복사), 6(안개) 핫키들" -#~ "을 통해 특정 옵션들 토글을 허용합니다.\\n\n" -#~ "\\n\n" -#~ "모르겠으면, 이것을 언체크로 두세요." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x 에 의해 위모트를 찾을 수 없음" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "패드들을 설정할 수 없었습니다. 플레이어가 떠났거나 게임이 현재 구동중!\n" -#~ "(게임이 구동중일 때 패드들을 설정하기는 아직 지원되지 않습니다)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "단축키 활성(그래픽 컨트롤)" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OpenAL 백엔" -#~ "드 전용. 작동시키려면 soft_oal.dll 을 OpenAL32.dll 로 이름바꾸기가 필요할 " -#~ "지도." - -#~ msgid "Export failed, try again?" -#~ msgstr "내보내기 실패했습니다, 다시 시도?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "듣기에 실패했습니다!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "bthprops.cpl 로드에 실패했습니다." - -#~ msgid "Failed to load hid.dll" -#~ msgstr "hid.dll 로드에 실패했습니다" - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic 환경설정" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY가 호출됨, 보고해주세요!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "핵 버퍼 업로드" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "FPS가 불규칙적이면, 이 옵션이 도움이 될 수도 있습니다. (켬 = 호환성, 끔 = " -#~ "빠름)" - -#~ msgid "Import failed, try again?" -#~ msgstr "가져오기 실패했습니다, 재시도?" - -#~ msgid "In-Game" -#~ msgstr "게임-안" - -#~ msgid "Last Overwritten State" -#~ msgstr "마지막 덮어써진 상태" - -#~ msgid "Last Saved State" -#~ msgstr "마지막 저장된 상태" - -#~ msgid "Local" -#~ msgstr "지역" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "상태 로딩시 위모트 재연결" - -#~ msgid "Set" -#~ msgstr "설정" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "목적지. 알파 패스 스킵" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "버텍스들을 스트림하기 위해 핵 업로드를 사용합니다.\n" -#~ "이것은 보통 스피드가 올라갑니다, 하지만 OpenGL 사양에 의해 금지되고 엄청" -#~ "난 결함들을 유발할지도 모릅니다.\n" -#~ "\n" -#~ "모르겠으면, 이것을 언체크로 두세요." - -#~ msgid "Wii Save Import" -#~ msgstr "Wii 저장 가져오기" diff --git a/Languages/po/nb.po b/Languages/po/nb.po index 255ed1103c..23ae8fcade 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -3,14 +3,16 @@ # This file is distributed under the same license as the dolphin-emu package. # # Translators: +# chriztr , 2013 # KHRZ , 2013 -# Knut , 2011 +# KHRZ , 2011,2013 +# KHRZ , 2011 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-18 22:56-0500\n" +"PO-Revision-Date: 2013-09-17 20:01+0000\n" "Last-Translator: KHRZ \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/dolphin-" "emu/language/nb/)\n" @@ -22,7 +24,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516 msgid " (too many to display)" -msgstr "(for mange til til å vises)" +msgstr "(for mange å vise)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:291 #: Source/Core/DolphinWX/Src/NetWindow.cpp:521 @@ -112,9 +114,9 @@ msgid "%s failed to open" msgstr "%s kunne ikke åpne" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s kunne ikke åpne" +msgstr "%s mislyktes: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -165,11 +167,11 @@ msgstr "&Start fra DVD-stasjon..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Breakpoints" -msgstr "&Breakpoints" +msgstr "&Brytepunkter" #: Source/Core/DolphinWX/Src/FrameTools.cpp:111 msgid "&Browse for ISOs..." -msgstr "&Bla etter ISO-filer..." +msgstr "&Søk etter ISO-filer..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" @@ -185,7 +187,7 @@ msgstr "&Slett ISO..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900 msgid "&Delete selected ISOs..." -msgstr "&Slett valgte ISO-filer..." +msgstr "&Slett merkede ISO-filer..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:172 msgid "&Emulation" @@ -197,7 +199,7 @@ msgstr "&Fil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Frame Advance" -msgstr "&Bilde Forover" +msgstr "&Bilde for bilde" #: Source/Core/DolphinWX/Src/FrameTools.cpp:360 msgid "&Fullscreen" @@ -205,7 +207,7 @@ msgstr "&Fullskjerm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "&Graphics Settings" -msgstr "&Konfigurer Grafikk" +msgstr "&Grafikkinstllinger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" @@ -213,7 +215,7 @@ msgstr "&Hjelp" #: Source/Core/DolphinWX/Src/FrameTools.cpp:182 msgid "&Hotkey Settings" -msgstr "Innstillinger for &Hot-tast" +msgstr "Innstillinger for &hurtigtaster" #: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" @@ -221,7 +223,7 @@ msgstr "&JIT" #: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "&Load State" -msgstr "Last &inn Save State" +msgstr "Åpne hurtiglagring" #: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Memcard Manager (GC)" @@ -253,7 +255,7 @@ msgstr "&Egenskaper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" -msgstr "Les-kun &modus" +msgstr "Skrivebeskyttet-&modus" #: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" @@ -289,7 +291,7 @@ msgstr "Vi&s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:181 msgid "&Wiimote Settings" -msgstr "Innstillinger for &Wiimote" +msgstr "Innstillinger for &Wiikontroller" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862 msgid "&Wiki" @@ -316,9 +318,8 @@ msgid "(off)" msgstr "(av)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ LEGG TIL" +msgstr "+ LEGG TIL" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -326,7 +327,7 @@ msgstr "0x44" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1.5x Native (960x792)" -msgstr "1.5x Innfødt (960x792)" +msgstr "1.5x Opprinnelig størrelse (960x792)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148 msgid "16 bit" @@ -334,15 +335,15 @@ msgstr "16-bit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1x Native (640x528)" -msgstr "1x Innfødt (640x528)" +msgstr "1x Opprinnelig størrelse (640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "2.5x Native (1600x1320)" -msgstr "2.5x Innfødt (1600x1320)" +msgstr "2.5x Opprinnelig størrelse (1600x1320)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "2x Native (1280x1056)" -msgstr "2x Innfødt (1280x1056)" +msgstr "2x Opprinnelig størrelse (1280x1056)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149 msgid "32 bit" @@ -354,11 +355,11 @@ msgstr "3D Vision" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "3x Native (1920x1584)" -msgstr "3x Innfødt (1920x1584)" +msgstr "3x Opprinnelig størrelse (1920x1584)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "4x Native (2560x2112)" -msgstr "4x Innfødt (2560x2112)" +msgstr "4x Opprinnelig størrelse (2560x2112)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147 msgid "8 bit" @@ -378,7 +379,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150 msgid "" -msgstr "" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" @@ -407,7 +408,6 @@ msgstr "" " Du må manuelt koble til dine WiiMote-er." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -425,20 +425,30 @@ msgid "" msgstr "" "ADVARSEL:\n" "\n" -"NetPlay vil kun fungere ordentlig under følgende innstillinger:\n" -" - Dobbelkjerne [AV]\n" -" - Audio Throttle [AV]\n" -" - DSP-HLE med \"Null Audio\" eller DSP-LLE\n" -" - Antall brukte kontrollere som brukes må manuelt settes til [Standard " -"Controller]\n" "\n" -"Alle spillere bør bruke samme versjon av Dolphin og de samme " -"innstillingene.\n" -"Enten skru av bruk av minnekort, eller send nøyaktig kopi til alle " -"spillere.\n" -"Det er foreløpig ingen støtte for Wiimote-er.\n" "\n" -"Du må fremme TCP-porten til verten!!" +"Netplay vil kun fungere under følgende innstillinger:\n" +"\n" +"- Tillat Dobbelkjerne [AV]\n" +"\n" +"- DSP emulator motor må være det samme på alle datamaskiner!\n" +"\n" +"- DSP på Dedikert CPU-tråd [AV]\n" +"\n" +"- Bilde-pr-sekund-begrensning: IKKE satt til [Audio]\n" +"\n" +"\n" +"\n" +"Alle spillere bør bruke den samme Dolphin-versjonen og innstillinger.\n" +"\n" +"Alle minnekort må være identiske mellom spillerne, eller deaktivert.\n" +"\n" +"Wiimote-støtte har enda ikke blitt implementert!\n" +"\n" +"\n" +"\n" +"Hosten må ha valgt TCP-port åpen/forwarded!\n" +"\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -647,7 +657,7 @@ msgstr "Avansert" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:567 msgid "Advanced Settings" -msgstr "Avanserte Innstillinger" +msgstr "Avanserte innstillinger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" @@ -664,7 +674,7 @@ msgstr "Alle GameCube GCM-filer (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" -msgstr "Alle Save States (sav, s##)" +msgstr "Alle hurtiglagringene (sav, s##)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" @@ -688,7 +698,7 @@ msgstr "Vinkel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376 msgid "Anisotropic Filtering:" -msgstr "Anisotropisk Filtrering:" +msgstr "Anisotropisk filtrering:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359 msgid "Anti-Aliasing:" @@ -796,7 +806,7 @@ msgid "" msgstr "" "Justerer automatisk vindusstørrelsen til din interne oppløsning.\n" "\n" -"Hvis usikker, la stå avslått." +"Hvis usikker, la stå deaktivert." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705 msgid "B" @@ -834,7 +844,7 @@ msgstr "Dårlig Fil-header" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balansebrett" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -901,7 +911,7 @@ msgstr "Ødelagt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse" -msgstr "Bla i" +msgstr "Bla etter" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" @@ -1240,9 +1250,8 @@ msgstr "Koble til" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Koble til USB-tastatur" +msgstr "Koble til balansebrett" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1251,23 +1260,23 @@ msgstr "Koble til USB-tastatur" #: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" -msgstr "Koble til Wiimote %i" +msgstr "Koble til Wiikontroller %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 msgid "Connect Wiimote 1" -msgstr "Koble til Wiimote 1" +msgstr "Koble til Wiikontroller 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 msgid "Connect Wiimote 2" -msgstr "Koble til Wiimote 2" +msgstr "Koble til Wiikontroller 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 msgid "Connect Wiimote 3" -msgstr "Koble til Wiimote 3" +msgstr "Koble til Wiikontroller 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 msgid "Connect Wiimote 4" -msgstr "Koble til Wiimote 4" +msgstr "Koble til Wiikontroller 4" #: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." @@ -1296,7 +1305,7 @@ msgstr "Kopi feilet" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 #, c-format msgid "Copy to Memcard %c" -msgstr "Kopier til Minnekort %c" +msgstr "Kopier til minnekort %c" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:367 msgid "Core" @@ -1423,15 +1432,15 @@ msgstr "Nåværende mappe endret fra %s til %s etter wxFileSelector!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" -msgstr "Selvdefinert Projeksjons-hack" +msgstr "Selvdefinert projeksjons-hack" #: Source/Core/DolphinWX/Src/PHackSettings.h:17 msgid "Custom Projection Hack Settings" -msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" +msgstr "Innstillinger for selvdefinerte projeksjons-hack" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." -msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." +msgstr "Selvdefiner noen ortografisk projeksjons-parametere." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" @@ -1471,9 +1480,8 @@ msgid "DSP settings" msgstr "Innstillinger for DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP på Dedikert Tråd" +msgstr "DSPLLE på Separat Tråd" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1489,7 +1497,7 @@ msgstr "DVDLowUnencryptedRead - Fatal Feil: Mislyktes i å lese fra volum" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Dansematte" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1538,9 +1546,8 @@ msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Oppdater spilliste" +msgstr "Reduser bilder i sekundet begrensning" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1561,7 +1568,7 @@ msgstr "Slett" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:790 msgid "Delete Save" -msgstr "Slett Lagringsfil" +msgstr "Slett lagringsfil" #: Source/Core/VideoCommon/Src/AVIDump.cpp:64 #, c-format @@ -1593,7 +1600,7 @@ msgstr "Device" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:737 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:791 msgid "Device Settings" -msgstr "Innstillinger for device" +msgstr "Innstillinger for enhet" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49 msgid "Dial" @@ -1622,7 +1629,7 @@ msgstr "Deaktiver" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Deaktiver Destinasjon Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1659,17 +1666,16 @@ msgstr "" "Hvis usikker, la stå avslått." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Dropper destinasjon alpha pass, brukt i mange spill for diverse grafiske " -"effekter.\n" +"Deaktiverer emulasjonen for maskinvarefunksjonen som kalles \"destinasjon " +"alpha\" som er brukt i mange spill for forskjellige grafiske effekter.\n" "\n" -"Hvis usikker, la stå avslått." +"Hvis du er usikker så la denne være urørt!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1745,23 +1751,84 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"\n" +"Copyright(c) 2003-2013+ Dolphin Team\n" +"\n" +"\n" +"\n" +"Branch: %s\n" +"\n" +"Revisjon: %s\n" +"\n" +"Kompilert: %s @ %s\n" +"\n" +"\n" +"\n" +"Dolphin er en GameCube/Wii emulator, som ble\n" +"\n" +"opprinnelig skrevet av F|RES og ector.\n" +"\n" +"Idag er Dolphin et åpent-kildekode prosjekt med mange\n" +"\n" +"bidragsytere, for mange til å oppramses.\n" +"\n" +"Om interessert, gå til prosjektsiden ved\n" +"\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"\n" +"\n" +"Spesiell takk til Bushing, Costis, CrowTRobo,\n" +"\n" +"Marcan, Segjer, Titanik, or9 og Hotquik for deres\n" +"\n" +"reverse engineering og dokumentasjon/demoer.\n" +"\n" +"\n" +"\n" +"Stor takk til Gilles Mouchard hvorav hans Microlib PPC-\n" +"\n" +"emulator ga vår utvikling en kjappstart.\n" +"\n" +"\n" +"\n" +"Takk til Frank Wille for hans PowerPC disassembler,\n" +"\n" +"som or9 og vi modifiserte til å innkludere Gekko spesifiker.\n" +"\n" +"\n" +"\n" +"Takk til hcs/destop for deres GC ADPCM-dekoder.\n" +"\n" +"\n" +"\n" +"Vi er ikke affiliert med Nintendo på noen måte.\n" +"\n" +"GameCube og Wii er varemerker av Nintendo.\n" +"\n" +"Emulatoren er kun for utdanningshensikt,\n" +"\n" +"og må ikke brukes til å spille spill du ikke\n" +"\n" +"lovlig eier." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" -msgstr "Dolphin %s Grafikkinstillinger" +msgstr "Dolphin %s Grafikkinnstillinger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" -msgstr "Dolphin &Webside" +msgstr "Dolphins &nettside" #: Source/Core/DolphinWX/Src/ConfigMain.h:24 msgid "Dolphin Configuration" -msgstr "Konfigurer Dolphin" +msgstr "Konfigurer dolphin" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197 msgid "Dolphin Emulated Wiimote Configuration" -msgstr "Dolphin Emulert Wiimote Konfigurasjon" +msgstr "Dolphin emulert Wiikontroller konfigurasjon" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382 msgid "Dolphin FIFO" @@ -1806,13 +1873,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin kunne ikke fullføre den forespurte handligen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Aktiver rask disktilgang. Trengs for noen få spill. (PÅ = Raskt, AV = " -"Kompitabelt)" +"Dobler den emulerte klokkehastigheten for GPU'en. Dette kan øke hastigheten " +"i noen spill (PÅ = Kjapp, AV = Kompatiblitet)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1914,7 +1980,7 @@ msgstr "EUROPA" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "Early Memory Updates" -msgstr "Tidlige Minneoppdateringer" +msgstr "Tidlige minneoppdateringer" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" @@ -1926,15 +1992,15 @@ msgstr "Endre ActionReplay-kode" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:286 msgid "Edit Config" -msgstr "Endre Konfigurasjon" +msgstr "Endre konfigurasjon" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Endre Lokale Overkjøringer" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" -msgstr "Endre Patch" +msgstr "Endre patch" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" @@ -1989,7 +2055,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Emulated Wiimote" -msgstr "Emulert Wiimote" +msgstr "Emulert Wiikontroller" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " @@ -2033,15 +2099,15 @@ msgstr "Aktiver cache" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" -msgstr "Aktiver Juksekoder" +msgstr "Aktiver juksekoder" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" -msgstr "Aktiver Dobbelkjerne" +msgstr "Aktiver bruk av dobbelkjerne" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" -msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" +msgstr "Aktiver bruk av dobbelkjerne (for bedre ytelse)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" @@ -2057,23 +2123,23 @@ msgstr "Aktiver MMU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" -msgstr "Aktiver Progressiv Skanning" +msgstr "Aktiver progressiv skanning" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" -msgstr "Aktiver Skjermsparer" +msgstr "Aktiver skjermbeskytter" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Enable Speaker Data" -msgstr "Tillat Høytaler Data" +msgstr "Tillat høytaler data" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" -msgstr "Aktiver Widescreen" +msgstr "Aktiver widescreen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" -msgstr "Aktiver WireFrame" +msgstr "Aktiver wireframe" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" @@ -2263,12 +2329,11 @@ msgstr "Kjør" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Avslutt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Eksporter alle lagringsfiler" +msgstr "Eksporter alle Wii-lagringsfiler" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2276,19 +2341,19 @@ msgstr "Eksportering mislyktes" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:661 msgid "Export File" -msgstr "Eksporter Fil" +msgstr "Eksporter fil" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 msgid "Export Recording" -msgstr "Eksporter Opptak" +msgstr "Eksporter opptak" #: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Export Recording..." -msgstr "Eksporter Opptak..." +msgstr "Eksporter opptak..." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:792 msgid "Export Save" -msgstr "Eksporter Lagringsfil" +msgstr "Eksporter lagringsfil" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868 msgid "Export Wii save (Experimental)" @@ -2299,7 +2364,6 @@ msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" msgstr "Eksportering mislyktes" @@ -2313,23 +2377,23 @@ msgstr "Utvidelse" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "External Frame Buffer" -msgstr "Ekstern Bildebuffer (EFB)" +msgstr "Ekstern bildebuffer (EFB)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:48 msgid "Extra Parameter" -msgstr "Ekstra Parameter" +msgstr "Ekstra parameter" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "Ekstra Parameter nyttig kun i ''Metroid: Other M\"." +msgstr "Ekstra parameter nyttig kun i ''Metroid: Other M\"." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract All Files..." -msgstr "Ekstraher Alle Filer..." +msgstr "Ekstraher alle filer..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." -msgstr "Ekstraher Applikasjonslaster..." +msgstr "Ekstraher applikasjonslaster..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." @@ -2337,15 +2401,15 @@ msgstr "Ekstraher DOL..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract Directory..." -msgstr "Ekstraher Mappe..." +msgstr "Ekstraher mappe..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract File..." -msgstr "Ekstraher Fil..." +msgstr "Ekstraher fil..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Partition..." -msgstr "Ekstraher Partisjon..." +msgstr "Ekstraher partisjon..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:750 #, c-format @@ -2354,11 +2418,11 @@ msgstr "Ekstraherer %s" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" -msgstr "Ekstraherer Alle Filer" +msgstr "Ekstraherer alle filer" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" -msgstr "Ekstraherer Mappe" +msgstr "Ekstraherer mappe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." @@ -2382,7 +2446,7 @@ msgstr "FST-størrelse:" #: Source/Core/Core/Src/NetPlayClient.cpp:127 msgid "Failed to Connect!" -msgstr "Tilkobling Mislyktes!" +msgstr "Tilkobling mislyktes!" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "Failed to download codes." @@ -2420,6 +2484,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Mislyktes å laste inn bthprops.cpl! Å koble til ekte Wii-kontrollere vil " +"ikke fungere og Dolphin kan kræsje tilfeldig!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2427,6 +2493,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Mislyktes å laste inn hid.dll! Å koble til ekte Wii-kontrollere vil ikke " +"fungere og Dolphin kan kræsje tilfeldig!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2503,13 +2571,13 @@ msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -"kunne ikke lese headeren korrekt\n" +"Kunne ikke lese headeren korrekt\n" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Kunne ikke skrive header for filen %d" +msgstr "Kunne ikke lese header for fil %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2524,9 +2592,9 @@ msgid "Failed to write bkhdr" msgstr "Kunne ikke skrive bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Kunne ikke lese data fra fil: %s" +msgstr "Kunne ikke skrive data til fil: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2543,7 +2611,7 @@ msgstr "Rask" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Kjapp dyp kalkulasjon" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2621,11 +2689,11 @@ msgstr "Finn forrige" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 msgid "First Block" -msgstr "Første Blokk" +msgstr "Første blokk" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Fix Checksums" -msgstr "Fiks Sjekksummer" +msgstr "Fiks sjekksummer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Force 16:9" @@ -2637,11 +2705,11 @@ msgstr "Tving 4:3" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" -msgstr "Tving Konsoll til NTSC-J" +msgstr "Tving konsoll til NTSC-J" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407 msgid "Force Texture Filtering" -msgstr "Tving Teksturfiltrering" +msgstr "Tving teksturfiltrering" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" @@ -2692,7 +2760,7 @@ msgstr "Send frem" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Forward port (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2700,9 +2768,9 @@ msgid "Found %d results for '" msgstr "Fant %d resultater for '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Kunne ikke lagre %s" +msgstr "Fant %x lagringsfiler" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2715,7 +2783,7 @@ msgstr "Stillbilde" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 msgid "Frame Advance" -msgstr "Bilde-for-bilde Modus" +msgstr "Bilde-for-bilde modus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Frame Dumps use FFV1" @@ -2739,11 +2807,11 @@ msgstr "Framelimit:" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 msgid "Frames To Record" -msgstr "Bilder Til Opptak" +msgstr "Bilder til opptak:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Free Look" -msgstr "Fri Utkikk" +msgstr "Fri utkikk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2762,7 +2830,7 @@ msgstr "Fra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 msgid "FullScr" -msgstr "FullSkj" +msgstr "Fullskjerm" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 msgid "Fullscreen resolution:" @@ -2802,7 +2870,7 @@ msgstr "Spill-spesifikke Innstillinger" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" -msgstr "SpillKonfigurasjon" +msgstr "Spillkonfigurasjon" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:515 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" @@ -2851,7 +2919,7 @@ msgstr "Generelt" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153 msgid "General Settings" -msgstr "Generelle Innstillinger" +msgstr "Generelle innstillinger" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2870,11 +2938,11 @@ msgstr "Grafikk" #: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics settings" -msgstr "Innstillinger for Grafikk" +msgstr "Innstillinger for grafikk" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Greater Than" -msgstr "Større Enn" +msgstr "Større enn" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" @@ -2904,11 +2972,11 @@ msgstr "Grønn" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28 msgid "Green Left" -msgstr "Grønn Venstre" +msgstr "Grønn venstre" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29 msgid "Green Right" -msgstr "Grønn Høyre" +msgstr "Grønn høyre" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39 msgid "Guitar" @@ -2983,7 +3051,7 @@ msgstr "Gjem" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308 msgid "Hide Mouse Cursor" -msgstr "Gjem Musepeker" +msgstr "Gjem musepeker" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -3006,12 +3074,12 @@ msgstr "Vert" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:31 msgid "Hotkey Configuration" -msgstr "Konfigurer Snarveistaster" +msgstr "Konfigurer hurtigtaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" -msgstr "Snarveistaster" +msgstr "Hurtigtaster" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" @@ -3019,7 +3087,7 @@ msgstr "Ungarsk" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Hybrid Wiimote" -msgstr "Hybrid Wiimote" +msgstr "Hybrid Wiikontroller" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format @@ -3087,7 +3155,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Ignore Format Changes" -msgstr "Ignorer Formatendringer" +msgstr "Ignorer formatendringer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" @@ -3119,17 +3187,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:791 msgid "Import Save" -msgstr "Importer Lagringsfil" +msgstr "Importer lagringsfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importer Lagringsfil" +msgstr "Importer Wii-lagringsfil" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Eksportering mislyktes" +msgstr "Importering mislyktes" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3156,9 +3222,8 @@ msgid "In Game" msgstr "I spillet" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Framelimit:" +msgstr "Øke bilder i sekundet begrensning" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3175,11 +3240,11 @@ msgstr "Inndata" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Insert" -msgstr "Sett Inn" +msgstr "Sett inn" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166 msgid "Insert Encrypted or Decrypted code here..." -msgstr "Sett Inn Kryptert eller Dekryptert kode her..." +msgstr "Sett inn Kryptert eller Dekryptert kode her..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" @@ -3255,7 +3320,7 @@ msgstr "Intern LZO-feil - lzo_init() mislyktes" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353 msgid "Internal Resolution:" -msgstr "Intern Oppløsning:" +msgstr "Intern bildeoppløsning:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" @@ -3316,7 +3381,7 @@ msgstr "Ugyldig søkestring (bare strenger av partallslengde støttes)" #: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" -msgstr "Ugyldig save state" +msgstr "Ugyldig hurtiglagring" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3353,7 +3418,7 @@ msgid "" msgstr "" "Hold spillvinduet på toppen av alle andre vinduer.\n" " \n" -" Hvis usikker, la stå uaktivert." +" Hvis usikker, la stå deaktivert." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 msgid "Keep window on top" @@ -3389,7 +3454,7 @@ msgstr "Språk:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Siste %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3432,7 +3497,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 msgid "Less Than" -msgstr "Mindre Enn" +msgstr "Mindre enn" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" @@ -3444,98 +3509,87 @@ msgstr "Last inn" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Load Custom Textures" -msgstr "Last inn Kustomiserte Teksturer" +msgstr "Last inn brukerlagde teksturer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "Last &inn Save State" +msgstr "Last inn hurtiglagring" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Last Inn Save State Slot 1" +msgstr "Last inn hurtiglagring siste 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Last Inn Save State Slot 2" +msgstr "Last inn hurtiglagring siste 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Last Inn Save State Slot 3" +msgstr "Last inn hurtiglagring siste 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Last Inn Save State Slot 4" +msgstr "Last inn hurtiglagring siste 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Last Inn Save State Slot 5" +msgstr "Last inn hurtiglagring siste 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Last Inn Save State Slot 6" +msgstr "Last inn hurtiglagring siste 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Last Inn Save State Slot 7" +msgstr "Last inn hurtiglagring siste 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Last Inn Save State Slot 8" +msgstr "Last inn hurtiglagring siste 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" -msgstr "Last Inn Save State Slot 1" +msgstr "Åpne hurtiglagringsplass nr. 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Last Inn Save State Slot 1" +msgstr "Last inn hurtiglagring siste 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" -msgstr "Last Inn Save State Slot 2" +msgstr "Åpne hurtiglagringsplass nr. 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 msgid "Load State Slot 3" -msgstr "Last Inn Save State Slot 3" +msgstr "Åpne hurtiglagringsplass nr. 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 msgid "Load State Slot 4" -msgstr "Last Inn Save State Slot 4" +msgstr "Åpne hurtiglagringsplass nr. 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 msgid "Load State Slot 5" -msgstr "Last Inn Save State Slot 5" +msgstr "Åpne hurtiglagringsplass nr. 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 msgid "Load State Slot 6" -msgstr "Last Inn Save State Slot 6" +msgstr "Åpne hurtiglagringsplass nr. 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 msgid "Load State Slot 7" -msgstr "Last Inn Save State Slot 7" +msgstr "Åpne hurtiglagringsplass nr. 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 msgid "Load State Slot 8" -msgstr "Last Inn Save State Slot 8" +msgstr "Åpne hurtiglagringsplass nr. 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Last Inn Save State Slot 1" +msgstr "Last inn hurtiglagring siste 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." -msgstr "Last Inn Save State..." +msgstr "Åpne hurtiglagring..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" @@ -3552,13 +3606,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Laster inn kustomiserte teksturer fra mappen User/Load/Textures//\n" +"Laster inn brukerlagde teksturer fra mappen User/Load/Textures//\n" "\n" "Hvis usikker, la stå avslått." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:37 msgid "Load preset values from hack patterns available." -msgstr "Last in pre-satte verdier fra tilgjengelige hack-mønstre." +msgstr "Last in forhåndsvalgte verdier fra tilgjengelige hack-mønstre." #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" @@ -3566,7 +3620,7 @@ msgstr "Logg" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13 msgid "Log Configuration" -msgstr "Konfigurer Logg" +msgstr "Logg-innstillinger" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Log FPS to file" @@ -3644,7 +3698,7 @@ msgid "" msgstr "" "Gjør objekter langt unna mer synlige ved å fjerne tåke, slik at det " "generelle detaljenivået øker.\n" -" Å deaktivere tåke vil ødelegge noen spill som avhenger av skikkelig " +"Å deaktivere tåke vil ødelegge noen spill som avhenger av skikkelig " "tåkeemulering.\n" " \n" " Hvis usikker, la stå deaktivert." @@ -3733,10 +3787,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Modifiser teksturer til å vise formatet de er enkodet i. Krever vanligvis en " -"emulasjonsreset.\n" +"Modifiser teksturer til å vise formatet de er kodet i. Krever vanligvis en " +"restart av pågående emulasjon..\n" "\n" -"Hvis usikker, la stå avslått." +"Hvis usikker, la stå deaktivert." #: Source/Core/DolphinWX/Src/LogWindow.cpp:108 msgid "Monospaced font" @@ -3795,7 +3849,7 @@ msgstr "NP Desimal" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:113 msgid "NP Delete" -msgstr "NP Slett" +msgstr "NP Delete" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:120 msgid "NP Divide" @@ -3807,7 +3861,7 @@ msgstr "NP Ned" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:110 msgid "NP End" -msgstr "NP Slutt" +msgstr "NP End" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:98 msgid "NP Enter" @@ -3847,7 +3901,7 @@ msgstr "NP Høyre" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:117 msgid "NP Separator" -msgstr "NP Separatør" +msgstr "NP Mellomrom" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:96 msgid "NP Space" @@ -3855,7 +3909,7 @@ msgstr "NP Mellomrom" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:118 msgid "NP Subtract" -msgstr "NP Trekk Fra" +msgstr "NP Minus" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:97 msgid "NP Tab" @@ -3910,7 +3964,7 @@ msgstr "Ingen ISO- eller WAD-filer funnet" #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "Ingen audio-output" +msgstr "Ingen lydutgang" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format @@ -3957,12 +4011,12 @@ msgstr "Norsk Bokmål" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193 msgid "Not Equal" -msgstr "Ikke Lik" +msgstr "Ikke lik" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797 msgid "Not Set" -msgstr "Ikke Satt" +msgstr "Ikke satt" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format @@ -4029,7 +4083,7 @@ msgstr "On-Screen Meldinger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "Online & Dokumentasjon" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4056,16 +4110,16 @@ msgstr "Åpne fil..." #: Source/Core/AudioCommon/Src/OpenALStream.cpp:48 #, c-format msgid "OpenAL: can't create context for device %s" -msgstr "OpenAL: Kan ikke lage kontekst for device %s" +msgstr "OpenAL: Kan ikke lage forbindelse med enheten %s" #: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 msgid "OpenAL: can't find sound devices" -msgstr "OpenAL: Kan ikke finne lyd-device" +msgstr "OpenAL: Kan ikke finne lydenhet" #: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 #, c-format msgid "OpenAL: can't open device %s" -msgstr "OpenAL: Kan ikke åpne device %s" +msgstr "OpenAL: Kan ikke åpne enhet %s" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "OpenCL Texture Decoder" @@ -4080,10 +4134,12 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Åpner standard (read-only) konfigurasjon for dette spillet i en ekstern " +"teksteditor." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." -msgstr "" +msgstr "Åpner de valgte overkjøringene i en ekstern teksteditor." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4095,15 +4151,15 @@ msgid "Orange" msgstr "Oransje" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"Rekkefølgen av filer if Filmappen matcher ikke blokkrekkefølgen\n" -"Høyreklikk og eksporter all lagringsfilene,\n" -"og importer lagringsfilene til et nytt minnekort\n" +"Rekkefølgen med filer i minnekortet stemmer ikke overrens med block-" +"rekkefølgen\n" +"Høyreklikk og eksporter alt du har lagret,\n" +"og importer dette inn på et nytt minnekort\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4115,7 +4171,7 @@ msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." msgstr "" -"Den andre klienten koblet fra mens spillet kjører! NetPlay er frakoblet. Du " +"Den andre klienten koblet fra mens spillet kjøret! NetPlay er frakoblet. Du " "må stoppe spillet manuelt." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528 @@ -4124,7 +4180,7 @@ msgstr "Utdata" #: Source/Core/DolphinWX/Src/FrameTools.cpp:350 msgid "P&lay Recording..." -msgstr "Spi&llopptak..." +msgstr "Spi&ll av opptak..." #: Source/Core/Core/Src/HW/GCPad.cpp:18 msgid "Pad" @@ -4162,7 +4218,7 @@ msgstr "Partisjon %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Partisjonen finnes ikke: &lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4204,7 +4260,7 @@ msgstr "Spill" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 msgid "Play Recording" -msgstr "Spill Opptak" +msgstr "Spill av opptak" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170 msgid "Play/Pause" @@ -4279,7 +4335,7 @@ msgstr "Prematur filmslutt i PlayController. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "Prematur filmslutt i PlayWiiote. %u + %d > %u" +msgstr "Prematur filmslutt i PlayWiimote. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:1028 #, c-format @@ -4288,19 +4344,19 @@ msgstr "Prematur filmslutt i PlayWiimote. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:35 msgid "Presets: " -msgstr "Forhåndssatte:" +msgstr "Forhåndsinnstillinger:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:192 msgid "Prev Page" -msgstr "Forrige Side" +msgstr "Forrige side" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Previous Page" -msgstr "Forrige Side" +msgstr "Forrige side" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "Previous Value" -msgstr "Forrige Verdi" +msgstr "Forrige verdi" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Print" @@ -4316,7 +4372,7 @@ msgstr "Egenskaper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Purge Cache" -msgstr "Tøm Cache" +msgstr "Tøm hurtigbuffer" #: Source/Core/Common/Src/MsgHandler.cpp:52 msgid "Question" @@ -4351,7 +4407,7 @@ msgstr "RUSSLAND" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Radius" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4359,7 +4415,7 @@ msgstr "Rekkevidde" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 msgid "Read-only mode" -msgstr "Les-kun-modus" +msgstr "Skrivebeskyttet-modus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488 msgid "Real" @@ -4367,15 +4423,15 @@ msgstr "Ekte" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Ekte balansebrett" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" -msgstr "Ekte Wiimote" +msgstr "Ekte Wiikontroller" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80 msgid "Real Wiimotes" -msgstr "Ekte WiiMote" +msgstr "Ekte Wiikontrollere" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205 @@ -4385,9 +4441,8 @@ msgid "Record" msgstr "Opptak" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Opptaksinnstillinger" +msgstr "Gjør input opptak" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4453,11 +4508,11 @@ msgid "" msgstr "" "Render scenen som en wireframe.\n" "\n" -"Hvis usikker, la stå avslått." +"Hvis usikker, la stå deaktivert." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Render to Main Window" -msgstr "Render til Hovedvindu" +msgstr "Spill i hovedvinduet" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970 @@ -4474,7 +4529,7 @@ msgstr "Tilbake" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revisjon:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4491,12 +4546,10 @@ msgid "Rumble" msgstr "Rumble" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Kjør DSP HLE og LLE på en dedikert tråd (ikke anbefalt: Kan forårsake audio-" -"bugs med HLE og krasj med LLE)." +"Kjør DSP LLE på en dedikert CPU-tråd (ikke anbefalt: Kan forårsake frys)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4521,60 +4574,56 @@ msgid "Save GCI as..." msgstr "Lagre GCI som..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Lagre Sa&ve State" +msgstr "Lagre eldste hurtiglagring" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Lagre Sa&ve State" +msgstr "Lagre hurtiglagring" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" -msgstr "Lagre Save State Slot 1" +msgstr "Hurtiglagringsplass nr. 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Lagre Save State Slot 1" +msgstr "Lagre hurtiglagring nr 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" -msgstr "Lagre Save State Slot 2" +msgstr "Hurtiglagringsplass nr. 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 msgid "Save State Slot 3" -msgstr "Lagre Save State Slot 3" +msgstr "Hurtiglagringsplass nr. 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 msgid "Save State Slot 4" -msgstr "Lagre Save State Slot 4" +msgstr "Hurtiglagringsplass nr. 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 msgid "Save State Slot 5" -msgstr "Lagre Save State Slot 5" +msgstr "Hurtiglagringsplass nr. 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 msgid "Save State Slot 6" -msgstr "Lagre Save State Slot 6" +msgstr "Hurtiglagringsplass nr. 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 msgid "Save State Slot 7" -msgstr "Lagre Save State Slot 7" +msgstr "Hurtiglagringsplass nr. 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 msgid "Save State Slot 8" -msgstr "Lagre Save State Slot 8" +msgstr "Hurtiglagringsplass nr. 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Lagre Save State Slot 1" +msgstr "Lagre hurtiglagring nr 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." -msgstr "Lagre Save State..." +msgstr "Hurtiglagring..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 @@ -4657,7 +4706,7 @@ msgstr "Velg" #: Source/Core/DolphinWX/Src/FrameTools.cpp:725 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Select The Recording File" -msgstr "Velg Opptaksfil" +msgstr "Velg opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1370 msgid "Select a Wii WAD file to install" @@ -4819,9 +4868,8 @@ msgid "Settings..." msgstr "Innstillinger..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" +msgstr "SetupWiiMem: Kan ikke lage innstillingsfil" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4852,9 +4900,8 @@ msgid "Show &Toolbar" msgstr "Vis &Verktøylinje" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Standard" +msgstr "Vis Standardverdier" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5150,19 +5197,19 @@ msgstr "Start &NetPlay" #: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" -msgstr "Begynn &Opptak" +msgstr "Start &opptak" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175 msgid "Start Recording" -msgstr "Begynn Opptak" +msgstr "Start opptak" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302 msgid "State" -msgstr "Save State" +msgstr "Hurtiglagring" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161 msgid "State Saves" -msgstr "Save State-lagringsfiler" +msgstr "Hurtiglagringsfiler" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" @@ -5215,7 +5262,7 @@ msgstr "Importering av lagringsfiler vellykket" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Svensk" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5267,7 +5314,7 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:466 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181 msgid "Take Screenshot" -msgstr "Ta Skjermbilde" +msgstr "Ta skjermbilde" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" @@ -5287,7 +5334,7 @@ msgstr "Tekstur-cache" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" -msgstr "Teksturformat Overlegg" +msgstr "Teksturformat overlegg" #: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" @@ -5341,7 +5388,7 @@ msgstr "Navnet kan ikke være blankt" #: Source/Core/DolphinWX/Src/FrameAui.cpp:658 msgid "The name can not contain the character ','" -msgstr "navnet kan ikke inneholde tegnet ','" +msgstr "Navnet kan ikke inneholde tegnet ','" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129 msgid "The resulting decrypted AR code doesn't contain any lines." @@ -5368,7 +5415,7 @@ msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" -"Det valgte språket støttes ikke av ditt system. Faller tilbake til standard." +"Det valgte språket støttes ikke av ditt system. Går tilbake til standard." #: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" @@ -5384,7 +5431,7 @@ msgstr "Serveren responderte: Spillet kjører!" #: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" -msgstr "Serveren sente en ukjent feilmelding!" +msgstr "Serveren sendte en ukjent feilmelding!" #: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format @@ -5441,19 +5488,18 @@ msgstr "" "høyre museknapp og flytt musen for å snu på kameraet. Hold nede SHIFT og " "press en av tastene WASD for å flytte kameraet en viss distanse (SHIFT + 0 " "for å flytte raskere og SHIFT + 9 for å flytte saktere). Trykk SHIFT + R for " -"å resette kameraet. Hvis usikker, la stå avslått." +"å resette kameraet. Hvis usikker, la stå deaktivert." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Hvis du setter Bildebegrensning høyere enn spillets fulle hastighet " -"(NTSC:60, PAL:50). Bruk audio for å begrense ved å bruke DSP (kan muligens " -"fikse audioklikk, men kan også forårsake støy, avhengig av spillet)." +"Dette begrenser hastigheten til et bestemt antall bilder per sekund (60 for " +"NTSC og 50 for PAL). Alternativt kan du bruke innstillingen Audio (kan fikse " +"diverse klikkelyder, men kan også forårsake konstant støy i enkelte spill)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5492,31 +5538,28 @@ msgstr "Til" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Toggle All Log Types" -msgstr "Vipp Alle Loggtyper" +msgstr "Bytt alle loggtypene" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Aspektforhold:" +msgstr "Skift bildestørrelse" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB-kopier" +msgstr "Slå på EFB-kopi" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Vipp Alle Loggtyper" +msgstr "Slå på tåke" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 msgid "Toggle Fullscreen" -msgstr "Vipp Mellom Vindu/Fullskjerm" +msgstr "Bytt mellom fullskjermspilling eller vinduspilling." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Slå på IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5545,7 +5588,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" "Forsøker å lese fra ugyldig SYSCONF\n" -"Wiimote bt ids er ikke tilgjengelig" +"Wiikontroller bt ids er ikke tilgjengelig" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" @@ -5607,12 +5650,11 @@ msgstr "Udefinert %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229 msgid "Undo Load State" -msgstr "Angre Lasting av Save State" +msgstr "Angre åpning av hurtiglagring" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Angre Lasting av Save State" +msgstr "Angre hurtiglagring" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5667,7 +5709,7 @@ msgstr "Bruk EuRGB60-modus (PAL60)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295 msgid "Use Fullscreen" -msgstr "Bruk Fullskjerm" +msgstr "Bruk fullskjerm" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580 msgid "Use Hex" @@ -5675,7 +5717,7 @@ msgstr "Bruk Hex" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Use Panic Handlers" -msgstr "Bruk Panikkadvarslere" +msgstr "Bruk panikkadvarslere" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" @@ -5684,6 +5726,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Bruk en mindre nøyaktig algoritme for å beregne dybde verdier. ⏎\n" +"Kan forårsake problemer i enkelte spill, men kan gi en anstendig " +"hastighetsøkning. ⏎\n" +"⏎\n" +"Hvis du er usikker så la denne være aktivert." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5696,7 +5743,7 @@ msgstr "" "Kan resultere i en ytelsesøkning (spesielt på CPU-er med mer enn to " "kjerner.)\n" "\n" -"Hvis usikker, la stå avslått." +"Hvis usikker, la stå deaktivert." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" @@ -5706,6 +5753,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Bruker usikre operasjoner for å øke farten på vertex streaming i OpenGL. Det " +"er ingen kjente problemer med dette på støttede GPU'er, men det vil skape " +"stor ustabilitet og grafiske feil på andre.\n" +"\n" +"\n" +"\n" +"Hvis usikker, la stå umerket." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5719,7 +5773,7 @@ msgstr "" "En kan derimot droppe disse pop-up-ene for å tillate uavbrutt spilling ved å " "aktivere dette alternativet.\n" "\n" -"Hvis usikker, la stå avslått." +"Hvis usikker, la stå deaktivert." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Utility" @@ -5727,12 +5781,11 @@ msgstr "Verktøyet" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 msgid "V-Sync" -msgstr "Vertikal Synkronisering" +msgstr "Vertikal synkronisering" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "Ytelses-hack for MMU" +msgstr "VBeam Speed Hack" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5752,7 +5805,7 @@ msgstr "Verbøsitet" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Vertex Streaming Hack" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5927,28 +5980,28 @@ msgstr "WiiWAD: Kunne ikke lese fra fil" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 #: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" -msgstr "Wiimote" +msgstr "Wiikontroller" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21 #, c-format msgid "Wiimote %i" -msgstr "WiiMote %i" +msgstr "Wiikontroller %i" #: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" -msgstr "Wiimote Tilkoblet" +msgstr "Wiikontroller tilkoblet" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108 msgid "Wiimote Motor" -msgstr "Wiimote-motor" +msgstr "Wiikontroller-motor" #: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" -msgstr "Innstillinger for Wiimote" +msgstr "Innstillinger for Wiikontroller" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48 msgid "Wiimotes" -msgstr "WiiMote-er" +msgstr "Wiikontrollere" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:121 msgid "Windows Left" @@ -5975,23 +6028,23 @@ msgstr "Arbeider..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Skriv til minnekortene (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" -msgstr "Skriv til Konsoll" +msgstr "Skriv til konsoll" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54 msgid "Write to Debugger" -msgstr "Skriv til Debugger" +msgstr "Skriv til debugger" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 msgid "Write to File" -msgstr "Skriv til Fil" +msgstr "Skriv til fil" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 msgid "Write to Window" -msgstr "Skriv til Vindu ->" +msgstr "Skriv til vindu ->" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47 #, c-format @@ -6169,12 +6222,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "Ukjent smak %d (forventet %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Ukjent melding mottatt med ID: %d" +msgstr "Ukjent melding mottatt" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6182,116 +6234,12 @@ msgstr "wxExecute returnerte -1 på applikasjonskjøring!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:43 msgid "zFar Correction: " -msgstr "zFar Korreksjon: " +msgstr "zFar korreksjon: " #: Source/Core/DolphinWX/Src/PHackSettings.cpp:38 msgid "zNear Correction: " -msgstr "zNear Korreksjon: " +msgstr "zNear korreksjon: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| ELLER" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Nøyaktig VBeam-emulering" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Tillater bytting mellom visse innstilliner via snarveistastene 3 (intern " -#~ "oppløsning), 4 (Aspekt ratio), 5 (Kopier EFB) og 6 (Tåke) i " -#~ "emuleringsvinduet.\n" -#~ " \n" -#~ " Hvis usikker, la stå uaktivert." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "Kan ikke finne WiiMote med bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Kunne ikke stille inn kontroller. Spilleren har forlatt spillet, eller " -#~ "spillet kjører ikke!\n" -#~ "(Å stille inn kontrollere mens spillet kjøret er foreløpig ikke støttet)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Aktiver Snarveistaster" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Aktiver Dolby Pro Logic II-emulering med 5.1 surround. Kun for OpenAL " -#~ "backend. Det kan hende soft_oal.dll må omdøpes til OpenAL32.dll for at " -#~ "det skal fungere." - -#~ msgid "Export failed, try again?" -#~ msgstr "Eksportering mislyktes, prøv igjen?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Lytting Mislyktes!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Kunne ikke laste bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Kunne ikke laste hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic-konfigurasjon" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY ble kalt, venligst rapporter!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Hacket Bufferopplastning" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÅ = " -#~ "Kompitabelt, AV = Raskt)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importering mislyktes, prøv igjen?" - -#~ msgid "In-Game" -#~ msgstr "I spillet" - -#~ msgid "Last Overwritten State" -#~ msgstr "Siste Overskrevne Save State:" - -#~ msgid "Last Saved State" -#~ msgstr "Siste Save State:" - -#~ msgid "Local" -#~ msgstr "Lokal" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Gjenntilkoble Wiimote ved Lasting av Save State" - -#~ msgid "Set" -#~ msgstr "Sett" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Dropp Dest. Alpha Pass" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Bruk en hacket opplastningsstrategi for å streame punkter.\n" -#~ " Dette vil vanligvis øke ytelsen, men er forbudt av OpenGL " -#~ "spesifikasjonen og kan forårsake store bugs.\n" -#~ " \n" -#~ " Hvis usikker, la stå deaktivert." - -#~ msgid "Wii Save Import" -#~ msgstr "Importer Wii-lagringsfil" diff --git a/Languages/po/nl.po b/Languages/po/nl.po index de3ab1c89c..6e39f4daf6 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-17 16:38+0000\n" +"PO-Revision-Date: 2013-09-15 14:49+0000\n" "Last-Translator: Garteal \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/dolphin-emu/" "language/nl/)\n" @@ -115,9 +115,9 @@ msgid "%s failed to open" msgstr "Kon %s niet openen" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "Kon %s niet openen" +msgstr "%s gefaald: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -319,9 +319,8 @@ msgid "(off)" msgstr "(uit) " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ERBIJ" +msgstr "+ ADD" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -410,7 +409,6 @@ msgstr "" "Koppel je Wiimotes handmadig aan het systeem." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -428,21 +426,19 @@ msgid "" msgstr "" "ALERT:\n" "\n" -"NetPlay zal op dit moment alleen goed werken wanneer u de volgende " +"Netplay zal op dit moment alleen goed werken wanneer je de volgende " "instellingen gebruikt:\n" " - Dual Core [UIT]\n" -" - Audio Throttle [UIT]\n" -" - DSP-HLE met \"Null Audio\" of DSP-LLE\n" -" - Zet handmatig het exact aantal controller dat gebruikt word voor de " -"[Standaard Controller]\n" +" - DSP Emulator Engine moet hetzelfde zijn op alle computers!\n" +" - DSP op toegeweide thread [UIT]\n" +" - Framelimit NIET op [Audio]\n" "\n" -"Alle spelers moeten proberen om dezelfde Dolphin versie en instellingen te " -"gebruiken.\n" +"Alle spelers moeten dezelfde Dolphin versie en instellingen gebruiken.\n" "Schakel alle geheugenkaarten uit of stuur ze naar alle spelers voor het " "spelen.\n" "Wiimote ondersteuning is niet geïmplementeerd.\n" "\n" -"Je moet de TCP poort forwarden voor het hosten!!" +"Je moet de TCP poort forwarden voor het hosten!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -837,7 +833,7 @@ msgstr "Verkeerde bestands header" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balance Board" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -1245,9 +1241,8 @@ msgstr "Verbind" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Verbind USB Toetsenbord" +msgstr "Verbind Balance Board" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1471,9 +1466,8 @@ msgid "DSP settings" msgstr "DSP Instellingen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP op toegeweide thread" +msgstr "DSPLLE op toegeweide thread" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1489,7 +1483,7 @@ msgstr "DVDLowUnencryptedRead - Fatale Error: kan het volume niet lezen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Dansmat" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1538,9 +1532,8 @@ msgid "Decompressing ISO" msgstr "Decomprimeer ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Ververs de speellijst" +msgstr "Verlaag framelimit" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1622,7 +1615,7 @@ msgstr "Uitschakelen" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Disable Destination Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1659,7 +1652,6 @@ msgstr "" "In geval van twijfel leeg laten." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" @@ -1745,6 +1737,35 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branche: %s\n" +"Revisie: %s\n" +"Gecompiled op: %s @ %s\n" +"\n" +"Dolphin is een Gamecube/Wii emulator dat oorspronkelijk was ontwikkeld door " +"F|RES en ector. Tegenwoordig is Dolphin een open source project met vele " +"bijdragers, te veel om op te noemen.\n" +"Als je geïnteresseerd bent, bezoek onze project pagina op\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Speciale dank aan Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 en Hotquik voor hun\n" +"reverse engineering en docs/demos.\n" +"\n" +"Grote dank aan Gilles Mouchard wiens Microlib PPC\n" +"emulator onze ontwikkeling een grote schop vooruit gaf.\n" +"\n" +"Dank aan Frank Wille voor zijn PowerPC disassembler,\n" +"dat or9 en wij hebben aangepast om de Gekko bijzonderheden te omvatten.\n" +"\n" +"Dank aan hcs/destop voor hun GC ADPCM decoder.\n" +"\n" +"We zijn niet verbonden met Nintendo op geen enkele manier.\n" +"Gamecube en Wii zijn handelsmerken van Nintendo.\n" +"De emulator is alleen voor educatieve doeleinden\n" +"en mag niet worden gebruikt om spellen te spelen die je niet legaal bezit." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1805,13 +1826,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin kan de verzochte actie niet uitvoeren." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = " -"Snel, UIT = Compatibel)" +"Verdubbelt de geemuleerde GPU clock snelheid. Kan de emulatie versnellen. " +"(AAN = Snel, UIT = Compatibel)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1929,7 +1949,7 @@ msgstr "Wijzig Configuratie" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Wijzig lokale overschrijvingen" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -2266,12 +2286,11 @@ msgstr "Uitvoeren" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Sluit" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exporteer alle saves..." +msgstr "Exporteer alle Wii saves" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2302,9 +2321,8 @@ msgid "Export all saves" msgstr "Exporteer alle saves..." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Exporteren Mislukt" +msgstr "Exporteren mislukt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2424,6 +2442,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Fout tijdens het laden van bthprops.cpl! Je kunt echte Wiimotes niet meer " +"verbinden en Dolphin kan onverwachts crashen!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2431,6 +2451,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Fout tijdens het laden van hid.dll! Je kunt echte Wiimotes niet meer " +"verbinden en Dolphin kan onverwachts crashen!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2511,9 +2533,9 @@ msgstr "" "(0x000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Het schrijven van header voor bestanden %d is mislukt" +msgstr "Kon de header niet lezen voor bestand %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2528,9 +2550,9 @@ msgid "Failed to write bkhdr" msgstr "Mislukt om te schrijven bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Kon geen data lezen van bestand: %s" +msgstr "Kon geen data schrijven in bestand: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2547,7 +2569,7 @@ msgstr "Snel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Snelle Diepte Calculatie" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2697,7 +2719,7 @@ msgstr "Vooruit" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Poort forwarden (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2705,9 +2727,9 @@ msgid "Found %d results for '" msgstr "%d resulataten gevonden voor '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Kon %s niet opslaan" +msgstr "%x saves gevonden" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3122,14 +3144,12 @@ msgid "Import Save" msgstr "Importeer Save" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importeer Save" +msgstr "Importeer Wii save" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Exporteren Mislukt" +msgstr "Importeren mislukt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3156,9 +3176,8 @@ msgid "In Game" msgstr "In Game" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Framelimiet:" +msgstr "Verhoog framelimit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3391,7 +3410,7 @@ msgstr "Taal:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Laatste %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3449,58 +3468,48 @@ msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Laad staat" +msgstr "Laad staat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Laad staat 1" +msgstr "Laad laatste staat 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Laad staat 2" +msgstr "Laad laatste staat 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Laad staat 3" +msgstr "Laad laatste staat 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Laad staat 4" +msgstr "Laad laatste staat 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Laad staat 5" +msgstr "Laad laatste staat 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Laad staat 6" +msgstr "Laad laatste staat 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Laad staat 7" +msgstr "Laad laatste staat 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Laad staat 8" +msgstr "Laad laatste staat 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Laad staat 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Laad staat 1" +msgstr "Laad staat 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3531,9 +3540,8 @@ msgid "Load State Slot 8" msgstr "Laad staat 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Laad staat 1" +msgstr "Laad staat 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4036,7 +4044,7 @@ msgstr "In-Scherm Berichtgeving" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "Online & Documentatie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4087,10 +4095,14 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Opent de standaard (alleen lezen) configuratie voor deze spel in een externe " +"tekst editor." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." msgstr "" +"Opent de gebruiker gespecificeerde overschrijvingen in een externe tekst " +"editor." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4102,7 +4114,6 @@ msgid "Orange" msgstr "Oranje" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -4170,7 +4181,7 @@ msgstr "Partitie %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Patitie bestaat niet: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4359,7 +4370,7 @@ msgstr "RUSLAND" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Radius" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4375,7 +4386,7 @@ msgstr "Echt" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Echte Balance Board" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4393,9 +4404,8 @@ msgid "Record" msgstr "Speel Opnemen" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Opname Opties" +msgstr "Neem input op" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4482,7 +4492,7 @@ msgstr "Enter" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revisie:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4499,12 +4509,11 @@ msgid "Rumble" msgstr "Rumble" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Zet DSP HLE en LLE op een toegeweide thread (niet aangeraden omdat het audio " -"problemen kan veroorzaken met HLE en freezes met LLE)." +"Zet DSP LLE op een toegeweide thread (niet aangeraden omdat het freezes kan " +"veroorzaken)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4529,23 +4538,20 @@ msgid "Save GCI as..." msgstr "Sla GCI op als..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "S&la Staat Op" +msgstr "Sla oudste staat op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "S&la Staat Op" +msgstr "Sla staat op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Sla Staat 1 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Sla Staat 1 Op" +msgstr "Sla Staat 10 op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4576,9 +4582,8 @@ msgid "Save State Slot 8" msgstr "Sla Staat 8 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Sla Staat 1 Op" +msgstr "Sla Staat 9 op" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4828,9 +4833,8 @@ msgid "Settings..." msgstr "Instellingen..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" +msgstr "SetupWiiMem: Kan het instellingen bestand niet aanmaken" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4861,9 +4865,8 @@ msgid "Show &Toolbar" msgstr "Toon &Toolbar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Standaard" +msgstr "Toon standaarden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5227,7 +5230,7 @@ msgstr "Succesvol save games geimporteerd" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Zweeds" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5463,17 +5466,16 @@ msgstr "" "Bij twijfel, ongeselecteerd laten." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Als je de Framelimiet hoger zet dan de snelheid van het spel (NTSC: 60, PAL: " -"50). Gebruik de Audio om te versnellen met behulp van DSP (kan het klikkend " -"geluid verhelpen, maar kan ook constant lawaai ten gevolge hebben, " -"afhankelijk van welk spel gebruikt wordt)." +"Dit limiteert de emulatie snelheid naar de gespecificeerde frames per " +"seconde. (NTSC: 60, PAL: 50). Gebruik Audio om het te limiteren met behulp " +"van de DSP (kan het klikkend geluid verhelpen, maar kan ook constant lawaai " +"ten gevolge hebben, afhankelijk van welk spel gespeelt wordt)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5515,19 +5517,16 @@ msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Beeldverhouding:" +msgstr "Schakel beeldverhouding" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Regio kopie" +msgstr "Schakel EFB kopieën" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Zet Alle Log Types Aan" +msgstr "Schakel fog" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5536,7 +5535,7 @@ msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Schakel IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5631,9 +5630,8 @@ msgid "Undo Load State" msgstr "Ongedaan maken van Load staat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Ongedaan maken van Load staat" +msgstr "Save staat ongedaan maken" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5707,6 +5705,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Gebruikt een minder accurate algoritme om de diepte waardes te calculeren.\n" +"Kan problemen in een paar spellen geven, maar geeft een redelijke speedup.\n" +"\n" +"In geval van twijfel leeg laten." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5728,6 +5730,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Gebruikt onveilige operaties om de vertex streaming te versnellen in OpenGL. " +"Er zijn geen problemen op ondersteunde GPU's, maar het kan voor " +"stabiliteits- en grafische problemen zorgen.\n" +"\n" +"In geval van twijfel leeg laten." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5752,9 +5759,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Snelheids Hack" +msgstr "VBeam Speed Hack" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5774,7 +5780,7 @@ msgstr "Breedsprakigheid" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Vertex Streaming Hack" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5999,7 +6005,7 @@ msgstr "Werken..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Schrijf memcards (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6193,12 +6199,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "onbekende flavor %d (verwacht %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Onbekend bericht ontvangen met id : %d" +msgstr "onbekende bericht ontvangen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6215,107 +6220,3 @@ msgstr "zDichtbij correctie:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OF" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Nauwkeurige VBeam emulatie" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Laat wisseling van sommige opties toe via de sneltoetsen 3 (Interne " -#~ "Resolutie ), 4 (Beeldverhouding), 5 (copy EFB) en 6 (Mist) binnen het " -#~ "emulatie venster.\\n\n" -#~ "\\n\n" -#~ "Bij twijfel, ongeselecteerd laten." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "Kan Wiimote niet vinden op bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Kon de pads niet instellen. De speler heeft het spel verlaten, of het " -#~ "spel draait nog!\n" -#~ "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Activeer Sneltoetsen" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Activeert Dolby Pro Logic II emulatie met 5.1 surround. Allen voor " -#~ "OpenAL backend. Het hernoemen van soft_oal.dll naa OpenAL32.dll kan nodig " -#~ "zijn om het werkend te maken." - -#~ msgid "Export failed, try again?" -#~ msgstr "Uitpakken is mislukt, opnieuw proberen?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Luisteren Mislukt!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Kon bthprops.cpl niet laden" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Mislukt om hid.dll te laden" - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic configuratie" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY is opgeroepen, rapport dit alstubliefst!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Gehackte Buffer Upload" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT " -#~ "= Snel)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importeren is mislukt, opnieuw proberen?" - -#~ msgid "In-Game" -#~ msgstr "In-Game" - -#~ msgid "Last Overwritten State" -#~ msgstr "Laatste Overgeschreven Staat" - -#~ msgid "Last Saved State" -#~ msgstr "Laatste Opgeslagen Staat" - -#~ msgid "Local" -#~ msgstr "Lokaal" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Herverbind Wiimote bij Staat Laden" - -#~ msgid "Set" -#~ msgstr "Stel" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Sla Dest. Alpha Pass over" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Gebruik een gehackte upload strategy om vertices te streamen.\n" -#~ "Dit verhoogt meestal de emulatie snelheid, maar is verboden door de " -#~ "OpenGL specificaties en kan glitches veroorzaken.\n" -#~ "\n" -#~ "In geval van twijfel laat dit uitgevinkt." - -#~ msgid "Wii Save Import" -#~ msgstr "Wii Save Importeren" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 9af7bb9ecc..088b004393 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-18 20:46+0000\n" -"Last-Translator: Baszta \n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" +"Last-Translator: delroth \n" "Language-Team: Polish (http://www.transifex.com/projects/p/dolphin-emu/" "language/pl/)\n" "Language: pl\n" @@ -117,9 +117,9 @@ msgid "%s failed to open" msgstr "Nie można otworzyć %s" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "Nie można otworzyć %s" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -321,9 +321,8 @@ msgid "(off)" msgstr "(wyłączone)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -412,7 +411,6 @@ msgstr "" "Należy ręcznie podłączyć Wiiloty." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -428,20 +426,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"Uwaga:\n" -"\n" -"NetPlay obecnie działa poprawnie z podanymi ustawieniami:\n" -" - 2 rdzenie [OFF]\n" -" - Audio Throttle [OFF]\n" -" - DSP-HLE z \"Null Audio\" lub DSP-LLE\n" -" - Ręczne ustawienie ilości kontrolerów używając [Kontroler standardowy]\n" -"\n" -"Wszyscy gracze powinni używać tej samej wersji programu oraz ustawień.\n" -"Wyłącz wszystkie karty pamięci lub wyślij je do wszystkich graczy przed " -"rozpoczęciem.\n" -"Wsparcie dla Wiilota nie zostało jeszcze zaimplementowane.\n" -"\n" -"Wymagane jest przekierowanie portu TCP do hosta!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -1238,9 +1222,8 @@ msgstr "Połącz" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Podłącz klawiaturę USB" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1463,9 +1446,8 @@ msgid "DSP settings" msgstr "Ustawienia DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "Dedykowany wątek dla DSPLLE" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1530,9 +1512,8 @@ msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Odśwież listę gier" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1651,17 +1632,12 @@ msgstr "" "W razie wątpliwości, pozostaw wyłączone." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Pomiń destination alpha pass używany w wielu grach dla niektórych efektów " -"graficznych.\n" -"\n" -"W razie wątpliwości, pozostaw wyłączone." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1798,13 +1774,10 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Program nie był w stanie zakończyć żądanej akcji." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Włącz szybki dostęp do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " -"kompatybilne)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2257,9 +2230,8 @@ msgid "Exit" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Eksportuj wszystkie zapisy" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2290,9 +2262,8 @@ msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Eksportuj nieudany" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2498,9 +2469,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Błąd zapisu nagłówka do pliku %d" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2515,9 +2486,9 @@ msgid "Failed to write bkhdr" msgstr "Zapis bkhdr nie powiódł się" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Odczyt z pliku %s nie powiódł się" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2690,9 +2661,9 @@ msgid "Found %d results for '" msgstr "Znaleziono %d dla '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Nie można zapisać %s" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -3104,14 +3075,12 @@ msgid "Import Save" msgstr "Importuj zapis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importuj zapis" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Eksportuj nieudany" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3138,9 +3107,8 @@ msgid "In Game" msgstr "W grze" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Limit klatek:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3432,58 +3400,48 @@ msgid "Load Custom Textures" msgstr "Wczytaj własne tekstury" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Wczytaj stan" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Wczytaj stan Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Wczytaj stan Slot 2" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Wczytaj stan Slot 3" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Wczytaj stan Slot 4" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Wczytaj stan Slot 5" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Wczytaj stan Slot 6" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Wczytaj stan Slot 7" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Wczytaj stan Slot 8" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Wczytaj stan Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Wczytaj stan Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3514,9 +3472,8 @@ msgid "Load State Slot 8" msgstr "Wczytaj stan Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Wczytaj stan Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4083,15 +4040,11 @@ msgid "Orange" msgstr "Pomarańczowy" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"Kolejność plików w folderze niezgodna z kolejnościa bloków\n" -"PPM i wyeksportuj wszystkie zapisy,\n" -"następnie zaimportuj te zapisy do nowej karty pamięci\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4373,9 +4326,8 @@ msgid "Record" msgstr "Nagranie" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Opcje nagrywania" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4478,12 +4430,9 @@ msgid "Rumble" msgstr "Wibracje" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Wykonuj DSPLLE na dedykowanym wątku (niezalecane: może powodować błędy audio " -"z HLE oraz zawieszanie z LLE)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4508,23 +4457,20 @@ msgid "Save GCI as..." msgstr "Zapisz GCI jako..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Zapisz &stan" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Zapisz &stan" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Slot stanu 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Slot stanu 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4555,9 +4501,8 @@ msgid "Save State Slot 8" msgstr "Slot stanu 9" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Slot stanu 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4806,9 +4751,8 @@ msgid "Settings..." msgstr "Ustawienia..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4839,9 +4783,8 @@ msgid "Show &Toolbar" msgstr "Pokaż pasek &narzędzi" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Domyślne" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5436,16 +5379,12 @@ msgstr "" "W razie wątpliwości, pozostaw wyłączone." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Jeśli ustawisz limitu klatek większego niż pełna szybkość gry (NTSC:60, " -"PAL:50), ustaw Audio Throttle w DSP (może naprawić klikania dźwięku, ale " -"może spowodować trwały szum zależnie od gry)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5486,19 +5425,16 @@ msgid "Toggle All Log Types" msgstr "Przełącz wszystkie typy logów" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Proporcje ekranu:" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Copies" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Przełącz wszystkie typy logów" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5601,9 +5537,8 @@ msgid "Undo Load State" msgstr "Cofnij wczytywanie stanu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Cofnij wczytywanie stanu" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5721,9 +5656,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Speed Hack" +msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -6164,9 +6098,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Nieznana wiadomość o ID: %d" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6183,106 +6116,3 @@ msgstr "zNear Correction: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OR" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Emulacja Accurate VBeam" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Pozwala na zmianę określonych opcji dzięki klawiszom skrótów 3 " -#~ "(Wewnętrzna rozdzielczość), 4 (Proporcje ekranu), 5 (Copy EFB) i 6 (Mgła) " -#~ "wewnątrz okna emulacji.\n" -#~ "\n" -#~ "W razie wątpliwości, pozostaw wyłączone." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Nie można ustawić pada. Gracz odszedł lub gra jest uruchomiona!\n" -#~ "(Ustawienie padów podczas uruchomionej gry, nie jest jeszcze wspierane)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Włącz skróty klawiszowe" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Włącza emulację Dolby Pro Logic II używając 5.1 surround. Tylko OpenAL. " -#~ "Zmiana nazwy pliku soft_oal.dll na OpenAL32.dll może spowodować, że ta " -#~ "opcja zacznie działać." - -#~ msgid "Export failed, try again?" -#~ msgstr "Eksport nieudany, ponowić?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Nasłuchiwanie nieudane!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Ładowanie bthprops.cpl nie udało się" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Ładowanie hid.dll nie udało się" - -#~ msgid "GCMic Configuration" -#~ msgstr "Konfiguracja GCMic" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY wywołany, raportuj!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Hacked Buffer Upload" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, " -#~ "OFF = szybko)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importowanie nie powiodło się, próbować ponownie?" - -#~ msgid "In-Game" -#~ msgstr "W grze" - -#~ msgid "Last Overwritten State" -#~ msgstr "Ostatni nadpisany stan" - -#~ msgid "Last Saved State" -#~ msgstr "Ostatni zapisany stan" - -#~ msgid "Local" -#~ msgstr "Lokalny" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Podłacz ponownie Wiilota gdy wczytywany jest stan" - -#~ msgid "Set" -#~ msgstr "Ustaw" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Pomiń Dest. Alpha Pass" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Należy użyć strategii hackowanego wgrywania do wierzchołków.\n" -#~ "Zazwyczaj przyspiesza, ale jest zakazane przez specyfikację OpenGL i może " -#~ "powodować spore błędy.\n" -#~ "\n" -#~ "W razie wątpliwości, pozostaw wyłączone." - -#~ msgid "Wii Save Import" -#~ msgstr "Import zapisów Wii" diff --git a/Languages/po/pt.po b/Languages/po/pt.po index f895b389fa..b741aac1e4 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -3,15 +3,17 @@ # This file is distributed under the same license as the dolphin-emu package. # # Translators: +# 100tpt <100nome.portugal@gmail.com>, 2013 # Zilaan , 2011 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" -"Last-Translator: delroth \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2013-09-16 18:55+0000\n" +"Last-Translator: 100tpt <100nome.portugal@gmail.com>\n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/dolphin-emu/" +"language/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,12 +61,12 @@ msgstr "%1$sCopiar%1$s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120 #, c-format msgid "%d samples" -msgstr "" +msgstr "%d amostras" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119 #, c-format msgid "%d samples (quality level %d)" -msgstr "" +msgstr "%d amostras (nível de qualidade %d)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 @@ -104,9 +106,9 @@ msgid "%s failed to open" msgstr "%s falha ao abrir" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s falha ao abrir" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -309,9 +311,8 @@ msgid "(off)" msgstr "(desligado)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -398,7 +399,6 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -414,22 +414,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"ALERTA:\n" -"\n" -"NetPlay só irá funcionar correctamente se utilizar as definições seguintes:\n" -" - Dual Core [OFF]\n" -" - Regulador Áudio [OFF]\n" -" - DSP-HLE com \"Null Audio\" ou DSP-LLE\n" -" - Defina manualmente o número exacto de comandos que serão usados [Comando " -"Padrão]\n" -"\n" -"Todos os jogadores devem tentar usar a mesma versão e definições do " -"Dolphin.\n" -"Desactive todos os cartões de memória ou atribua-os aos jogadores todos " -"antes de começar.\n" -"suporte Wiimote ainda não foi implementado.\n" -"\n" -"Tem que fazer forward TCP para ser host!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -664,11 +648,11 @@ msgstr "Todos os ficheiros (*.*)|*.*" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271 msgid "Analyze" -msgstr "" +msgstr "Analisar" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:286 msgid "Angle" -msgstr "" +msgstr "Ângulo" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376 msgid "Anisotropic Filtering:" @@ -1066,7 +1050,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." -msgstr "" +msgstr "A verificar integridade..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" @@ -1220,9 +1204,8 @@ msgstr "Conectar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Conectar Teclado USB" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1363,7 +1346,7 @@ msgstr "Criador:" #: Source/Core/Common/Src/MsgHandler.cpp:54 msgid "Critical" -msgstr "" +msgstr "Crítico" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Crop" @@ -1504,9 +1487,8 @@ msgid "Decompressing ISO" msgstr "A descomprimir ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Actualizar lista de Jogos" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1625,17 +1607,12 @@ msgstr "" "Em caso de dúvida, mantenha esta opção desactivada." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Salta a passagem de destino alfa utilizada em muitos jogos para diversos " -"efeitos gráficos.\n" -"\n" -"Em caso de dúvida, mantenha esta opção desactivada." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1772,13 +1749,10 @@ msgid "Dolphin was unable to complete the requested action." msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Activar acesso rápido ao disco. Necessário para alguns jogos. (ON = Rápido, " -"OFF = Compatível)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2225,12 +2199,11 @@ msgstr "Executar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Sair" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exportar todos os jogos guardados" +msgstr "Exportar Todos os Jogos Guardados Wii" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2261,9 +2234,8 @@ msgid "Export all saves" msgstr "Exportar todos os jogos guardados" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "A Exportação Falhou" +msgstr "A exportação falhou" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2457,7 +2429,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" -msgstr "" +msgstr "Falha ao ler cabeçalho" #: Source/Core/Core/Src/HW/GCMemcard.cpp:107 msgid "" @@ -2468,9 +2440,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Falha ao escrever cabeçalho para o ficheiro %d" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2485,9 +2457,9 @@ msgid "Failed to write bkhdr" msgstr "Falha ao escrever bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Falha ao ler dados do ficheiro %d" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2572,11 +2544,11 @@ msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Find next" -msgstr "" +msgstr "Procurar seguinte" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254 msgid "Find previous" -msgstr "" +msgstr "Procurar anterior" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 msgid "First Block" @@ -2656,12 +2628,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "Encontrados %d resultados para '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Não foi possível guardar %s" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2753,7 +2725,7 @@ msgstr "O jogo não está a correr!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" -msgstr "" +msgstr "Jogo não encontrado!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" @@ -3049,14 +3021,12 @@ msgid "Import Save" msgstr "Importar Jogo Guardado" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importar Jogo Guardado" +msgstr "Importar Jogo Guardado Wii" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "A Exportação Falhou" +msgstr "A importação falhou" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3083,9 +3053,8 @@ msgid "In Game" msgstr "Em Jogo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Limite de Quadros:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3370,58 +3339,48 @@ msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Carregar Estado" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Carregar Estado Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Carregar Estado Slot 2" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Carregar Estado Slot 3" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Carregar Estado Slot 4" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Carregar Estado Slot 5" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Carregar Estado Slot 6" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Carregar Estado Slot 7" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Carregar Estado Slot 8" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Carregar Estado Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Carregar Estado Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3452,9 +3411,8 @@ msgid "Load State Slot 8" msgstr "Carregar Estado Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Carregar Estado Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3826,7 +3784,7 @@ msgstr "Nenhum ISO ou WAD encontrado" #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "" +msgstr "Sem saída de áudio" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format @@ -3836,7 +3794,7 @@ msgstr "Nenhum ficheiro banner foi encontrado para o título %s" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778 msgid "No description available" -msgstr "" +msgstr "Nenhuma descrição disponível" #: Source/Core/DolphinWX/Src/FrameAui.cpp:535 msgid "No docking" @@ -3945,7 +3903,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "Online e documentação" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4011,15 +3969,11 @@ msgid "Orange" msgstr "Laranja" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"A ordem dos ficheiros na pasta não combina com a ordem dos blocos\n" -"Botão direito e exporte todos os jogos guardados,\n" -"e importe os jogos guardados para um novo cartão de memória\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4096,7 +4050,7 @@ msgstr "Pausa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:129 msgid "Pause at end of movie" -msgstr "" +msgstr "Fazer pausa no fim do filme" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Per-Pixel Lighting" @@ -4291,7 +4245,7 @@ msgstr "Wiimote Real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80 msgid "Real Wiimotes" -msgstr "" +msgstr "Wiimotes Reais" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205 @@ -4301,9 +4255,8 @@ msgid "Record" msgstr "Gravar" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Opções de Gravação" +msgstr "Gravar entradas" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4390,7 +4343,7 @@ msgstr "Return" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revisão:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4434,23 +4387,20 @@ msgid "Save GCI as..." msgstr "Guardar GCI como..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Gua&rdar Estado" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Gua&rdar Estado" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Guardar Estado Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Guardar Estado Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4481,9 +4431,8 @@ msgid "Save State Slot 8" msgstr "Guardar Estado Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Guardar Estado Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4720,9 +4669,8 @@ msgid "Settings..." msgstr "Definições..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4753,9 +4701,8 @@ msgid "Show &Toolbar" msgstr "Mostrar Barra de Ferramen&tas" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Padrão" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5297,7 +5244,7 @@ msgstr "O valor é inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" -msgstr "" +msgstr "Tema:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588 msgid "" @@ -5387,19 +5334,16 @@ msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Proporção de ecrã:" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "Cópias EFB" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Alternar Todos os Tipos de Relatório" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5500,9 +5444,8 @@ msgid "Undo Load State" msgstr "Retroceder Carregamento de Estado" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Retroceder Carregamento de Estado" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5520,7 +5463,7 @@ msgstr "Comando de DVD desconhecido %08x - Erro fatal" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444 #, c-format msgid "Unknown command 0x%08x" -msgstr "" +msgstr "Comando desconhecido 0x%08x" #: Source/Core/Common/Src/SysConf.cpp:132 #, c-format @@ -5623,9 +5566,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Hack de velocidade" +msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5821,7 +5763,7 @@ msgstr "Definições de Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48 msgid "Wiimotes" -msgstr "" +msgstr "Wiimotes" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:121 msgid "Windows Left" @@ -6039,9 +5981,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Mensagem desconhecida recebida com a id : %d" +msgstr "mensagem desconhecida recebida" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6058,66 +5999,3 @@ msgstr "Correcção zNear: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OU" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Emulação VBeam precisa" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Não foi possível definir os comandos. O jogador saiu ou o jogo está em " -#~ "execução!\n" -#~ "(definir os controlos enquanto o jogo está em execução ainda não é " -#~ "suportado)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Activar Teclas de Atalho" - -#~ msgid "Export failed, try again?" -#~ msgstr "Exportação falhou, tentar novamente?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "A Escuta Falhou!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Falha ao carregar bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Falha ao carregar hid.dll" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY é chamada, Por favor reporte!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Se os FPS são erráticos, esta opção poderá ajudar. (ON = Compatível, OFF " -#~ "= Rápido)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importação falhou, tentar novamente?" - -#~ msgid "In-Game" -#~ msgstr "Em-Jogo" - -#~ msgid "Last Overwritten State" -#~ msgstr "Último estado Substituído" - -#~ msgid "Last Saved State" -#~ msgstr "Último Estado Guardado" - -#~ msgid "Local" -#~ msgstr "Local" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Reconectar Wiimote ao Carregar Estado" - -#~ msgid "Set" -#~ msgstr "Definir" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Saltar Dest. Alpha Pass" - -#~ msgid "Wii Save Import" -#~ msgstr "Importação de Jogo Guardado Wii" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index bd70210262..67769caddd 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -6,14 +6,17 @@ # Maldonny , 2013 # Dante Jr. , 2011 # Runo , 2013 -# Mateus B. Cassiano , 2013 +# Maldonny , 2013 +# Mateus Cassiano , 2013 +# Mateus Cassiano , 2013 +# Runo , 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-08 18:30+0000\n" -"Last-Translator: Runo \n" +"PO-Revision-Date: 2013-09-14 12:33+0000\n" +"Last-Translator: Maldonny \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "dolphin-emu/language/pt_BR/)\n" "Language: pt_BR\n" @@ -106,19 +109,19 @@ msgid "" "%s failed to load as a memorycard \n" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -"%s não pôde ser carregado como um MemoryCard \n" +"%s não pôde ser carregado como um Memory Card \n" "o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x " "bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" -msgstr "%s Falha na abertura" +msgstr "Falha ao abrir %s" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s Falha na abertura" +msgstr "%s falhou: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -217,7 +220,7 @@ msgstr "&Ajuda" #: Source/Core/DolphinWX/Src/FrameTools.cpp:182 msgid "&Hotkey Settings" -msgstr "Configurações de &Atalho" +msgstr "Configurações de &Teclas de Atalho" #: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" @@ -225,7 +228,7 @@ msgstr "&JIT" #: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "&Load State" -msgstr "&Carregar Estado" +msgstr "&Carregar Instante Salvo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Memcard Manager (GC)" @@ -269,7 +272,7 @@ msgstr "&Registradores" #: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Reset" -msgstr "&Reset" +msgstr "&Reiniciar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:238 msgid "&Sound" @@ -320,9 +323,8 @@ msgid "(off)" msgstr "(desligado)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ADD" +msgstr "+ ADD" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -330,7 +332,7 @@ msgstr "0x44" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1.5x Native (960x792)" -msgstr "" +msgstr "1.5x Nativo (960x792)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148 msgid "16 bit" @@ -338,15 +340,15 @@ msgstr "16 bit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1x Native (640x528)" -msgstr "" +msgstr "1x Nativo (640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "2.5x Native (1600x1320)" -msgstr "" +msgstr "2.5x Nativo (1600x1320)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "2x Native (1280x1056)" -msgstr "" +msgstr "2x Nativo (1280x1056)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149 msgid "32 bit" @@ -358,11 +360,11 @@ msgstr "3D Vision" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "3x Native (1920x1584)" -msgstr "" +msgstr "3x Nativo (1920x1584)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "4x Native (2560x2112)" -msgstr "" +msgstr "4x Nativo (2560x2112)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147 msgid "8 bit" @@ -411,7 +413,6 @@ msgstr "" "Você deve conectar seus Wiimotes manualmente." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -429,21 +430,17 @@ msgid "" msgstr "" "ALERTA:\n" "\n" -"O NetPlay atualmente irá funcionar corretamente apenas usando as " -"configurações a seguir:\n" -" - Dual Core [DESLIGADO]\n" -" - Aceleração de Audio [Desligado]\n" -" - DSP-HLE com \"Audio Nulo\" ou DSP-LLE\n" -" - Manualmente configurar o número exato de controles a serem usados para " -"[Controle Padrão]\n" +"Netplay só funcionará com as seguintes configurações:\n" +" - Ativar Dois Núcleos [OFF]\n" +" - O emulador do motor DSP deve ser o mesmo em TODOS os PCs!\n" +" - DSP em um Thread Dedicado [OFF]\n" +" - Limite de quadros não definido para [Audio]\n" "\n" -"Todos os jogadores devem tentar usar a mesma versão e configuração do " -"Dolphin.\n" -"Desative todos os cartões de memórias ou mande eles para todos os jogadores " -"antes de começar .\n" -"Suport ao wiimote não foi implementado.\n" +"Todos os jogadores devem usar a mesma versão e configurações do Dolphin.\n" +"Todos os memory cards devem ser iguais ou desativados.\n" +"Suporte ao Wiimote não deve estar ativado!\n" "\n" -"Você deve redirecionar as portas TCP para ser o Host!!" +"O host deve escolher uma porta TCP aberta/encaminhada! \n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -669,7 +666,7 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" -msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" +msgstr "Todos os Instantes Salvos (sav, s##)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190 msgid "All Wii ISO files (iso)" @@ -837,7 +834,7 @@ msgstr "Header de Arquivo Ruim" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balance Board" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -942,11 +939,11 @@ msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65 msgid "C Stick" -msgstr "C Stick" +msgstr "Analógico C" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:64 msgid "C-Stick" -msgstr "C-Stick" +msgstr "Analógico-C" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774 msgid "CP reg" @@ -954,7 +951,7 @@ msgstr "CP reg" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" -msgstr "Engine de Emulação do CPU" +msgstr "Motor de Emulação do CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Cache Display Lists" @@ -977,7 +974,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" -msgstr "" +msgstr "Não foi possível encontrar o WiiMote pela conexão %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:672 #: Source/Core/Core/Src/HW/DVDInterface.cpp:682 @@ -1243,9 +1240,8 @@ msgstr "Conectar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Conectar Teclado USB" +msgstr "Conectar Balance Board" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1348,6 +1344,14 @@ msgid "" "If so, then you may need to re-specify your memory card location in the " "options." msgstr "" +"Não foi possível gravar no arquivo de Memory Card %s.\n" +"\n" +"Você está executando o Dolphin em um CD/DVD, ou o arquivo está protegido de " +"gravação?\n" +"\n" +"Você recebeu esta mensagem após mudar o diretório do emulador?\n" +"Se sim, então você precisa especificar a localização do Memory Card na " +"opções." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" @@ -1441,7 +1445,7 @@ msgstr "DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP Emulator Engine" -msgstr "Engine de Emulação do DSP" +msgstr "Motor de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 @@ -1461,9 +1465,8 @@ msgid "DSP settings" msgstr "Configurações de Áudio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP em um Thread Dedicado" +msgstr "DSPLLE em um Thread Separado" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1479,7 +1482,7 @@ msgstr "DVDLowUnencryptedRead - Erro Fatal: falha ao ler do volume" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Tapete de Dança" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1528,9 +1531,8 @@ msgid "Decompressing ISO" msgstr "Descomprimindo ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Atualizar a lista de jogos" +msgstr "Diminuir limite de Quadros" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1612,7 +1614,7 @@ msgstr "Desativar" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Desabilitar Destination Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1649,15 +1651,14 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos " -"gráficos.\n" +"Desabilita a emulação de um recurso de hardware chamado Destination Alpha, " +"que é usado em muitos jogos para criar vários efeitos gráficos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1694,7 +1695,7 @@ msgstr "Você quer parar a emulação atual?" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" -msgstr "Decoder Dolby Pro Logic II" +msgstr "Decodificador Dolby Pro Logic II" #: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" @@ -1735,6 +1736,37 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin Team\n" +"\n" +"Branch: %s\n" +"Revisão: %s\n" +"Compilado: %s @ %s\n" +"\n" +"Dolphin é um emulador de Gamecube/Wii, que foi\n" +"escrito originalmente por F|RES e ector.\n" +"Hoje o Dolphin é um projeto de código aberto com \n" +"muitos contribuidores, muitos para listar.\n" +"Se tiver algum interesse, visite a página do projeto em\n" +"http://code.google.com/p/dolphin-emu/ .\n" +"\n" +"Agradecimentos especiais à Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 e Hotquik por fazer a\n" +"engenharia reversa e pelos docs/demos.\n" +"\n" +"Somos muito gratos à Gilles Mouchard cujo \n" +"Microlib PPC emulator ajudou nosso projeto.\n" +"\n" +"Agradecemos à Frank Wille pelo PowerPC disassembler,\n" +"que modificamos para incluir as especificações Gekko.\n" +"\n" +"Agradecemos à hcs/destop por seu GC ADPCM decoder.\n" +"\n" +"Não possuímos nenhum tipo de ligação com a Nintendo.\n" +"Gamecube e Wii são produtos da Nintendo.\n" +"Este emulador é apenas para fins educacionais\n" +"e não deve ser usado para rodar jogos que você\n" +"não possui legalmente." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1779,8 +1811,8 @@ msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " -"arquivos..." +"Dolphin não pôde encontrar ISOs de GC/Wii. Clique duas vezes aqui para " +"procurar por arquivos..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" @@ -1796,13 +1828,12 @@ msgid "Dolphin was unable to complete the requested action." msgstr "O Dolphin não conseguiu completar a ação requisitada." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " -"OFF = Compativel)" +"Duplica a taxa de emulação da GPU. Pode acelerar alguns jogos (ON = Rápido, " +"OFF = Compatível)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1921,7 +1952,7 @@ msgstr "Editar Configuração" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Editar substituições locais" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -1946,7 +1977,7 @@ msgstr "Frame Buffer Embutido" #: Source/Core/Core/Src/Core.cpp:191 msgid "Emu Thread already running" -msgstr "Este Segmento de Emulação já está rodando" +msgstr "Este Thread de Emulação já está rodando" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" @@ -2256,12 +2287,11 @@ msgstr "Executar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Sair" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exportar todos os saves" +msgstr "Exportar todos os saves do Wii" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2292,9 +2322,8 @@ msgid "Export all saves" msgstr "Exportar todos os saves" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Falha na Exportação" +msgstr "Falha na exportação" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2404,7 +2433,7 @@ msgstr "" "Ele não stá incluso no Dolphin por conter dados com direitos autorais.\n" "Use o DSPSpy para fazer o dump do arquivo do seu console.\n" "\n" -"Você pode usar a engine HLE do DSP que não precisa do dump da ROM.\n" +"Você pode usar o motor HLE do DSP que não precisa do dump da ROM.\n" "(Escolha-o na aba \"Áudio\" da Janela de Configuração.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108 @@ -2413,6 +2442,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Falha ao carregar bthprops.cpl! Conectar Wiimotes reais não irá funcionar e " +"o Dolphin pode fechar inesperadamente!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2420,6 +2451,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Falha ao carregar hid.dll! Conectar Wiimotes reais não irá funcionar e o " +"Dolphin pode fechar inesperadamente!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2500,9 +2533,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Falha ao escrever o header para o arquivo %d" +msgstr "Falha ao ler o header para o arquivo %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2517,9 +2550,9 @@ msgid "Failed to write bkhdr" msgstr "Falha ao escrever bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Falha ao ler dados do arquivo: %s" +msgstr "Falha ao escrever dados no arquivo: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2536,7 +2569,7 @@ msgstr "Rápido" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Cálculo Rápido de Profundidade" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2685,7 +2718,7 @@ msgstr "Para frente" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Porta adiante (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2693,9 +2726,9 @@ msgid "Found %d results for '" msgstr "%d resultados encontrados para '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Não foi possível salvar %s" +msgstr "%x arquivos salvos encontrados" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2712,7 +2745,7 @@ msgstr "Avançar Quadro" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Frame Dumps use FFV1" -msgstr "Extração de Quadros usam FFV1" +msgstr "Extração de Quadros usando FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215 msgid "Frame Info" @@ -2993,12 +3026,12 @@ msgstr "Host" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:31 msgid "Hotkey Configuration" -msgstr "Configuração de hotkey" +msgstr "Configuração de Teclas de Atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Hotkeys" -msgstr "Hotkeys" +msgstr "Teclas de Atalho" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Hungarian" @@ -3022,6 +3055,10 @@ msgid "" "TitleID %016llx.\n" " Dolphin will likely hang now." msgstr "" +"IOCTL_ES_LAUNCH: O jogo tentou recarregar um IOS ou um título não disponível " +"no dump do seu NAND\n" +"TitleID %016llx.\n" +"Dolphin provavelmente vai travar agora." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" @@ -3104,14 +3141,12 @@ msgid "Import Save" msgstr "Importar Save" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importar Save" +msgstr "Importar jogo salvo do Wii" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Falha na Exportação" +msgstr "Falha na importação" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3138,9 +3173,8 @@ msgid "In Game" msgstr "Funciona" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Limitador de FPS:" +msgstr "Aumentar limite de Quadros" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3280,7 +3314,7 @@ msgid "" msgstr "" "Arquivo opening.bnr inválido encontrado no gcm:\n" "%s\n" -"Você pode precisar refazer o dump deste jogo." +"Você pode precisar extraí-lo novamente do jogo." #: Source/Core/Core/Src/Movie.cpp:728 msgid "Invalid recording file" @@ -3347,7 +3381,7 @@ msgstr "Manter Janela no Topo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 msgid "Key" -msgstr "Chave" +msgstr "Tecla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 @@ -3375,7 +3409,7 @@ msgstr "Linguagem:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Último %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3395,7 +3429,7 @@ msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -"Clique com o botão esquerdo para detectar atalhos de teclado.\n" +"Clique com o botão esquerdo para detectar teclas de atalho.\n" "Pressione Enter para deixar vazio." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742 @@ -3433,95 +3467,84 @@ msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Carregar Estado" +msgstr "Carregar Instante Salvo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Carregar Estado do Slot 1" +msgstr "Carregar Último Instante Salvo 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Carregar Estado do Slot 2" +msgstr "Carregar Último Instante Salvo 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Carregar Estado do Slot 3" +msgstr "Carregar Último Instante Salvo 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Carregar Estado do Slot 4" +msgstr "Carregar Último Instante Salvo 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Carregar Estado do Slot 5" +msgstr "Carregar Último Instante Salvo 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Carregar Estado do Slot 6" +msgstr "Carregar Último Instante Salvo 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Carregar Estado do Slot 7" +msgstr "Carregar Último Instante Salvo 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Carregar Estado do Slot 8" +msgstr "Carregar Último Instante Salvo 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" -msgstr "Carregar Estado do Slot 1" +msgstr "Carregar Instante Salvo do Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Carregar Estado do Slot 1" +msgstr "Carregar Instante Salvo do Slot 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" -msgstr "Carregar Estado do Slot 2" +msgstr "Carregar Instante Salvo do Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 msgid "Load State Slot 3" -msgstr "Carregar Estado do Slot 3" +msgstr "Carregar Instante Salvo do Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 msgid "Load State Slot 4" -msgstr "Carregar Estado do Slot 4" +msgstr "Carregar Instante Salvo do Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 msgid "Load State Slot 5" -msgstr "Carregar Estado do Slot 5" +msgstr "Carregar Instante Salvo do Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 msgid "Load State Slot 6" -msgstr "Carregar Estado do Slot 6" +msgstr "Carregar Instante Salvo do Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 msgid "Load State Slot 7" -msgstr "Carregar Estado do Slot 7" +msgstr "Carregar Instante Salvo do Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 msgid "Load State Slot 8" -msgstr "Carregar Estado do Slot 8" +msgstr "Carregar Instante Salvo do Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Carregar Estado do Slot 1" +msgstr "Carregar Instante Salvo do Slot 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." -msgstr "Carregar State..." +msgstr "Carregar Instante Salvo..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1417 msgid "Load Wii System Menu" @@ -3665,8 +3688,8 @@ msgid "" "Memory Card Manager WARNING-Make backups before using, should be fixed but " "could mangle stuff!" msgstr "" -"AVISO do Gerenciador de- Memory Card - Faça backupsantes de usar, deve estar " -"funcionando mas pode corromper coisas!" +"AVISO - Faça backups antes de usar, deve estar funcionando mas pode " +"corromper coisas!" #: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format @@ -4020,7 +4043,7 @@ msgstr "Mostrar Mensagens na Tela" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "&Documentação Online" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4071,10 +4094,14 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Abre a configuração padrão (somente leitura) para este jogo em um editor de " +"texto externo." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." msgstr "" +"Abre as substituições especificadas pelo usuário em um editor de texto " +"externo." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4086,14 +4113,13 @@ msgid "Orange" msgstr "Laranja" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"A ordem dos arquivos no Diretório de Arquivos não bate\n" -"Clique com o botão direito e exporte todos os salvas,\n" +"A ordem dos arquivos no Diretório de Arquivos não bate \n" +"Clique com o botão direito e exporte todos os jogos salvos, \n" "e importe-os para um novo Memory Card\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 @@ -4153,7 +4179,7 @@ msgstr "Partição %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Partição não existe: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4338,11 +4364,11 @@ msgstr "RAM" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:169 msgid "RUSSIA" -msgstr "Russia" +msgstr "RÚSSIA" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Alcance" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4358,7 +4384,7 @@ msgstr "Real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Balance Board Real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4376,9 +4402,8 @@ msgid "Record" msgstr "Gravar" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Opções de Gravação" +msgstr "Gravar entrada" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4408,7 +4433,7 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"Reduz a quantidade de aliasing causado pela rasterização de gráficos 3D.\n" +"Reduz a quantidade de serrilhados causado pela rasterização de gráficos 3D.\n" "Isso faz com que a imagem renderizada fique menos quadriculada.\n" "Diminui de forma severa a velocidade da emulação e pode causar problemas.\n" "\n" @@ -4464,7 +4489,7 @@ msgstr "Retornar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Revisão:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4481,12 +4506,11 @@ msgid "Rumble" msgstr "Vibração" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Executa DSP HLE e LLE em um thread dedicado (não recomendado: pode causar " -"falhas no áudio com HLE e congelamentos com LLE)." +"Executar DSP LLE em um thread dedicado (não recomendado: pode causar " +"congelamentos)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4511,23 +4535,20 @@ msgid "Save GCI as..." msgstr "Salvar GCI como..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Sal&var Instante Atual" +msgstr "Salvar Instante Antigo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Sal&var Instante Atual" +msgstr "Salvar Instante Atual" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Salvar Instante Atual no Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Salvar Instante Atual no Slot 1" +msgstr "Salvar Instante Atual no Slot 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4558,9 +4579,8 @@ msgid "Save State Slot 8" msgstr "Salvar Instante Atual no Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Salvar Instante Atual no Slot 1" +msgstr "Salvar Instante Atual no Slot 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4586,7 +4606,7 @@ msgstr "Salvar GCM/ISO descomprimido" #: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." +msgstr "O Instante Salvo capturado %s está corrompido, parando captura..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Scaled EFB Copy" @@ -4811,9 +4831,8 @@ msgid "Settings..." msgstr "Configurações..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Arquivo de configuração não encontrado" +msgstr "SetupWiiMem: Não foi possível criar o arquivo de configurações" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4841,12 +4860,11 @@ msgstr "Mostrar barra de &Status" #: Source/Core/DolphinWX/Src/FrameTools.cpp:214 msgid "Show &Toolbar" -msgstr "Show Barra de &Ferramentas" +msgstr "Mostrar Barra de &Ferramentas" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Padrão" +msgstr "Mostrar Padrões" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5153,11 +5171,11 @@ msgstr "Iniciar Captura" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302 msgid "State" -msgstr "Status" +msgstr "Instante Atual" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161 msgid "State Saves" -msgstr "Estados Salvos" +msgstr "Instante Salvos" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" @@ -5210,7 +5228,7 @@ msgstr "Arquivos de salva importados com sucesso" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Sueco" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" @@ -5231,7 +5249,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 msgid "System Language:" -msgstr "Idioma do Systema:" +msgstr "Idioma do Sistema:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:185 msgid "TAIWAN" @@ -5401,8 +5419,8 @@ msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -"É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " -"provavelmente incompleto." +"É necessário um ticket para 00000001/00000002. O NAND que você extraiu " +"provavelmente está incompleto." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" @@ -5446,17 +5464,16 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima " -"do jogo (NTSC:60, PAL:50). Use Áudio para acelerar através do DSP (deve " -"consertar cortes no áudio mas pode causar ruído constante dependendo do " -"jogo)." +"Isso limita a velocidade do jogo para o número especificado de quadros por " +"segundo (60 para NTSC e 50 para PAL). Em alternativa, use o áudio para " +"acelerar usando DSP (deve consertar cortes no áudio mas pode causar ruído " +"constante dependendo do jogo)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5498,19 +5515,16 @@ msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Proporção:" +msgstr "Ligar/Desligar Proporção" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "Cópias de EFB" +msgstr "Ligar/Desligar Cópias de EFB" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Ligar/Desligar Todos os Logs" +msgstr "Ligar/Desligar Neblina" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5519,7 +5533,7 @@ msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Ligar/Desligar IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5611,12 +5625,11 @@ msgstr "%i indefinido" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229 msgid "Undo Load State" -msgstr "Desfazer carregamento de estado" +msgstr "Desfazer Instante Carregado" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Desfazer carregamento de estado" +msgstr "Desfazer Instante Salvo" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5689,6 +5702,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Usa um algoritmo de menor precisão para calcular os dados de profundidade.\n" +"Causa problemas em alguns jogos, mas pode garantir um aumento considerável " +"na velocidade.\n" +"\n" +"Se estiver em dúvida, deixe desmarcado." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5711,6 +5729,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Usa operações inseguras para acelerar o fluxo de vértice em OpenGL. Não há " +"problemas conhecidos quanto ao suporte das GPUs, mas pode causar diversos " +"problemas gráficos e de instabilidade.\n" +"\n" +"Se estiver em dúvida, deixe isto desmarcado." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5736,9 +5759,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "Hack de velocidade MMU" +msgstr "Hack de Velocidade VBeam" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5758,7 +5780,7 @@ msgstr "Verbosidade" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Hack de Fluxo de Vértice" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5982,7 +6004,7 @@ msgstr "Funcionando..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Gravar memcards (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -6096,7 +6118,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" -msgstr "Hack do ZTB" +msgstr "Hack do ZTP" #: Source/Core/Core/Src/ActionReplay.cpp:377 msgid "Zero 3 code not supported" @@ -6178,12 +6200,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "flavor desconhecido %d (esperado %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Menssagem desconhecida recebida com identificação: %d" +msgstr "mensagem desconhecida recebida" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6200,88 +6221,3 @@ msgstr "Correção do zNear:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| OR" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Emulação correta do VBeam" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Permite mudar algumas opções através das teclas 3 (Resolução Interna), 4 " -#~ "(Proporção), 5 (Cópias de EFB) e 6 (Neblina) dentro da janela de " -#~ "emulação.\n" -#~ "\n" -#~ "Se estiver em dúvida, deixe isto desativado." - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Não foi possível definir os controles. O jogador saiu ou o jogo está " -#~ "rodando no momento!\n" -#~ "(Definir os controles durante o jogo ainda não é suportado)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Ativar Hotkeys" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " -#~ "apenas no backend OpenAL. Talvez seja necessário renomear o soft_oal.dll " -#~ "para OpenAL32.dll para que funcione." - -#~ msgid "Export failed, try again?" -#~ msgstr "Falha na exportação, tentar novamente?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Não foi possível Ouvir!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Falha ao carregar bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Falha ao carregar hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Configuração do GCMic" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY foi chamado, favor reportar!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = " -#~ "Compatível, OFF = Rápido)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Falha na Importação, tentar novamente?" - -#~ msgid "In-Game" -#~ msgstr "In-Game" - -#~ msgid "Last Overwritten State" -#~ msgstr "Último State sobrescrito" - -#~ msgid "Last Saved State" -#~ msgstr "Último State Salvo" - -#~ msgid "Local" -#~ msgstr "Local" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Reconectar Wiimote ao carregar Estado Salvo" - -#~ msgid "Set" -#~ msgstr "Definir" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Não fazer o Dest. Alpha Pass" - -#~ msgid "Wii Save Import" -#~ msgstr "Importar Save de Wii" diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 426993f964..461239c829 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the dolphin-emu package. # # Translators: -# N69 <69@no-spam.ws>, 2013 +# N69 , 2013 # Kein , 2011 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" -"Last-Translator: N69 <69@no-spam.ws>\n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" +"Last-Translator: delroth \n" "Language-Team: Russian (http://www.transifex.com/projects/p/dolphin-emu/" "language/ru/)\n" "Language: ru\n" @@ -63,12 +63,12 @@ msgstr "%1$sКопировать%1$s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120 #, c-format msgid "%d samples" -msgstr "" +msgstr "%d примеры" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119 #, c-format msgid "%d samples (quality level %d)" -msgstr "" +msgstr "%d примеры (уровень качества %d)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 @@ -114,9 +114,9 @@ msgid "%s failed to open" msgstr "%s не может быть открыт" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s не может быть открыт" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -179,7 +179,7 @@ msgstr "Менеджер &читов" #: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&DSP Settings" -msgstr "&Опции аудио" +msgstr "Настройка &DSP" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879 msgid "&Delete ISO..." @@ -207,7 +207,7 @@ msgstr "&Полноэкранный режим" #: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "&Graphics Settings" -msgstr "&Опции видео" +msgstr "Настройка &видео" #: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" @@ -291,7 +291,7 @@ msgstr "&Вид" #: Source/Core/DolphinWX/Src/FrameTools.cpp:181 msgid "&Wiimote Settings" -msgstr "Опц&ии Wiimote" +msgstr "Настройка &Wiimote" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862 msgid "&Wiki" @@ -318,9 +318,8 @@ msgid "(off)" msgstr "(отключен)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ ДОБАВИТЬ" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -328,7 +327,7 @@ msgstr "0x44" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1.5x Native (960x792)" -msgstr "" +msgstr "1.5x Native (960x792)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148 msgid "16 bit" @@ -336,15 +335,15 @@ msgstr "16 бит" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1x Native (640x528)" -msgstr "" +msgstr "1x Native (640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "2.5x Native (1600x1320)" -msgstr "" +msgstr "2.5x Native (1600x1320)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "2x Native (1280x1056)" -msgstr "" +msgstr "2x Native (1280x1056)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149 msgid "32 bit" @@ -356,11 +355,11 @@ msgstr "3D Vision" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "3x Native (1920x1584)" -msgstr "" +msgstr "3x Native (1920x1584)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "4x Native (2560x2112)" -msgstr "" +msgstr "4x Native (2560x2112)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147 msgid "8 bit" @@ -405,9 +404,10 @@ msgid "" "A supported bluetooth device could not be found.\n" "You must manually connect your wiimotes." msgstr "" +"Поддерживаемых устройств bluetooth не найдено.⏎ Вы должны вручную подключить " +"wiimote'ы." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -423,23 +423,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"ВНИМАНИЕ:\n" -"\n" -"Функция сетевой игры будет корректно работать только при следующих " -"настройках:\n" -" - Режим DualCore [ВЫКЛ]\n" -" - Audio Throttle [ВЫКЛ]\n" -" - DSP-HLE с выводом через \"Null Audio\" или с DSP-LLE\n" -" - Ручная установка кол-ва контроллеров, которые будут использованы в игре, " -"на значение [Standard Controller]\n" -"\n" -"Все игроки должны использовать одинаковую версию эмулятора и одинаковые " -"настройки.\n" -"Рекомендуется выключить поддержку карт памяти или же заранее разослать всем " -"одинаковые.\n" -"Поддержка Wiimote пока отсутствует.\n" -"\n" -"Для создания игры вам необходимо открыть указанный порт на вашем роутере!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -514,6 +497,8 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" +"Ошибка Action Replay: Неверный размер (%08x : address = %08x) в заполнении " +"ОЗУ (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:597 #, c-format @@ -521,11 +506,13 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" +"Ошибка Action Replay: Неверный размер (%08x : address = %08x) в ОЗУ к точке " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:792 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "" +msgstr "Ошибка Action Replay: Неверное значение (%08x) в копии памяти (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:672 #, c-format @@ -533,31 +520,33 @@ msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" +"Ошибка Action Replay: основной код и запись в CCXXXXXX не реализована (%s) ⏎ " +"основные коды не нужны. Не используйте основные кодоы." #: Source/Core/Core/Src/ActionReplay.cpp:184 #, c-format msgid "Action Replay Error: invalid AR code line: %s" -msgstr "" +msgstr "Ошибка Action Replay: неверная линия AR кода: %s" #: Source/Core/Core/Src/ActionReplay.cpp:862 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" -msgstr "" +msgstr "Action Replay: Неврный размер условного кода %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:935 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" -msgstr "" +msgstr "Action Replay: Неверный тип нормального кода %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:886 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" -msgstr "" +msgstr "Action Replay: Нормальный код %i: неверный подтип %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:828 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" -msgstr "" +msgstr "Action Replay: Нормальный код 0: неверный подтип %08x (%s)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248 msgid "Adapter:" @@ -614,7 +603,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" +msgstr "Настройка давления аналога, необходима для активации кнопок." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -675,7 +664,7 @@ msgstr "Загрузчик неверноего размера... это точ #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293 msgid "Apploader unable to load from file" -msgstr "" +msgstr "Загрузчик недоступен при загрузке из файла" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:834 msgid "Apploader:" @@ -691,6 +680,8 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" +"Включить эффекты пост-процесса после завершения кадра. ⏎ ⏎ Если не уверены, " +"выберете (выкл)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" @@ -715,7 +706,7 @@ msgstr "Вы уверены, что хотите удалить этот фай #: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" -msgstr "" +msgstr "Arm JIT (экспериментальный)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 @@ -762,6 +753,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Автоматическая настройка размера окна под ваше внутренние разрешение.⏎ ⏎ " +"Если вы не уверены, то галочку не ставьте." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705 msgid "B" @@ -832,7 +825,7 @@ msgstr "Басы" #: Source/Core/Core/Src/HW/GCMemcard.cpp:174 msgid "Block Allocation Table checksum failed" -msgstr "" +msgstr "Блок таблицы размещения контрольной суммы неудачна" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 msgid "Blocks" @@ -858,7 +851,7 @@ msgstr "снизу" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229 #, c-format msgid "Bound Controls: %lu" -msgstr "" +msgstr "Элементы управления с привязкой: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Broken" @@ -1194,9 +1187,8 @@ msgstr "Подключиться" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Подключить USB-клавиатуру" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1233,7 +1225,7 @@ msgstr "Консоль" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88 msgid "Continuous Scanning" -msgstr "" +msgstr "Непрерывное сканирование" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:33 msgid "Control" @@ -1308,7 +1300,7 @@ msgstr "" msgid "" "Couldn't init the core.\n" "Check your configuration." -msgstr "" +msgstr "Невозможно инициализировать ядро.⏎ Проверьте вашу конфигурацию." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 @@ -1473,9 +1465,8 @@ msgid "Decompressing ISO" msgstr "Распаковка ISO..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Обновление списка игр" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1553,7 +1544,7 @@ msgstr "Отключен" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "Отключить направление альфы" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1718,13 +1709,10 @@ msgid "Dolphin was unable to complete the requested action." msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Активирует режим быстрого доступ к диску, необходим для некоторых игр " -"(отключите для повышения совместимости)." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -1951,7 +1939,7 @@ msgstr "Включить режим \"Сохранения экрана\"" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Enable Speaker Data" -msgstr "" +msgstr "Включить динамик" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" @@ -2134,9 +2122,8 @@ msgid "Exit" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Экспортировать все сохранения" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2167,9 +2154,8 @@ msgid "Export all saves" msgstr "Экспортировать все сохранения" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Экспорт неудачен" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2299,7 +2285,7 @@ msgstr "Ошибка чтения banner.bin" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" -msgstr "" +msgstr "Невозможно прочитать bk-заголовок" #: Source/Core/Core/Src/HW/GCMemcard.cpp:211 #, c-format @@ -2329,7 +2315,7 @@ msgstr "Ошибка чтения данных из файла %d" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" -msgstr "" +msgstr "Невозможно прочитать данные из файла: %s" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "" @@ -2347,7 +2333,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" -msgstr "" +msgstr "Невозможно прочитать заголовок" #: Source/Core/Core/Src/HW/GCMemcard.cpp:107 msgid "" @@ -2356,9 +2342,9 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Ошибка записи заголовка для файла %d" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2373,9 +2359,9 @@ msgid "Failed to write bkhdr" msgstr "Ошибка записи bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Ошибка чтения данных из файла %d" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2535,9 +2521,9 @@ msgid "Found %d results for '" msgstr "Найдено %d результатов для '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Не удалось сохранить %s" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2629,7 +2615,7 @@ msgstr "Игра не запущена!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" -msgstr "" +msgstr "Игры не найдены!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" @@ -2911,14 +2897,12 @@ msgid "Import Save" msgstr "Импортировать сохранение" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Импортировать сохранение" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Экспорт неудачен" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -2945,9 +2929,8 @@ msgid "In Game" msgstr "Почти играбельна" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Лимит кадров:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3047,7 +3030,7 @@ msgstr "Внутреннее разрешение:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" -msgstr "" +msgstr "Интерпретатор (ОЧЕНЬ медленно)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" @@ -3118,11 +3101,11 @@ msgstr "ЯПОНИЯ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" -msgstr "" +msgstr "JIT-рекомпилятор (рекомендуется)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" -msgstr "" +msgstr "JITIL-экспериментальный рекомпилятор" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 @@ -3227,91 +3210,80 @@ msgid "Load Custom Textures" msgstr "Использовать свои текстуры" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "Быстрая &загрузка" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Загрузить \"быстрое сохранение\" 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Загрузить \"быстрое сохранение\" 2" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Загрузить \"быстрое сохранение\" 3" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Загрузить \"быстрое сохранение\" 4" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Загрузить \"быстрое сохранение\" 5" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Загрузить \"быстрое сохранение\" 6" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Загрузить \"быстрое сохранение\" 7" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Загрузить \"быстрое сохранение\" 8" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" -msgstr "Загрузить \"быстрое сохранение\" 1" +msgstr "Быстрая загрузка 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Загрузить \"быстрое сохранение\" 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" -msgstr "Загрузить \"быстрое сохранение\" 2" +msgstr "Быстрая загрузка 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 msgid "Load State Slot 3" -msgstr "Загрузить \"быстрое сохранение\" 3" +msgstr "Быстрая загрузка 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 msgid "Load State Slot 4" -msgstr "Загрузить \"быстрое сохранение\" 4" +msgstr "Быстрая загрузка 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 msgid "Load State Slot 5" -msgstr "Загрузить \"быстрое сохранение\" 5" +msgstr "Быстрая загрузка 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 msgid "Load State Slot 6" -msgstr "Загрузить \"быстрое сохранение\" 6" +msgstr "Быстрая загрузка 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 msgid "Load State Slot 7" -msgstr "Загрузить \"быстрое сохранение\" 7" +msgstr "Быстрая загрузка 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 msgid "Load State Slot 8" -msgstr "Загрузить \"быстрое сохранение\" 8" +msgstr "Быстрая загрузка 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Загрузить \"быстрое сохранение\" 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3663,7 +3635,7 @@ msgstr "ISO/WAD-файлов не обнаружено" #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "" +msgstr "Нет вывода звука" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format @@ -4132,9 +4104,8 @@ msgid "Record" msgstr "Запись" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Опции записи" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4212,7 +4183,7 @@ msgstr "Enter" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "Ревизия:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 @@ -4256,56 +4227,52 @@ msgid "Save GCI as..." msgstr "Сохранить CGI-файл как..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Быстрое &сохранение" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Быстрое &сохранение" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" -msgstr "Слот \"быстрого сохранения\" 1" +msgstr "Быстрое сохранение 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Слот \"быстрого сохранения\" 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" -msgstr "Слот \"быстрого сохранения\" 2" +msgstr "Быстрое сохранение 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 msgid "Save State Slot 3" -msgstr "Слот \"быстрого сохранения\" 2" +msgstr "Быстрое сохранение 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 msgid "Save State Slot 4" -msgstr "Слот \"быстрого сохранения\" 4" +msgstr "Быстрое сохранение 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 msgid "Save State Slot 5" -msgstr "Слот \"быстрого сохранения\" 5" +msgstr "Быстрое сохранение 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 msgid "Save State Slot 6" -msgstr "Слот \"быстрого сохранения\" 6" +msgstr "Быстрое сохранение 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 msgid "Save State Slot 7" -msgstr "Слот \"быстрого сохранения\" 7" +msgstr "Быстрое сохранение 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 msgid "Save State Slot 8" -msgstr "Слот \"быстрого сохранения\" 8" +msgstr "Быстрое сохранение 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Слот \"быстрого сохранения\" 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4526,9 +4493,8 @@ msgid "Settings..." msgstr "Настройки..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Файл настроек не найден" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4559,9 +4525,8 @@ msgid "Show &Toolbar" msgstr "Отображать панель &инструментов" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Сброс" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -4901,13 +4866,15 @@ msgstr "Покачивание" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" -msgstr "" +msgstr "Синхронизировать поток GPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" msgstr "" +"Синхронизировать GPU и CPU потоки, для исправления случайных зависаний в " +"Двухядерном режиме. (ВКЛ = Совместимость, ВЫКЛ = Скорость)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 @@ -5159,14 +5126,12 @@ msgid "Toggle All Log Types" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Соотношение сторон:" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Копии" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 msgid "Toggle Fog" @@ -5266,13 +5231,12 @@ msgid "Undo Load State" msgstr "Отменить загрузку" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Отменить загрузку" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Неожиданный вызов 0x80? Отмена..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192 msgid "Unknown" @@ -5286,7 +5250,7 @@ msgstr "Неизвестная комманда DVD %08x - критическа #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444 #, c-format msgid "Unknown command 0x%08x" -msgstr "" +msgstr "Неизвестная команда 0x%08x" #: Source/Core/Common/Src/SysConf.cpp:132 #, c-format @@ -5376,9 +5340,8 @@ msgid "V-Sync" msgstr "V-Sync" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "Ускорить MMU (спидхак)" +msgstr "Ускорение VBeam" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5594,7 +5557,7 @@ msgstr "Подождите..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "Записывать карты памяти (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -5766,9 +5729,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Получено неизвестное сообщение с id : %d" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -5785,60 +5747,3 @@ msgstr "zNear Коррекция: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| ИЛИ" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Аккуратная VBeam эмуляция" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Включить горячие клавиши" - -#~ msgid "Export failed, try again?" -#~ msgstr "Экспорт неудачен, повторить?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Нельзя прослушать!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Невозможно загрузить bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Ошибка подключения hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Настройка GCMic" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "Вызван HCI_CMD_INQUIRY, пожалуйста сообщите!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Если FPS прыгает, эта опция может помочь. (ВКЛ = Совместимость, ВЫКЛ = " -#~ "Ускорение)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Ошибка импорта, попробовать еще раз?" - -#~ msgid "In-Game" -#~ msgstr "В игре" - -#~ msgid "Last Overwritten State" -#~ msgstr "Последнее перезаписанное сохранение" - -#~ msgid "Last Saved State" -#~ msgstr "Последнее сохранение" - -#~ msgid "Local" -#~ msgstr "Локальный" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Переподключить Wiimote 1, при загрузке \"быстрых сохранений\"" - -#~ msgid "Set" -#~ msgstr "Выбрать" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Пропустить Dest. Alpha доступ" - -#~ msgid "Wii Save Import" -#~ msgstr "Импорт сохранений Wii" diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 2a94544d90..021deff775 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -9,9 +9,10 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" "Last-Translator: delroth \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Serbian (http://www.transifex.com/projects/p/dolphin-emu/" +"language/sr/)\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,9 +106,9 @@ msgid "%s failed to open" msgstr "%s nije uspelo da otvori" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s nije uspelo da otvori" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -309,9 +310,8 @@ msgid "(off)" msgstr "(iskljucen/o)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ DODAJ" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -2096,9 +2096,8 @@ msgid "Export all saves" msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "Kopiranje neuspesno " +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2829,9 +2828,8 @@ msgid "Import Wii Save" msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Kopiranje neuspesno " +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3127,58 +3125,48 @@ msgid "Load Custom Textures" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "Loaduj Savestate" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Ucitaj State Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Ucitaj State Slot 2" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Ucitaj State Slot 3" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Ucitaj State Slot 4" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Ucitaj State Slot 5" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Uci State Slot 6" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Ucitaj State Slot 7" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Ucitaj State Slot 8" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Ucitaj State Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Ucitaj State Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3209,9 +3197,8 @@ msgid "Load State Slot 8" msgstr "Ucitaj State Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Ucitaj State Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -4027,9 +4014,8 @@ msgid "Record" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Pokreni snimanje " +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4151,23 +4137,20 @@ msgid "Save GCI as..." msgstr "Snimaj GCI kao..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Snimaj state..." +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Snimaj state..." +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Snimaj State Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Snimaj State Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4198,9 +4181,8 @@ msgid "Save State Slot 8" msgstr "Snimaj State Slot 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Snimaj State Slot 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -5135,9 +5117,8 @@ msgid "Undo Load State" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Snimaj state..." +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5647,6 +5628,3 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| ILI" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Tacna VBeam emulacija" diff --git a/Languages/po/sv.po b/Languages/po/sv.po index 8633797f41..c3edd5e6fc 100644 --- a/Languages/po/sv.po +++ b/Languages/po/sv.po @@ -4,12 +4,13 @@ # # Translators: # DolphinPhoenix , 2013 +# DolphinPhoenix , 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-23 06:37-0500\n" +"PO-Revision-Date: 2013-09-11 20:36+0000\n" "Last-Translator: DolphinPhoenix \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/dolphin-emu/" "language/sv/)\n" @@ -103,7 +104,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s misslyckades att läsas in som ett minneskort.\n" -"Filen är inte tillräckligt stor för att vara en riktig minneskortsfil (0x%x " +"Filen är inte tillräckligt stor för att vara en giltig minneskortsfil (0x%x " "bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 @@ -112,9 +113,9 @@ msgid "%s failed to open" msgstr "%s misslyckades att öppnas" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s misslyckades att öppnas" +msgstr "%s misslyckades: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -205,7 +206,7 @@ msgstr "&Helskärm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "&Graphics Settings" -msgstr "&Grafikinställningar" +msgstr "G&rafikinställningar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:304 msgid "&Help" @@ -213,7 +214,7 @@ msgstr "&Hjälp" #: Source/Core/DolphinWX/Src/FrameTools.cpp:182 msgid "&Hotkey Settings" -msgstr "&Kortkommandoinställningar" +msgstr "&Kortkommandosinställningar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:237 msgid "&JIT" @@ -221,7 +222,7 @@ msgstr "&JIT" #: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "&Load State" -msgstr "&Läs in snabbsparning" +msgstr "L&äs in snabbsparning" #: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Memcard Manager (GC)" @@ -253,7 +254,7 @@ msgstr "&Egenskaper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "&Read-only mode" -msgstr "&Skrivskyddat läge" +msgstr "S&krivskyddat läge" #: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Refresh List" @@ -273,7 +274,7 @@ msgstr "&Ljud" #: Source/Core/DolphinWX/Src/FrameTools.cpp:337 msgid "&Stop" -msgstr "&Stoppa" +msgstr "S&toppa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:211 msgid "&Tools" @@ -316,9 +317,8 @@ msgid "(off)" msgstr "(av)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ LÄGG TILL" +msgstr "+ ADDERA" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -407,7 +407,6 @@ msgstr "" "Du måste ansluta dina wiimotes manuellt." #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -423,15 +422,13 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"!!FUZZY!!VARNING:\n" +"VARNING:\n" "\n" "Nätspel kommer bara fungera med följande inställningar:\n" " - Aktivera dubbla kärnor [AV]\n" " - DSP-emulatormotorn måste vara likadana på alla datorer!\n" " - DSP på tillägnad tråd [AV]\n" " - Bildrutegränsen ska inte vara inställd på [Ljud]\n" -" - Manuellt angivit det exakta antalet kontroller som ska användas som " -"[Standardkontroll]\n" "\n" "Alla spelare bör ha samma inställningar och version av Dolphin.\n" "Alla minneskort måste antingen vara identiska mellan spelare eller " @@ -727,7 +724,7 @@ msgstr "Arabiska" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "Vill du verkligen raders \"%s\"?" +msgstr "Vill du verkligen radera \"%s\"?" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "" @@ -831,7 +828,7 @@ msgstr "Dålig headerfil" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balansbräda" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -1033,7 +1030,7 @@ msgstr "Byt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "Change &Disc..." -msgstr "Byt &skiva" +msgstr "Byt s&kiva" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167 msgid "Change Disc" @@ -1109,11 +1106,11 @@ msgstr "Välj en standard-ISO:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" -msgstr "Välj en filkatalog att läggas till" +msgstr "Välj en filkatalog att lägga till" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060 msgid "Choose a file to open" -msgstr "Välj en fil som ska öppnas" +msgstr "Välj en fil att öppna" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 msgid "Choose a memory card:" @@ -1130,7 +1127,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" -msgstr "Välj extraheringsmappen" +msgstr "Välj mappen att extrahera till" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:285 msgid "Circle Stick" @@ -1152,8 +1149,8 @@ msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." msgstr "" -"Klienten avröt anslutningen medan spelet körs!! Nätspel är inaktiverat. Du " -"måste stoppa spelet manuellt." +"Klienten avbryter anslutningen medan spelet körs!! Nätspel är inaktiverat. " +"Du måste stoppa spelet manuellt." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 @@ -1239,9 +1236,8 @@ msgstr "Anslut" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "Anslut USB-tangentbord" +msgstr "Anslut balansbräda" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1465,9 +1461,8 @@ msgid "DSP settings" msgstr "DSP-inställningar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "DSP på tillägnad tråd" +msgstr "DSPLLE på separat tråd" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1484,7 +1479,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "Dansmatta" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1533,9 +1528,8 @@ msgid "Decompressing ISO" msgstr "Avkomprimerar ISO" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Uppdatera spellista" +msgstr "Sänk bildrutegräns" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1561,7 +1555,7 @@ msgstr "Radera sparning" #: Source/Core/VideoCommon/Src/AVIDump.cpp:64 #, c-format msgid "Delete the existing file '%s'?" -msgstr "Radera existerande filen '%s'?" +msgstr "Radera den existerande filen '%s'?" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680 msgid "Description" @@ -1621,7 +1615,7 @@ msgstr "Inaktivera Destination Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" -msgstr "Inaktivera moln" +msgstr "Inaktivera dimma" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" @@ -1676,7 +1670,7 @@ msgstr "Diskläsningsfel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 msgid "Display" -msgstr "Visa" +msgstr "Skärm" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" @@ -1739,11 +1733,42 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin-teamet\n" +"\n" +"Förgrening: %s\n" +"Version: %s\n" +"Kompilerad: %s, kl %s\n" +"\n" +"Dolphin är en emulator för Gamecube/Wii, som\n" +"skrevs ursprungligen av F|RES och ector.\n" +"Idag är Dolphin ett projekt med öppen källkod med\n" +"många bidragsgivare, för många för att kunna lista upp.\n" +"Om du är intresserad kan du gå till projektsidan på\n" +"http://code.google.com/p/dolphin-emu/.\n" +"\n" +"Jättestort tack till Bushing, Costis, CrowTRobo,\n" +"Marcan, Segher, Titanik, or9 och Hotquik för deras\n" +"omvända ingenjörskonst och dokumentation/demos.\n" +"\n" +"Stort tack till Gilles Mouchard, vars Microlib PPC-\n" +"emulator som gav vår utveckling en rivstart.\n" +"\n" +"Tack till Frank Wille för hans PowerPC-dissambler, som\n" +"or9 och vi modifierade för att inkludera detaljer om Gekko.\n" +"\n" +"Tack till hcs/destop för deras GC ADPCM-dekoder.\n" +"\n" +"Vi har ingen koppling till Nintendo på något sätt.\n" +"Gamecube och Wii är varumärken som tillhör Nintendo.\n" +"Emulatorn är endast för utbildningsändamål och bör\n" +"inte användas för att spela spel som du inte äger \n" +"på ett lagligt sätt." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" -msgstr "Dolphin %s grafikkonfiguration" +msgstr "Dolphin %s-grafikkonfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:299 msgid "Dolphin &Web Site" @@ -1755,7 +1780,7 @@ msgstr "Dolphin-konfiguration" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197 msgid "Dolphin Emulated Wiimote Configuration" -msgstr "Dolphin emulerad Wiimote-konfiguration" +msgstr "Dolphin konfiguration för emulerad Wiimote" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382 msgid "Dolphin FIFO" @@ -1772,7 +1797,7 @@ msgstr "Dolphin TAS-filmer (*.dtm)" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8 msgid "Dolphin Wiimote Configuration" -msgstr "Dolphin Wiimote-konfiguration" +msgstr "Dolphin konfiguration för Wiimote" #: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" @@ -1924,7 +1949,7 @@ msgstr "Redigera konfig." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "Redigera lokala upphävanden" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -2031,7 +2056,7 @@ msgstr "Aktivera fusk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" -msgstr "Aktivera dubbel kärna" +msgstr "Aktivera dubbla kärnor" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" @@ -2191,7 +2216,7 @@ msgstr "Engelska" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418 msgid "Enhancements" -msgstr "Förbättring" +msgstr "Förbättringar" #: Source/Core/DolphinWX/Src/FrameAui.cpp:640 msgid "Enter a name for the new perspective:" @@ -2220,7 +2245,8 @@ msgstr "Fel" #: Source/Core/DolphinWX/Src/Main.cpp:424 msgid "Error loading selected language. Falling back to system default." msgstr "" -"Fel uppstod när valt språk lästes in. Byter tillbaka till systemstandard." +"Fel uppstod när valt språk skulle läsas in. Byter tillbaka till " +"systemstandard." #: Source/Core/Common/Src/ChunkFile.h:221 #, c-format @@ -2260,12 +2286,11 @@ msgstr "Utför" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Avsluta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Exportera alla sparningar" +msgstr "Exportera alla Wii-sparningar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2296,7 +2321,6 @@ msgid "Export all saves" msgstr "Exportera alla sparningar" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" msgstr "Exportering misslyckades" @@ -2418,6 +2442,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Misslyckades att läsa in bthprops.cpl! Det går inte att ansluta riktiga " +"Wiimotes och Dolphin kan krascha utan förvarning!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2425,6 +2451,8 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"Misslyckades att läsa in hid.dll! Det går inte att ansluta riktiga Wiimotes " +"och Dolphin kan krascha utan förvarning!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2506,9 +2534,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "Misslyckades att skriva header för filen %d" +msgstr "Misslyckades att läsa header för filen %d" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2523,9 +2551,9 @@ msgid "Failed to write bkhdr" msgstr "Misslyckades att skriva bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "Misslyckades att läsa data från fil: %s" +msgstr "Misslyckades att skriva data till fil: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2542,7 +2570,7 @@ msgstr "Snabb" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "Snabb kalkylering av djup" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." @@ -2661,7 +2689,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Tvingar spelets grafikutdata att visas i bredskärmsupplösning.\n" +"Tvingar spelets grafikutdata att visas i bredbildsupplösning.\n" "Orsakar grafikbuggar i några spel.\n" "\n" "Om du är osäker kan du lämna detta omarkerat." @@ -2691,17 +2719,17 @@ msgstr "Framåt" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "Framåtport (UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format msgid "Found %d results for '" -msgstr "HIttade %d resultar för '" +msgstr "Hittade %d resultat för '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "Kunde inte spara %s" +msgstr "Hittade %x sparningsfiler" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2813,7 +2841,7 @@ msgstr "GameCube" #: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "Gamecube &Pad Settings" -msgstr "Inställningar för GameCube-&kontroller" +msgstr "Inställningar för &GameCube-kontroller" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:205 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064 @@ -2885,12 +2913,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Höjer kraftigt kvaliteten på texturer som generaras med hjälp av " +"Höjer kraftigt kvaliteten på texturer som genereras med hjälp av " "textureffekter.\n" "Att höja den interna upplösningen kommer att förbättra effekten av denna " "inställning.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" +"Sänker prestandan en aning och kan orsaka fel (vilket är osannolikt).\n" "\n" "Om du är osäker kan du lämna detta markerat." @@ -3000,7 +3027,7 @@ msgstr "Värd" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:31 msgid "Hotkey Configuration" -msgstr "Kortkommandokonfiguration" +msgstr "Kortkommandoskonfiguration" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 @@ -3060,7 +3087,7 @@ msgstr "ISO-detaljer" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "ISO Directories" -msgstr "ISO-filkatalog" +msgstr "ISO-filmapp" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:166 msgid "ITALY" @@ -3113,17 +3140,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:791 msgid "Import Save" -msgstr "Importera sparningar" +msgstr "Importera sparning" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Importera sparningar" +msgstr "Importera Wii-sparning" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Exportering misslyckades" +msgstr "Importering misslyckades" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3150,9 +3175,8 @@ msgid "In Game" msgstr "I spelet" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Bildrutegräns:" +msgstr "Höj bildrutegräns" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3173,7 +3197,7 @@ msgstr "Sätt in" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166 msgid "Insert Encrypted or Decrypted code here..." -msgstr "Sätt in krypterad eller dekrypterad kod här..." +msgstr "Skriv in krypterad eller dekrypterad kod här..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" @@ -3263,7 +3287,7 @@ msgstr "Intro" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" -msgstr "Ogiltig stolek (%x) eller magiskt ord (%x)" +msgstr "Ogiltig storlek (%x) eller magiskt ord (%x)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617 msgid "Invalid Value!" @@ -3384,7 +3408,7 @@ msgstr "Språk:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Senaste %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" @@ -3442,58 +3466,48 @@ msgid "Load Custom Textures" msgstr "Läs in anpassade texturer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "&Läs in snabbsparning" +msgstr "Läs in snabbsparning" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Läs in snabbsparningsspår 1" +msgstr "Läs in senaste snabbsparning 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Läs in snabbsparningsspår 2" +msgstr "Läs in senaste snabbsparning 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Läs in snabbsparningsspår 3" +msgstr "Läs in senaste snabbsparning 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Läs in snabbsparningsspår 4" +msgstr "Läs in senaste snabbsparning 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Läs in snabbsparningsspår 5" +msgstr "Läs in senaste snabbsparning 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Läs in snabbsparningsspår 6" +msgstr "Läs in senaste snabbsparning 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Läs in snabbsparningsspår 7" +msgstr "Läs in senaste snabbsparning 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Läs in snabbsparningsspår 8" +msgstr "Läs in senaste snabbsparning 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "Läs in snabbsparningsspår 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Läs in snabbsparningsspår 1" +msgstr "Läs in snabbsparningsspår 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3524,9 +3538,8 @@ msgid "Load State Slot 8" msgstr "Läs in snabbsparningsspår 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Läs in snabbsparningsspår 1" +msgstr "Läs in snabbsparningsspår 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3579,7 +3592,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Logga antalet renderade bildrutor per sekund till User/Logs/fps.txt. Använd " -"denna funktion när du vill mäta på Dolphins prestanda.\n" +"denna funktion när du vill mäta Dolphins prestanda.\n" "\n" "Om du är osäker kan du lämna detta omarkerat." @@ -3703,7 +3716,7 @@ msgstr "Meny" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" -msgstr "Mikr" +msgstr "Mikrofon" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115 @@ -3926,7 +3939,7 @@ msgstr "Ingen dockning" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871 msgid "No file loaded" -msgstr "Ingen fil inläst" +msgstr "Ingen fil lästes in" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "No free dir index entries" @@ -4027,7 +4040,7 @@ msgstr "Visningsmeddelanden på skärmen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "&Dokumentation online " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4078,10 +4091,12 @@ msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." msgstr "" +"Öppnar standardkonfigurationen (skrivskyddat) för detta spel i en extern " +"textredigerare." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." -msgstr "" +msgstr "Öppnar användarens specifika upphävanden i en extern textredigerare." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -4159,7 +4174,7 @@ msgstr "Partition %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "Partition finns inte: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4177,7 +4192,7 @@ msgstr "Pausa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:129 msgid "Pause at end of movie" -msgstr "Pausa vid slutet av filmen" +msgstr "Pausa vid slutet av film" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Per-Pixel Lighting" @@ -4348,7 +4363,7 @@ msgstr "RYSSLAND" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "Radie" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4364,7 +4379,7 @@ msgstr "Riktig" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "Riktig balansbräda" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" @@ -4382,9 +4397,8 @@ msgid "Record" msgstr "Spela in" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Inspelningsinställningar" +msgstr "Inspelningsinmatning" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4487,12 +4501,10 @@ msgid "Rumble" msgstr "Vibration" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." msgstr "" -"Kör DSP HLE och LLE på en tillägnad tråd (rekommenderas inte; kan orsaka " -"ljudbuggar med HLE och fryser sig med LLE)." +"Kör DSP LLE på en tillägnad tråd (rekommenderas inte; kan orsaka frysningar)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4517,23 +4529,20 @@ msgid "Save GCI as..." msgstr "Spara GCI som..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Spa&ra snabbsparning" +msgstr "Spara äldsta snabbsparning" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Spa&ra snabbsparning" +msgstr "Spara snabbsparning" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Spara snabbsparningsspår 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Spara snabbsparningsspår 1" +msgstr "Spara snabbsparningsspår 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4564,9 +4573,8 @@ msgid "Save State Slot 8" msgstr "Spara snabbsparningsspår 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Spara snabbsparningsspår 1" +msgstr "Spara snabbsparningsspår 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4605,7 +4613,7 @@ msgstr "Skannar %s" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529 msgid "Scanning for ISOs" -msgstr "Söker efter ISOs" +msgstr "Skannar efter ISOs" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530 msgid "Scanning..." @@ -4671,7 +4679,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:510 msgid "Select a save file to import" -msgstr "Välj en sparningsfil som ska importeras" +msgstr "Välj en sparningsfil att importera" #: Source/Core/DolphinWX/Src/FrameAui.cpp:366 msgid "Select floating windows" @@ -4683,7 +4691,7 @@ msgstr "Öppna fil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Select the save file" -msgstr "Välj snabbsparning" +msgstr "Välj sparningsfilen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" @@ -4705,9 +4713,9 @@ msgid "" msgstr "" "Välj vilket bildformat som ska användas vid rendering:\n" "Auto: Använd det ursprungliga bildförhållandet.\n" -"Tvinga 16:9: Skräcker bilden till ett bildformat på 16:9.\n" -"Tvinga 4:3: Skräcker bilden till ett bildformat på 4:3.\n" -"Skräck till fönster: Sträcker bilden till fönsterstorleken.\n" +"Tvinga 16:9: Sträcker bilden till ett bildformat på 16:9.\n" +"Tvinga 4:3: Sträcker bilden till ett bildformat på 4:3.\n" +"Skräck ut till fönster: Sträcker bilden till fönsterstorleken.\n" "\n" "Om du är osäker kan du välja Auto." @@ -4774,7 +4782,7 @@ msgstr "Skicka" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110 msgid "Sensor Bar Position:" -msgstr "Position av Sensor Bar:" +msgstr "Position för Sensor Bar:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:64 msgid "Separator" @@ -4782,7 +4790,7 @@ msgstr "Avskiljare" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" -msgstr "Serbiriska" +msgstr "Serbiska" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" @@ -4811,16 +4819,15 @@ msgid "" "backend only." msgstr "" "Anger latensen (i millisekunder). Högre värden kan reducera ljudknaster. " -"Endast OpenAL backend." +"Endast för OpenAL-backend." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Inställningar..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Kan inte hitta filinställningar" +msgstr "SetupWiiMem: Kan inte skapa inställningsfil" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4836,7 +4843,7 @@ msgstr "Avtyckarknappar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" -msgstr "Visa &kommandotolk" +msgstr "Visa kommando&tolk" #: Source/Core/DolphinWX/Src/FrameTools.cpp:219 msgid "Show &Log" @@ -4851,9 +4858,8 @@ msgid "Show &Toolbar" msgstr "Visa &verktygsfält" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Standard" +msgstr "Visa standardvärden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5002,7 +5008,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Visa blandade statistiker.\n" +"Visa blandad statistik.\n" "\n" "Om du är osäker kan du lämna detta omarkerat." @@ -5154,11 +5160,11 @@ msgstr "Starta &nätspel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" -msgstr "&Börja spela in" +msgstr "Starta &inspelning" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175 msgid "Start Recording" -msgstr "Börja spela in" +msgstr "Starta inspelning" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302 msgid "State" @@ -5170,7 +5176,7 @@ msgstr "Snabbsparningar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" -msgstr "Styrhjul" +msgstr "Ratt" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57 msgid "Stick" @@ -5219,11 +5225,11 @@ msgstr "Lyckades importera sparningsfiler" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "Svenska" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" -msgstr "Svinga" +msgstr "Svängning " #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" @@ -5288,11 +5294,11 @@ msgstr "Textur" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462 msgid "Texture Cache" -msgstr "Textur-cache" +msgstr "Texturcache" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" -msgstr "Lägg över texturformat" +msgstr "Överlägg för texturformat" #: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" @@ -5399,7 +5405,7 @@ msgstr "Den valda filen \"%s\" finns inte" #: Source/Core/Core/Src/ActionReplay.cpp:186 msgid "The value is invalid" -msgstr "Värdet är felaktigt" +msgstr "Värdet är ogiltigt" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Theme:" @@ -5505,19 +5511,16 @@ msgid "Toggle All Log Types" msgstr "Markera/avmarkera alla loggtyper" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "Bildförhållande:" +msgstr "Slå på/av bildförhållande" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB-kopior" +msgstr "Slå på/av EFB-kopior" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Markera/avmarkera alla loggtyper" +msgstr "Slå på/av dimma" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5526,7 +5529,7 @@ msgstr "Skifta mellan helskärm- och fönsterläge" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "Slå på/av IR" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5620,9 +5623,8 @@ msgid "Undo Load State" msgstr "Ångra inläsning av snabbsparning" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Ångra inläsning av snabbsparning" +msgstr "Ångra snabbsparning" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5695,6 +5697,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Använd en mindre exakt algoritm för att beräkna djupvärden.\n" +"Orsakar fel i några spel med kan ge en hyfsad prestandaacceleration.\n" +"\n" +"Om du är osäker kan du lämna detta markerat." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5717,6 +5723,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Använder osäkra åtgärder för att snabba upp hörnströmning i OpenGL. Det " +"finns inga kända problem på stödjande grafikprocessorer, men det kan annars " +"orsaka allvarlig stabilitet och grafikproblem." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5762,7 +5771,7 @@ msgstr "Avlusningsnivå" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "Hörnströmningshack" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -6069,8 +6078,7 @@ msgstr "Du måste ange ett giltigt profilnamn." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "" -"Du måste starta om Dolphin för att ändringarna ska kunna träda i kraft." +msgstr "Du måste starta om Dolphin för att ändringarna ska träda i kraft." #: Source/Core/Core/Src/DSP/DSPCore.cpp:109 msgid "" @@ -6184,12 +6192,11 @@ msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "okänd funktion %d (förväntade %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Tog emot ett okänt meddelande med id: %d" +msgstr "fick ett okänt meddelande" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6206,95 +6213,3 @@ msgstr "zNear-korrektion: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| ELLER" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Tillåter att växla mellan vissa inställningar med snabbtangenterna 3 " -#~ "(Intern upplösning), 4 (Bildförhållande), 5 (Kopiera EFB) och 6 (Dimma) " -#~ "inom emulatorfönstret.\n" -#~ "\n" -#~ "Om du är osäker kan du lämna detta omarkerat." - -#~ msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#~ msgstr "Kan inte hitta Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Kunde inte konfigurera kontroller. Spelaren lämnade spelet eller så körs " -#~ "spelet för tillfället!\n" -#~ "(Att konfigurera kontroller när spelet körs stöds inte ännu)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Aktivera " - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. " -#~ "Endast OpenAL-backend. Kanske behöver byta namn på soft_oal.dll till " -#~ "OpenAL32.dll för att det ska fungera." - -#~ msgid "Export failed, try again?" -#~ msgstr "Exportering misslyckades, vill du försöka igen?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Misslyckades att lyssna!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "Misslyckades att läsa bthprops.cpl" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "Misslyckades att läsa in hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "Konfiguration av GC-Mikrofon" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY anropade, var god rapportera!" - -#~ msgid "Hacked Buffer Upload" -#~ msgstr "Hackad bufferuppladdning" - -#~ msgid "Import failed, try again?" -#~ msgstr "Importering misslyckades, försöka igen?" - -#~ msgid "In-Game" -#~ msgstr "I spelet" - -#~ msgid "Last Overwritten State" -#~ msgstr "Senast överskrivna snabbsparning" - -#~ msgid "Last Saved State" -#~ msgstr "Senast sparade snabbsparning" - -#~ msgid "Local" -#~ msgstr "Lokal" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Återanslut Wiimote när en snabbsparning läser in" - -#~ msgid "Set" -#~ msgstr "Ange" - -#~ msgid "" -#~ "Use a hacked upload strategy to stream vertices.\n" -#~ "This usually speed up, but is forbidden by OpenGL specification and may " -#~ "causes heavy glitches.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Använd en hackad uppladdningsstrategi för att strömma hörn.\n" -#~ "Detta höjer vanligtvis hastigheten, men är förbjuden enligt OpenGL:s " -#~ "specifikationer och kan orsaka en del större buggar.\n" -#~ "\n" -#~ "Om du är osäker kan du lämna detta omarkerat." - -#~ msgid "Wii Save Import" -#~ msgstr "Importera Wii-sparningar" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index c6c5de5e96..3fd31ca59c 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" +"PO-Revision-Date: 2013-09-12 05:20+0000\n" "Last-Translator: mustafacan \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/dolphin-emu/" "language/tr/)\n" @@ -114,9 +114,9 @@ msgid "%s failed to open" msgstr "%s açılamadı" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "%s açılamadı" +msgstr "%s başarısız: kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -318,9 +318,8 @@ msgid "(off)" msgstr "(kapalı)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ EKLE" +msgstr "+ EKLE" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -328,7 +327,7 @@ msgstr "0x44" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1.5x Native (960x792)" -msgstr "" +msgstr "Orjinalin 1.5 katı (960x792)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148 msgid "16 bit" @@ -336,15 +335,15 @@ msgstr "16 bit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1x Native (640x528)" -msgstr "" +msgstr "Orjinalin 1 katı (640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "2.5x Native (1600x1320)" -msgstr "" +msgstr "Orjinalin 2.5 katı (1600x1320)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "2x Native (1280x1056)" -msgstr "" +msgstr "Orjinalin 2 katı (1280x1056)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149 msgid "32 bit" @@ -356,11 +355,11 @@ msgstr "3D Vision" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "3x Native (1920x1584)" -msgstr "" +msgstr "Orjinalin 3 katı (1920x1584)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "4x Native (2560x2112)" -msgstr "" +msgstr "Orjinalin 4 katı (2560x2112)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147 msgid "8 bit" @@ -407,7 +406,6 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -423,21 +421,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"UYARI:\n" -"\n" -"NetPlay sadece aşağıdaki ayarlarda çalışabilir:\n" -" - Çift Çekirdek [KAPALI]\n" -" - Ses Hızlanması [KAPALI]\n" -" - \"Geçersiz Ses\"ile DSP-HLE veya DSP-LLE\n" -" - Kullanılacak denetim aygıtı sayısını elle belirleyin.[Standart Denetim " -"Aygıtı]\n" -"\n" -"Tüm oyuncular aynı Dolphin sürümü ve ayarlarını kullanmalıdır.\n" -"Başlamadan önce hafıza kartınız varsa diğer oyunculara gönderin veya iptal " -"edin.\n" -"Wiimote desteği uygulanmamıştır.\n" -"\n" -"TCP bağlantı noktanızı barındırıcıya yönlendirmelisiniz!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -682,7 +665,7 @@ msgstr "Analiz et" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:286 msgid "Angle" -msgstr "" +msgstr "Açı" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376 msgid "Anisotropic Filtering:" @@ -743,7 +726,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" -msgstr "" +msgstr "Arm JIT (deneysel)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 @@ -830,7 +813,7 @@ msgstr "Kötü Dosya Başı" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "Balance Board" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -969,12 +952,12 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" -msgstr "" +msgstr "Sap bağlantısı ile Wiimote bulunamadı: %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:672 #: Source/Core/Core/Src/HW/DVDInterface.cpp:682 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" +msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 @@ -1236,9 +1219,8 @@ msgstr "Bağlan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "USB Klavye Bağla" +msgstr "Balance Board Bağla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1341,6 +1323,13 @@ msgid "" "If so, then you may need to re-specify your memory card location in the " "options." msgstr "" +"Hafıza kartı dosyası %s yazılamadı. \n" +"\n" +"Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma " +"korumalı.\n" +"\n" +"Bunu emulatör klasörünü taşıdıktan sonra mı görüyorsunuz?\n" +"Eğer öyleyse, ayarlardan memory card konumlarını düzeltin." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" @@ -1403,6 +1392,7 @@ msgstr "Geçişli" #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" msgstr "" +"wx Dosya Seçiciden sonra şu anki konum %s 'den %s 'ye değiştirilmiştir." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" @@ -1455,7 +1445,7 @@ msgstr "Ses ayarları" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "DSPLLE on Separate Thread" -msgstr "" +msgstr "Ayrı İşlem Birimi Üzerinde DSP LLE" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1520,9 +1510,8 @@ msgid "Decompressing ISO" msgstr "Kalıp genişletiliyor..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "Oyun Listesini Yenile" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1640,7 +1629,6 @@ msgstr "" "Emin değilseniz, işaretsiz bırakın." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" @@ -1684,7 +1672,7 @@ msgstr "Emülasyonu durdurmak istiyor musunuz?" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:650 msgid "Dolby Pro Logic II decoder" -msgstr "" +msgstr "Dolby Pro Logic II dekoder" #: Source/Core/DolphinWX/Src/FrameTools.cpp:901 msgid "Dolphin" @@ -1786,13 +1774,10 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin istenen işlemi gerçekleştiremedi." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" msgstr "" -"Disk erişimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı " -"= Uyumlu)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2046,7 +2031,7 @@ msgstr "Ekran Koruyucusuna İzin Ver" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Enable Speaker Data" -msgstr "" +msgstr "Hoparlör verisine izin ver" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" @@ -2125,11 +2110,15 @@ msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" +"5.1 surround sistemini kullanarak Dolby Pro Logic II'nin emulasyonunu " +"etkinleştir. OSX'de kullanılamaz." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:518 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" +"5.1 surround sistemini kullanarak Dolby Pro Logic II'nin emulasyonunu " +"etkinleştir. Sadece OpenAL backend." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" @@ -2242,12 +2231,11 @@ msgstr "Yürüt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "Çıkış" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "Tüm Kayıtları Ver" +msgstr "Tüm Wii Kayıtlarını Ver" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2278,7 +2266,6 @@ msgid "Export all saves" msgstr "Tüm Kayıtları Ver" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" msgstr "Verme başarısız." @@ -2418,7 +2405,7 @@ msgstr "banner.bin okunamadı." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" -msgstr "" +msgstr "bk başlığı okunamadı" #: Source/Core/Core/Src/HW/GCMemcard.cpp:211 #, c-format @@ -2455,7 +2442,7 @@ msgstr "%d dosyasından veri okunamadı." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" -msgstr "" +msgstr "%s dosyasından veri okunamadı" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "" @@ -2475,7 +2462,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" -msgstr "" +msgstr "Başlık okunamadı" #: Source/Core/Core/Src/HW/GCMemcard.cpp:107 msgid "" @@ -2486,9 +2473,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "%d dosyası için başlık yazılamadı." +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2503,9 +2490,9 @@ msgid "Failed to write bkhdr" msgstr "bkhdr yazılamadı." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "%d dosyasından veri okunamadı." +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2678,9 +2665,9 @@ msgid "Found %d results for '" msgstr "Bunun için %d sonuçlarını bul: '" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "%s kaydedilemedi." +msgstr "%x kayıt dosyası bulundu" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2772,7 +2759,7 @@ msgstr "Oyun çalışmıyor!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" -msgstr "" +msgstr "Oyun bulunamadı!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" @@ -2784,7 +2771,7 @@ msgstr "Oyun Yapılandırması" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:515 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "GameCube kayıtlı oyun dosyası(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Gamecube" @@ -2995,6 +2982,10 @@ msgid "" "TitleID %016llx.\n" " Dolphin will likely hang now." msgstr "" +"IOCTL_ES_LAUNCH: Oyun IOS'u veya başlığı yeniden yüklemeyi denedi ve bu " +"sizin NAND dökümünüze uyumlu değil.\n" +"Başlık ID %016llx.\n" +" Dolphin çakılacak gibi gözüküyor." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" @@ -3077,14 +3068,12 @@ msgid "Import Save" msgstr "Kayıt Al" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "Kayıt Al" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "Verme başarısız." +msgstr "Kayıt alma başarısız" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3111,9 +3100,8 @@ msgid "In Game" msgstr "Oyun İçi" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "Çerçeve Sınırı:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3216,7 +3204,7 @@ msgstr "İç Çözünürlük:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" -msgstr "" +msgstr "Interpreter (ÇOK yavaş)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" @@ -3287,11 +3275,11 @@ msgstr "JAPONYA" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" -msgstr "" +msgstr "JIT derleyici (önerilir)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" -msgstr "" +msgstr "JITIL deneysel derleyici" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 @@ -3346,11 +3334,11 @@ msgstr "Dil:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "Son %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" -msgstr "" +msgstr "Gecikme:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:264 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 @@ -3404,91 +3392,80 @@ msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "Durumu Yük&le" +msgstr "Durumu Yükle" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "Durumu Yükle : 1" +msgstr "Son Durumu Yükle: 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "Durumu Yükle : 2" +msgstr "Son Durumu Yükle: 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "Durumu Yükle : 3" +msgstr "Son Durumu Yükle: 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "Durumu Yükle : 4" +msgstr "Son Durumu Yükle: 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "Durumu Yükle : 5" +msgstr "Son Durumu Yükle: 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "Durumu Yükle : 6" +msgstr "Son Durumu Yükle: 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "Durumu Yükle : 7" +msgstr "Son Durumu Yükle: 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "Durumu Yükle : 8" +msgstr "Son Durumu Yükle: 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" -msgstr "Durumu Yükle : 1" +msgstr "Durumu Yükle: 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "Durumu Yükle : 1" +msgstr "Durumu Yükle: 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" -msgstr "Durumu Yükle : 2" +msgstr "Durumu Yükle: 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 msgid "Load State Slot 3" -msgstr "Durumu Yükle : 3" +msgstr "Durumu Yükle: 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 msgid "Load State Slot 4" -msgstr "Durumu Yükle : 4" +msgstr "Durumu Yükle: 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 msgid "Load State Slot 5" -msgstr "Durumu Yükle : 5" +msgstr "Durumu Yükle: 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 msgid "Load State Slot 6" -msgstr "Durumu Yükle : 6" +msgstr "Durumu Yükle: 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 msgid "Load State Slot 7" -msgstr "Durumu Yükle : 7" +msgstr "Durumu Yükle: 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 msgid "Load State Slot 8" -msgstr "Durumu Yükle : 8" +msgstr "Durumu Yükle: 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "Durumu Yükle : 1" +msgstr "Durumu Yükle: 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3527,7 +3504,7 @@ msgstr "Geçmiş Yapılandırması" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Log FPS to file" -msgstr "" +msgstr "FPS'yi dosyaya kaydet" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Log Types" @@ -3540,6 +3517,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan çerçeve sayısını " +"User/Logs/fps.txt dosyasına yazar. Dolphin'in performans'ını test etmek " +"istiyorsanız bu özelliği kullanabilirsiniz.\n" +"\n" +"Emin değilseniz, işaretsiz bırakın." #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68 msgid "Logger Outputs" @@ -3859,7 +3841,7 @@ msgstr "Kalıp bulunamadı" #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "" +msgstr "Ses çıkışı yok" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format @@ -3916,7 +3898,7 @@ msgstr "Ayarlanmamış" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" -msgstr "" +msgstr "Bir Wii kaydı değil veya bu başlık boyutu için okuma hatası: %x" #: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" @@ -3978,7 +3960,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "Online & Belgeler" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -4044,7 +4026,6 @@ msgid "Orange" msgstr "Turuncu" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -4129,7 +4110,7 @@ msgstr "Duraklat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:129 msgid "Pause at end of movie" -msgstr "" +msgstr "Videonun sonunda duraklat" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Per-Pixel Lighting" @@ -4334,9 +4315,8 @@ msgid "Record" msgstr "Çek" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "Çekim Seçenekleri" +msgstr "Girişi kaydet" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4466,23 +4446,20 @@ msgid "Save GCI as..." msgstr "GCI'yı farklı kaydet..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "Durumu Kaydet (&V)" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "Durumu Kaydet (&V)" +msgstr "Durumu Kaydet" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "Durumu Kaydet : 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "Durumu Kaydet : 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4513,9 +4490,8 @@ msgid "Save State Slot 8" msgstr "Durumu Kaydet : 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "Durumu Kaydet : 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4662,7 +4638,7 @@ msgstr "" #: Source/Core/InputCommon/Src/InputConfig.cpp:49 msgid "Selected controller profile does not exist" -msgstr "" +msgstr "Seçilmiş kumanda profili yok." #: Source/Core/DolphinWX/Src/LogWindow.cpp:109 msgid "Selected font" @@ -4693,6 +4669,12 @@ msgid "" "\n" "If unsure, use Direct3D 11." msgstr "" +"Hangi görüntü API'sinin kullanılacağını seçer.\n" +"Direct3D 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliğe önem verir. " +"Direct3D 11 ikisinin arasıdır.\n" +"Şunu unutmayın, Direct3D sadece Windows'da kullanılabilir.\n" +"\n" +"Emin değilseniz, Direct3D 11'i seçin." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" @@ -4703,6 +4685,12 @@ msgid "" "\n" "If unsure, use OpenGL." msgstr "" +"Hangi görüntü API'sinin kullanılacağını seçer.\n" +"Direct3D 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliğe önem verir. " +"Direct3D 11 ikisinin arasıdır.\n" +"Şunu unutmayın, Direct3D sadece Windows'da kullanılabilir.\n" +"\n" +"Emin değilseniz, OpenGL'yi seçin." #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" @@ -4745,15 +4733,16 @@ msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" +"Gecikmeyi ayarlayın (ms olarak). Yüksek değerler ses hışırtısını " +"azaltabilir. Sadece OpenAL ile kullanılabilir." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "Ayarlar..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem: Ayar dosyası bulunamadı" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4784,9 +4773,8 @@ msgid "Show &Toolbar" msgstr "Araç Çubuğunu Gös&ter" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "Varsayılan" +msgstr "Varsayılanları Göster" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -4884,7 +4872,7 @@ msgstr "İlk bloğu göster" #: Source/Core/DolphinWX/Src/FrameTools.cpp:131 msgid "Show lag counter" -msgstr "" +msgstr "Lag sayacını göster" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" @@ -4892,6 +4880,9 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"Mesajlarıi emulasyon ekranı bölümünde göster.\n" +"Bu mesajlar memory card erişimi, video altyapısı, CPU bilgisi, ve JIT " +"önbelleğini temizleme olabilir." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 msgid "Show save blocks" @@ -5096,7 +5087,7 @@ msgstr "Durum Kayıtları" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:90 msgid "Steering Wheel" -msgstr "" +msgstr "Direksiyon" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57 msgid "Stick" @@ -5375,16 +5366,12 @@ msgstr "" "Emin değilseniz, işaretsiz bırakın." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"Eğer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), DSP " -"ile Ses hızlandırıcısı kullanın. (Ses takılmalarını düzeltebilir, ancak " -"(oyuna bağlı olarak) sürekli gürültüye de neden olabilir.)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5426,19 +5413,16 @@ msgid "Toggle All Log Types" msgstr "Tüm Geçmiş Türlerini Seç" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "En-boy Oranı:" +msgstr "En-boy Oranını aç/kapat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB Kopyaları" +msgstr "EFB Kopyalarını aç/kapat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "Tüm Geçmiş Türlerini Seç" +msgstr "Fog aç/kapat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5447,7 +5431,7 @@ msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "IR aç/kapat" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5541,9 +5525,8 @@ msgid "Undo Load State" msgstr "Durum Yüklemeyi Geri Al" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "Durum Yüklemeyi Geri Al" +msgstr "Durum Kaydetmeyi Geri Al" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5561,7 +5544,7 @@ msgstr "Bilinmeyen DVD komutu %08x - önemli hata" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444 #, c-format msgid "Unknown command 0x%08x" -msgstr "" +msgstr "Bilinmeyen komut 0x%08x" #: Source/Core/Common/Src/SysConf.cpp:132 #, c-format @@ -5660,9 +5643,8 @@ msgid "V-Sync" msgstr "Dikey Eşitleme" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU Hız Hilesi" +msgstr "VBeam Hız Hilesi" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5960,6 +5942,9 @@ msgid "" "You are using an old free DSP ROM made by the Dolphin Team.\n" "Only games using the Zelda UCode will work correctly.\n" msgstr "" +"Dolphin Takımı tarafından yapılan eski bedava DSP ROM'ları " +"kullanıyorsunuz. \n" +"Sadece Zelda UCode oyunları bunlarla düzgün çalışabilir. \n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:63 msgid "You can't close panes that have pages in them." @@ -5991,6 +5976,9 @@ msgid "" "Would you like to stop now to fix the problem?\n" "If you select \"No\", audio might be garbled." msgstr "" +"DSP ROM'larınız yanlış hash değerlerine sahip.\n" +"Sorunu düzeltmek için durdurmak istiyor musunuz?\n" +"Eğer Hayır'ı, seçerseniz, seste sorun oluşabilir." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6096,9 +6084,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Şu ID ile bilinmeyen mesaj alındı : %d" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6115,67 +6102,3 @@ msgstr "zNear Düzeltmesi:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| VEYA" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "Doğru VBeam Emülasyonu" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Kollar ayarlanamadı. Oyuncu ayrıldı veya oyun şu anda çalışıyor! \n" -#~ "(Oyunlar çalışırken kolların ayarlanması henüz desteklenmemektedir)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "Kısayol Tuşlarına İzin Ver" - -#~ msgid "Export failed, try again?" -#~ msgstr "Verme başarısız, tekrar dene?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "Dinleme başarısız!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "bthprops.cpl yüklenemedi." - -#~ msgid "Failed to load hid.dll" -#~ msgstr "hid.dll yükleme başarısız." - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic Yapılandırması" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY çağrıldı, lütfen bildirin!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "" -#~ "Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. " -#~ "(Açık = Uyumlu, Kapalı = Hızlı)" - -#~ msgid "Import failed, try again?" -#~ msgstr "Alma başarısız,tekrar dene?" - -#~ msgid "In-Game" -#~ msgstr "Oyun-İçi" - -#~ msgid "Last Overwritten State" -#~ msgstr "Son Üzerine Yazılan Durum" - -#~ msgid "Last Saved State" -#~ msgstr "Son Kayıtlı Durum" - -#~ msgid "Local" -#~ msgstr "Yerel" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "Durum yüklemesinde Wiimote'u yeniden bağla" - -#~ msgid "Set" -#~ msgstr "Ayarla" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "Hedef Alpha Geçişini Atla" - -#~ msgid "Wii Save Import" -#~ msgstr "Wii Kaydı Al" diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 3d89c53066..563a67e553 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -5,14 +5,15 @@ # Translators: # Sentret_C , 2013 # thegfw , 2011 +# lxf2000 , 2013 # Sentret_C , 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-14 02:35+0000\n" -"Last-Translator: Sentret_C \n" +"PO-Revision-Date: 2013-09-21 05:18+0000\n" +"Last-Translator: lxf2000 \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/dolphin-" "emu/language/zh_CN/)\n" "Language: zh_CN\n" @@ -23,7 +24,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516 msgid " (too many to display)" -msgstr " (要显示的项目太多)" +msgstr " (项目太多,无法完全显示)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:291 #: Source/Core/DolphinWX/Src/NetWindow.cpp:521 @@ -41,13 +42,13 @@ msgid "" "\"%s\" does not exist.\n" " Create a new 16MB Memcard?" msgstr "" -"\"%s\" 不存在.\n" -" 创建一个新的 16MB 记忆卡?" +"\"%s\" 不存在。\n" +" 创建一个新的 16MB 存储卡?" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." -msgstr "\"%s\" 不是一个有效的 GCM/ISO 文件, 或者不是一个 GC/Wii 镜像." +msgstr "\"%s\" 不是一个有效的 GCM/ISO 文件,或者不是一个 GC/Wii 镜像。" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730 #, c-format @@ -62,23 +63,23 @@ msgstr "%1$s复制%1$s" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120 #, c-format msgid "%d samples" -msgstr "%d个样本" +msgstr "%d 采样" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119 #, c-format msgid "%d samples (quality level %d)" -msgstr "" +msgstr "%d 采样 (质量等级 %d)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337 #, c-format msgid "%s already exists, overwrite?" -msgstr "%s 已经存在,覆盖吗?" +msgstr "%s 已经存在,是否覆盖?" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:154 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "提取 %s 失败.可能镜像是坏的." +msgstr "缩减 %s 失败。镜像可能有错误。" #: Source/Core/Core/Src/HW/GCMemcard.cpp:83 #, c-format @@ -86,7 +87,7 @@ msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"未能作为存储卡打开%s \n" +"无法将 %s 载入为存储卡 \n" " 卡文件大小无效 (0x%x 字节)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:98 @@ -95,7 +96,7 @@ msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"未能作为存储卡打开%s \n" +"无法将 %s 载入为存储卡 \n" " 卡大小无效 (0x%x 字节)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:78 @@ -104,33 +105,33 @@ msgid "" "%s failed to load as a memorycard \n" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" -"未能作为存储卡打开%s \n" -"相对于有效的记忆卡文件,该文件太小 (0x%x 字节)" +"无法将 %s 载入为存储卡 \n" +"相对于有效的存储卡文件,该文件太小 (0x%x 字节)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410 #, c-format msgid "%s failed to open" -msgstr "打开 %s 失败" +msgstr "无法打开 %s" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "打开 %s 失败" +msgstr "%s 失败:kr=%x" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format msgid "%s is a 0 byte file" -msgstr " %s 是一个零字节文件" +msgstr "%s 是一个零字节文件" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:146 #, c-format msgid "%s is already compressed! Cannot compress it further." -msgstr "%s 已经被压缩过! 不能对它再进行压缩了." +msgstr "%s 已经被压缩过! 无法对它进一步压缩。" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "%s 作为文件名太长,最大字符数为45" +msgstr "%s 作为文件名太长,最大字符数为45" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:189 #, c-format @@ -174,7 +175,7 @@ msgstr "浏览镜像(&B)..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:195 msgid "&Cheats Manager" -msgstr "作弊码管理器(&C)" +msgstr "金手指管理器(&C)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&DSP Settings" @@ -290,7 +291,7 @@ msgstr "视图(&V)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:181 msgid "&Wiimote Settings" -msgstr "Wii遥控器设置(&W)" +msgstr "Wii 控制器设置(&W)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862 msgid "&Wiki" @@ -302,11 +303,11 @@ msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:46 msgid "(-)+zFar" -msgstr "(-)+zFar" +msgstr "(-)+远剪裁" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:41 msgid "(-)+zNear" -msgstr "(-)+zNear" +msgstr "(-)+近剪裁" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:86 msgid "(UNKNOWN)" @@ -317,9 +318,8 @@ msgid "(off)" msgstr "(关)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ 加" +msgstr "+ 加" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -327,7 +327,7 @@ msgstr "0x44" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1.5x Native (960x792)" -msgstr "1.5x 原生(960x792)" +msgstr "1.5x 原生 (960x792)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148 msgid "16 bit" @@ -335,15 +335,15 @@ msgstr "16 位" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "1x Native (640x528)" -msgstr "1x 原生(640x528)" +msgstr "1x 原生 (640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "2.5x Native (1600x1320)" -msgstr "2.5x 原生(1600x1320)" +msgstr "2.5x 原生 (1600x1320)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347 msgid "2x Native (1280x1056)" -msgstr "2x 原生(1280x1056)" +msgstr "2x 原生 (1280x1056)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149 msgid "32 bit" @@ -355,11 +355,11 @@ msgstr "3D Vision" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "3x Native (1920x1584)" -msgstr "3x 原生(1920x1584)" +msgstr "3x 原生 (1920x1584)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "4x Native (2560x2112)" -msgstr "4x 原生(2560x2112)" +msgstr "4x 原生 (2560x2112)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147 msgid "8 bit" @@ -379,7 +379,7 @@ msgstr "<无>" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150 msgid "" -msgstr "<按任意键>" +msgstr "<请按键>" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" @@ -392,12 +392,12 @@ msgstr "A" #: Source/Core/DolphinWX/Src/NetWindow.cpp:233 #: Source/Core/DolphinWX/Src/NetWindow.cpp:266 msgid "A NetPlay window is already open!!" -msgstr "网上对战窗口已经打开!!" +msgstr "已经有一个NetPlay窗口打开!!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404 msgid "A game is not currently running." -msgstr "目前没有游戏运行." +msgstr "目前没有游戏在运行。" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85 msgid "" @@ -405,10 +405,9 @@ msgid "" "You must manually connect your wiimotes." msgstr "" "未发现支持的蓝牙设备。\n" -"您需要手动连接您的Wii遥控器。" +"您需要手动连接您的 Wii 控制器。" #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -424,19 +423,19 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"警告:\n" +"注意:\n" "\n" -"NetPlay目前仅能在如下设置下正常工作:\n" -" - 双核心 [关]\n" -" - 音频限流 [关]\n" -" - 开启“无音频”的DSP-HLE或DSP-LLE\n" -" - 手动在[标准控制器]中准确设置将使用的控制器数目\n" +"Netplay 仅在如下设置时可用:\n" +" - 启用多核处理 [关]\n" +" - 所有计算机上的 DSP 模拟引擎必须一致!\n" +" - 在专门的线程中模拟 DSP [关]\n" +" - 帧数限制不为 [音频]\n" "\n" -"所有玩家应尽量使用相同版本的Dolphin以及相同的设置。\n" -"禁用所有存储卡或在开始前将存储卡发送给所有玩家。\n" -"尚未实现Wii遥控器支持。\n" +"所有玩家都应使用相同的 Dolphin 版本与设置。\n" +"所有玩家的存储卡必须相同或禁用。\n" +"尚未实现对 Wii 控制器的支持!\n" "\n" -"您必须设置TCP端口转发以成为主机!!" +"主机必须开放/映射选定的 TCP 端口!\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -446,7 +445,7 @@ msgstr "AM-基板" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 msgid "AR Codes" -msgstr "动作回放代码" +msgstr "AR 代码" #: Source/Core/DolphinWX/Src/AboutDolphin.h:21 msgid "About Dolphin" @@ -454,7 +453,7 @@ msgstr "关于 Dolphin" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Acceleration" -msgstr "加速器" +msgstr "加速度" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "Accuracy:" @@ -468,8 +467,8 @@ msgid "" "\n" "If unsure, check EFB to Texture instead." msgstr "" -"精确地模拟EFB副本。\n" -"一些游戏需要此项以保证某些图像效果或游戏机能。\n" +"精确地模拟 EFB 副本。\n" +"一些游戏的特定图像效果或游戏机能需要此项。\n" "\n" "如果没有把握,请选择缓冲到材质。" @@ -496,33 +495,34 @@ msgstr "" #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "动作回放错误: 无效大小 (%08x : 地址 = %08x) 于 添加代码 (%s)" +msgstr "Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 添加代码 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:745 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" -msgstr "动作回放错误: 无效大小 (%08x : 地址 = %08x) 于 填充和滑动 (%s)" +msgstr "Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 填充和滑动 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:537 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" -msgstr "动作回放错误: 无效大小 (%08x : 地址 = %08x) 于 内存写入和填充 (%s)" +msgstr "" +"Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 内存写入和填充 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:597 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" -msgstr "动作回放错误: 无效大小 (%08x : 地址 = %08x) 于 写入到指针 (%s)" +msgstr "Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 写入到指针 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:792 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "动作回放错误: 无效数值 (%08x) 于 内存复制 (%s)" +msgstr "Action Replay 错误: 无效数值 (%08x) 于 内存复制 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:672 #, c-format @@ -530,31 +530,33 @@ msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" +"Action Replay 错误: 主代码与写入到 CCXXXXXX 尚未实现(%s)\n" +"不需要主代码。请不要使用主代码。" #: Source/Core/Core/Src/ActionReplay.cpp:184 #, c-format msgid "Action Replay Error: invalid AR code line: %s" -msgstr "动作回放错误: 无效动作回放代码行: %s" +msgstr "Action Replay 错误: 无效 AR 代码行: %s" #: Source/Core/Core/Src/ActionReplay.cpp:862 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" -msgstr "动作回放: 条件代码: 无效大小 %08x (%s)" +msgstr "Action Replay: 条件代码: 无效大小 %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:935 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" -msgstr "动作回放: 无效正常代码类型 %08x (%s)" +msgstr "Action Replay: 无效正常代码类型 %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:886 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" -msgstr "动作回放: 正常代码 %i: 无效子类型 %08x (%s)" +msgstr "Action Replay: 正常代码 %i: 无效子类型 %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:828 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" -msgstr "动作回放: 正常代码 0: 无效子类型 %08x (%s)" +msgstr "Action Replay: 正常代码 0: 无效子类型 %08x (%s)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248 msgid "Adapter:" @@ -563,11 +565,11 @@ msgstr "适配器:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:63 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63 msgid "Add" -msgstr "添加" +msgstr "加号" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330 msgid "Add ActionReplay Code" -msgstr "添加动作回放代码" +msgstr "添加 ActionReplay 代码" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259 msgid "Add Patch" @@ -597,13 +599,13 @@ msgid "" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -"将指定值加到 zFar 参数上。\n" +"将“远剪裁平面”移动指定值。\n" "有两种方法表达浮点数值。\n" "例如: 输入“200”或直接输入“0.0002”将产生同样的效果,系统都将捕捉到" "值“0.0002”。\n" -"值:(0->+/-整数)或(0->+/-浮点[6 位精度])\n" +"值: (0->+/-整数) 或 (0->+/-浮点[6 位精度])\n" "\n" -"注意:可在“日志窗口/控制台”中查看系统捕捉值。" +"注意: 可在“日志窗口/控制台”中查看系统捕捉值。" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:40 msgid "" @@ -615,13 +617,13 @@ msgid "" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -"将指定值加到 zNear 参数上。\n" +"将“近剪裁平面”移动指定值。\n" "有两种方法表达浮点数值。\n" "例如: 输入“200”或直接输入“0.0002”将产生同样的效果,系统都将捕捉到" "值“0.0002”。\n" -"值:(0->+/-整数)或(0->+/-浮点[6 位精度])\n" +"值: (0->+/-整数) 或 (0->+/-浮点[6 位精度])\n" "\n" -"注意:可在“日志窗口/控制台”中查看系统捕捉值。" +"注意: 可在“日志窗口/控制台”中查看系统捕捉值。" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808 msgid "Adjust the analog control pressure required to activate buttons." @@ -637,11 +639,11 @@ msgstr "高级设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:620 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:809 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)" +msgstr "所有 GC/Wii 镜像 (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192 msgid "All Gamecube GCM files (gcm)" @@ -702,6 +704,9 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" +"完成帧后应用后处理效果。\n" +"\n" +"如果没有把握,请选择 (关)。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" @@ -717,16 +722,16 @@ msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -"请确认真的要删除这些文件?\n" -"这将是永久性的删除!" +"您确定想要删除这些文件?\n" +"它们将无法恢复!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "您确定想要删除这个文件?这将是永久性的删除!" +msgstr "您确定想要删除此文件? 它将无法恢复!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:45 msgid "Arm JIT (experimental)" -msgstr "Arm JIT(实验性)" +msgstr "Arm JIT (实验性)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 @@ -757,15 +762,15 @@ msgstr "自动" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346 msgid "Auto (Multiple of 640x528)" -msgstr "自动(640x528的倍数)" +msgstr "自动 (640x528 的倍数)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346 msgid "Auto (Window Size)" -msgstr "自动(窗口大小)" +msgstr "自动 (窗口大小)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 msgid "Auto adjust Window Size" -msgstr "自动调节窗口大小" +msgstr "自动调整窗口大小" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -773,7 +778,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"自动将窗口大小调节为内部分辨率。\n" +"自动将窗口大小调整为内部分辨率。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -783,11 +788,11 @@ msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "BP register " -msgstr "" +msgstr "BP 寄存器" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:14 msgid "Back" -msgstr "Back" +msgstr "后" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:685 msgid "Backend Settings" @@ -796,7 +801,7 @@ msgstr "后端设置" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212 msgid "Backend:" -msgstr "后端:" +msgstr "后端:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 @@ -805,7 +810,7 @@ msgstr "后台输入" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:267 msgid "Backward" -msgstr "Backward" +msgstr "后" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305 msgid "Bad File Header" @@ -813,7 +818,7 @@ msgstr "无效文件头" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60 msgid "Balance Board" -msgstr "" +msgstr "平衡板" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:621 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293 @@ -830,7 +835,7 @@ msgstr "标志:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61 msgid "Bar" -msgstr "Bar" +msgstr "摇把" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Basic" @@ -842,11 +847,11 @@ msgstr "基本设置" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26 msgid "Bass" -msgstr "Bass" +msgstr "低音" #: Source/Core/Core/Src/HW/GCMemcard.cpp:174 msgid "Block Allocation Table checksum failed" -msgstr "Block Allocation Table checksum failed" +msgstr "区块分配表校验失败" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 msgid "Blocks" @@ -888,7 +893,7 @@ msgstr "浏览要添加的目录" #: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Browse for an ISO directory..." -msgstr "浏览镜像目录" +msgstr "浏览镜像目录..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082 msgid "Browse for output directory" @@ -908,7 +913,7 @@ msgstr "按键" msgid "" "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " "this option disabled." -msgstr "" +msgstr "绕过DCBZ指令对数据缓存的清除。通常不会启用此项。" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706 msgid "C" @@ -924,7 +929,7 @@ msgstr "C-摇杆" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774 msgid "CP reg" -msgstr "" +msgstr "CP 注册" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "CPU Emulator Engine" @@ -942,8 +947,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"逐个像素而非逐个顶点地计算3D图像的照明。\n" -"在一定程度上降低模拟速度(取决于您的GPU)。\n" +"逐个像素而非逐个顶点地计算 3D 图像的照明。\n" +"在一定程度上降低模拟速度 (取决于您的 GPU) 。\n" "该增强通常是安全的,但偶尔也会造成问题。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -951,12 +956,12 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848 #, c-format msgid "Can't find WiiMote by connection handle %02x" -msgstr "" +msgstr "不能按照连接句柄 %02x 找到 Wii 控制器" #: Source/Core/Core/Src/HW/DVDInterface.cpp:672 #: Source/Core/Core/Src/HW/DVDInterface.cpp:682 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" +msgstr "不能从 DVD插件 - DVD接口读取数据: 严重错误" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 @@ -968,7 +973,7 @@ msgstr "取消" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281 #, c-format msgid "Cannot open %s" -msgstr "不能打开 %s" +msgstr "无法打开 %s" #: Source/Core/Core/Src/CoreTiming.cpp:128 msgid "Cannot unregister events with events pending" @@ -981,7 +986,7 @@ msgid "" "%s\n" "is not a valid gamecube memory card file" msgstr "" -"不能作为存储卡使用该文件。\n" +"无法将该文件用作存储卡。\n" "%s\n" "不是有效的Gamecube存储卡文件" @@ -990,12 +995,12 @@ msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -"Cannot use that file as a memory card.\n" -"Are you trying to use the same file in both slots?" +"无法将该文件用作存储卡。\n" +"您是否试图在两个插槽中使用相同的文件?" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 msgid "Caps Lock" -msgstr "大写锁定" +msgstr "Caps Lock" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" @@ -1026,20 +1031,20 @@ msgid "" "Change the language of the user interface.\n" "Requires restart." msgstr "" -"修改用户界面语言.\n" -"需要重启." +"改变用户界面的语言。\n" +"需要重启。" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "" +msgstr "改变“远裁切平面”参数的符号 (修正后)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:42 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "" +msgstr "改变“近裁切平面”参数的符号 (修正后)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" -msgstr "模拟器正在运行时改动将不会生效!" +msgstr "模拟器正在运行时改动将不会生效!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:316 msgid "Chat" @@ -1047,11 +1052,11 @@ msgstr "聊天" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34 msgid "Cheat Code" -msgstr "作弊码" +msgstr "金手指" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 msgid "Cheat Search" -msgstr "作弊码搜索" +msgstr "金手指搜索" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17 msgid "Cheats Manager" @@ -1063,7 +1068,7 @@ msgstr "检查分区完整性" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:909 msgid "Checking integrity..." -msgstr "完整性检查中..." +msgstr "正在检查完整性..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" @@ -1075,15 +1080,15 @@ msgstr "繁体中文" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:811 msgid "Choose a DVD root directory:" -msgstr "选择一个DVD根目录" +msgstr "选择一个DVD根目录:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "Choose a NAND root directory:" -msgstr "选择一个NAND根目录:" +msgstr "选择一个NAND根目录:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:808 msgid "Choose a default ISO:" -msgstr "选择一个默认镜像:" +msgstr "选择一个默认镜像:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233 msgid "Choose a directory to add" @@ -1095,28 +1100,26 @@ msgstr "选择要打开的文件" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 msgid "Choose a memory card:" -msgstr "选择一个存储卡:" +msgstr "选择一个存储卡:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:812 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -msgstr "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" +msgstr "选择要作为应用加载器的文件: (仅适用于由文件夹构成的光盘)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:793 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:834 msgid "Choose the folder to extract to" -msgstr "选择解压缩到的文件夹" +msgstr "选择提取目标文件夹" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:285 msgid "Circle Stick" -msgstr "Circle Stick" +msgstr "圆形杆" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56 msgid "Classic" -msgstr "经典" +msgstr "传统控制器" #: Source/Core/DolphinWX/Src/LogWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 @@ -1129,7 +1132,7 @@ msgstr "清除" msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." -msgstr "游戏运行时与客户端连接断开!!NetPlay已禁用。您必须手动停止游戏。" +msgstr "游戏运行期间客户端断开连接!! NetPlay 已禁用。您必须手动停止游戏。" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:234 @@ -1173,7 +1176,7 @@ msgstr "压缩所选镜像..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Compressing ISO" -msgstr "压缩镜像中" +msgstr "正在压缩镜像" #: Source/Core/DolphinWX/Src/FrameTools.cpp:468 msgid "Config" @@ -1206,7 +1209,7 @@ msgstr "确认文件覆盖" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Confirm on Stop" -msgstr "停止时确认" +msgstr "停止游戏时确认" #: Source/Core/DolphinWX/Src/NetWindow.cpp:78 #: Source/Core/DolphinWX/Src/NetWindow.cpp:100 @@ -1215,9 +1218,8 @@ msgstr "连接" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "连接 USB 键盘" +msgstr "连接平衡板" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1226,27 +1228,27 @@ msgstr "连接 USB 键盘" #: Source/Core/DolphinWX/Src/FrameTools.cpp:373 #, c-format msgid "Connect Wiimote %i" -msgstr "连接 Wiimote %i" +msgstr "连接 Wii 控制器 %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 msgid "Connect Wiimote 1" -msgstr "连接 Wiimote 1" +msgstr "连接 Wii 控制器 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 msgid "Connect Wiimote 2" -msgstr "连接 Wiimote 2" +msgstr "连接 Wii 控制器 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 msgid "Connect Wiimote 3" -msgstr "连接 Wiimote 3" +msgstr "连接 Wii 控制器 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 msgid "Connect Wiimote 4" -msgstr "连接 Wiimote 4" +msgstr "连接 Wii 控制器 4" #: Source/Core/DolphinWX/Src/Main.cpp:670 msgid "Connecting..." -msgstr "连接中..." +msgstr "正在连接..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:156 msgid "Console" @@ -1254,7 +1256,7 @@ msgstr "控制台" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88 msgid "Continuous Scanning" -msgstr "" +msgstr "持续扫描" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:33 msgid "Control" @@ -1280,12 +1282,12 @@ msgstr "核心" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:148 #, c-format msgid "Could not create %s" -msgstr "不能创建 %s" +msgstr "无法创建 %s" #: Source/Core/AudioCommon/Src/AudioCommon.cpp:62 #, c-format msgid "Could not initialize backend %s." -msgstr "不能初始化后端 %s" +msgstr "无法初始化后端 %s。" #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1294,18 +1296,18 @@ msgid "" "backup. Please note that original Gamecube and Wii discs cannot be read by " "most PC DVD drives." msgstr "" -"不能读取\"%s\"。驱动器里没有光盘或不是GC/Wii备份。请注意大多数PC DVD驱动器不" -"能读取原始的Gamecube与Wii光盘。" +"无法读取\"%s\"。驱动器里没有光盘或不是 GC/Wii 备份。请注意多数 PC DVD 驱动器" +"不能读取原始的 Gamecube 与 Wii 光盘。" #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" -msgstr "不能识别 ISO 文件 %s" +msgstr "无法识别镜像文件 %s" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" -msgstr "不能保存 %s" +msgstr "无法保存 %s" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format @@ -1319,24 +1321,24 @@ msgid "" "If so, then you may need to re-specify your memory card location in the " "options." msgstr "" -"无法写入存储卡文件%s。\n" +"无法写入存储卡文件 %s。\n" "\n" -"您是否正在从CD/DVD上运行Dolphin,或者存档文件是否写保护?\n" +"您是否正在从 CD/DVD 上运行 Dolphin,或者存档文件是否写保护?\n" "\n" -"您是否是在移动模拟器目录后收到这个消息?\n" -"如果这样,您可能需要在选项中重新指定您的存储卡位置。" +"您是否是在移动模拟器目录后收到这个消息?\n" +"如果是这样,您可能需要在选项中重新指定您的存储卡位置。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162 msgid "Couldn't find open command for extension 'ini'!" -msgstr "找不到扩展名'ini'的打开命令!" +msgstr "找不到扩展名 'ini' 的打开命令!" #: Source/Core/Core/Src/BootManager.cpp:158 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -"不能初始化核心.\n" -"检查你的配置." +"无法初始化核心。\n" +"请检查您的配置。" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 @@ -1350,7 +1352,7 @@ msgstr "国家:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Create AR Code" -msgstr "创建动作回放代码" +msgstr "创建 AR 代码" #: Source/Core/DolphinWX/Src/FrameAui.cpp:569 #: Source/Core/DolphinWX/Src/FrameAui.cpp:641 @@ -1363,7 +1365,7 @@ msgstr "创建者:" #: Source/Core/Common/Src/MsgHandler.cpp:54 msgid "Critical" -msgstr "" +msgstr "错误" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Crop" @@ -1375,7 +1377,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"将图像由4:3裁切为5:4或由16:9裁切为16:10。\n" +"将图像由 4:3 裁切为 5:4 或由 16:9 裁切为 16:10。\n" "如果没有把握,请不要勾选此项。" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52 @@ -1385,7 +1387,7 @@ msgstr "淡入淡出" #: Source/Core/DolphinWX/Src/FrameTools.cpp:633 #, c-format msgid "Current directory changed from %s to %s after wxFileSelector!" -msgstr "" +msgstr "经过 wxFileSelector 之后当前目录从 %s 改变为 %s!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Custom Projection Hack" @@ -1397,7 +1399,7 @@ msgstr "自定义投影修正设置" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Customize some Orthographic Projection parameters." -msgstr "自定义一些正交投影参数" +msgstr "自定义一些正交投影参数。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" @@ -1437,9 +1439,8 @@ msgid "DSP settings" msgstr "音频设置" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 -#, fuzzy msgid "DSPLLE on Separate Thread" -msgstr "在专门的线程上模拟DSP" +msgstr "独立音频 LLE 线程" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:831 msgid "DVD Root:" @@ -1447,15 +1448,15 @@ msgstr "DVD 根目录:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226 msgid "DVDLowRead - Fatal Error: failed to read from volume" -msgstr "DVDLowRead - 致命错误:读取卷失败" +msgstr "DVDLowRead - 致命错误: 读取卷失败" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "DVDLowUnencryptedRead - 致命错误:读取卷失败" +msgstr "DVDLowUnencryptedRead - 致命错误: 读取卷失败" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Dance Mat" -msgstr "" +msgstr "跳舞毯" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153 msgid "Data Size" @@ -1468,7 +1469,7 @@ msgstr "日期:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:518 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Datel MaxDrive/Pro files(*.sav)" -msgstr "Datel MaxDrive/Pro files(*.sav)" +msgstr "Datel MaxDrive/Pro 文件(*.sav)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:230 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:247 @@ -1488,7 +1489,7 @@ msgstr "调试" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:66 msgid "Decimal" -msgstr "十进制" +msgstr "小数点" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 msgid "Decompress ISO..." @@ -1501,12 +1502,11 @@ msgstr "解压缩所选镜像..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 msgid "Decompressing ISO" -msgstr "解压缩镜像中" +msgstr "正在解压缩镜像" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "刷新游戏列表" +msgstr "减少帧数限制" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1547,9 +1547,7 @@ msgstr "检测" msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." -msgstr "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." +msgstr "检测到尝试从DVD读取比合适的输出缓冲区内更多的数据。堆存。" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953 @@ -1563,7 +1561,7 @@ msgstr "设备设置" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49 msgid "Dial" -msgstr "Dial" +msgstr "拨号" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145 msgid "Direct3D11" @@ -1588,7 +1586,7 @@ msgstr "禁用" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Destination Alpha" -msgstr "" +msgstr "禁用目标 Alpha" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Disable Fog" @@ -1602,9 +1600,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"禁用任何XFB模拟。\n" -"显著提高模拟速度,但在模拟许多需要XFB的游戏(尤其是自制应用)时会造成严重故" -"障。\n" +"禁用任何 XFB 模拟。\n" +"显著提高模拟速度,但在模拟许多需要 XFB 的游戏\n" +"(尤其是自制应用) 时会造成严重故障。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -1617,23 +1615,24 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"禁用对EFB副本的模拟。\n" -"后期处理或渲染到纹理效果经常会使用到这些副本,因此勾选此项虽然会带来很大的提" -"速但几乎总是会造成问题。\n" +"禁用对 EFB 副本的模拟。\n" +"后期处理或渲染到纹理效果经常会使用到这些副本,\n" +"因此勾选此项虽然会带来很大的提速但几乎总是会\n" +"造成问题。\n" "\n" "如果没有把握,请不要勾选此项。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -#, fuzzy msgid "" "Disables emulation of a hardware feature called destination alpha, which is " "used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"忽略目标的Alpha通道,许多游戏使用该通道产生多种图像效果。\n" +"禁用对名为目标 Alpha 的硬件功能的模拟,许多游戏\n" +"使用该功能产生多种图像效果。\n" "\n" -"如果没有把握,请不要勾选此项。" +"如果不能确定,请不要勾选此项。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 msgid "Disc" @@ -1660,7 +1659,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:67 msgid "Divide" -msgstr "Divide" +msgstr "除号" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1039 msgid "Do you want to stop the current emulation?" @@ -1709,6 +1708,35 @@ msgid "" "and should not be used to play games you do\n" "not legally own." msgstr "" +"Dolphin %s\n" +"Copyright (c) 2003-2013+ Dolphin 团队\n" +"\n" +"分支: %s\n" +"修订号: %s\n" +"编译于: %s @ %s\n" +"\n" +"Dolphin 是一款 Gamecube/Wii 模拟器,其原作者为\n" +"F|RES 和 ector。\n" +"现在 Dolphin 是一个开源项目,贡献者之多不胜枚举。\n" +"如果对本项目感兴趣,欢迎到我们的项目页面了解详情\n" +"http://code.google.com/p/dolphin-emu/。\n" +"\n" +"特别感谢 Bushing, Costis, CrowTRobo, Marcan,\n" +"Segher, Titanik, or9 与 Hotquik 所做的反向工程与\n" +"文档/演示。\n" +"\n" +"非常感谢 Gilles Mouchard,其 Microlib PPC 模拟器\n" +"为我们的开发提供了最初推动力。\n" +"\n" +"感谢 Frank Wille 的 PowerPC 反汇编程序,or9 与我们\n" +"将其修改加入了 Gekko 特性。\n" +"\n" +"感谢 hcs/destop 的 GC ADPCM 解码器。\n" +"\n" +"我们与任天堂没有任何形式的关系。Gamecube 和 Wii\n" +"是任天堂的商标。\n" +"本模拟器仅作为教育用途,不得用于运行您非法拥有的游\n" +"戏。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format @@ -1725,7 +1753,7 @@ msgstr "Dolphin 配置" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197 msgid "Dolphin Emulated Wiimote Configuration" -msgstr "Dolphin模拟Wii遥控器配置" +msgstr "Dolphin 模拟 Wii 控制器配置" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382 msgid "Dolphin FIFO" @@ -1733,7 +1761,7 @@ msgstr "Dolphin FIFO" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1205 msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC手柄设置" +msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:727 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 @@ -1742,23 +1770,23 @@ msgstr "Dolphin TAS 电影 (*.dtm)" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8 msgid "Dolphin Wiimote Configuration" -msgstr "Dolphin Wii遥控器配置" +msgstr "Dolphin Wii 控制器配置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:301 msgid "Dolphin at &Google Code" -msgstr "Google Code上的Dolphin(&G)" +msgstr "&Google Code 上的 Dolphin" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." -msgstr "Dolphin 不能找到任何 GC/Wii 镜像. 双击这里浏览文件..." +msgstr "Dolphin 不能找到任何 GC/Wii 镜像。双击这里浏览文件..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." -msgstr "Dolphin 当前设置了隐藏所有游戏. 双击这里显示所有游戏..." +msgstr "Dolphin 当前设置为隐藏所有游戏。双击这里显示所有游戏..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 @@ -1766,16 +1794,15 @@ msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin未能完成请求的操作。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" -msgstr "启用快速光盘访问. 部分游戏需要. (ON = 快速, OFF = 兼容)" +msgstr "加倍模拟GPU的时钟频率。将会提高一些游戏的速度 (开 = 快速,关 = 兼容)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 msgid "Down" -msgstr "下" +msgstr "向下键" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45 msgid "Download Codes (WiiRD Database)" @@ -1788,7 +1815,7 @@ msgstr "已下载 %lu 代码(已添加 %lu)" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35 msgid "Drums" -msgstr "鼓" +msgstr "鼓 (太鼓达人)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Dummy" @@ -1804,7 +1831,7 @@ msgstr "转储 EFB 目标" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump Frames" -msgstr "转储框架" +msgstr "转储帧" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Textures" @@ -1816,7 +1843,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"将所有渲染的帧转储为User/Dump/Frames/目录中的一个AVI文件。\n" +"将所有渲染的帧转储至 User/Dump/Frames/ 目录中\n" +"的一个AVI 文件。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -1826,7 +1854,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"将解码的游戏材质转储到User/Dump/Textures/<游戏 ID>/目录中。\n" +"将解码的游戏材质转储到\n" +"User/Dump/Textures/<游戏 ID>/ 目录中。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -1836,7 +1865,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"将EFB副本的内容转储到User/Dump/Textures/目录中。\n" +"将 EFB 副本的内容转储到 User/Dump/Textures/\n" +"目录中。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -1852,7 +1882,7 @@ msgstr "退出模拟(&X)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 msgid "EFB Copies" -msgstr "EFB副本" +msgstr "EFB 副本" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210 #, c-format @@ -1862,7 +1892,7 @@ msgid "" "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"错误:此版本的Dolphin需要%d.%d或更高版本的TAP-Win32驱动——如果您刚刚升级您的" +"错误: 此版本的Dolphin需要%d.%d或更高版本的TAP-Win32驱动——如果您刚刚升级您的" "Dolphin,或许您现在需要重新启动您的计算机以使Windows加载新驱动。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:160 @@ -1871,7 +1901,7 @@ msgstr "欧版" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "Early Memory Updates" -msgstr "" +msgstr "内存提前更新" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit" @@ -1879,7 +1909,7 @@ msgstr "编辑" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17 msgid "Edit ActionReplay Code" -msgstr "编辑动作回放代码" +msgstr "编辑 ActionReplay 代码" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:286 msgid "Edit Config" @@ -1887,7 +1917,7 @@ msgstr "编辑设置" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:294 msgid "Edit Local Overrides" -msgstr "" +msgstr "编辑本地覆盖设置" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:17 msgid "Edit Patch" @@ -1895,7 +1925,7 @@ msgstr "编辑补丁" #: Source/Core/DolphinWX/Src/FrameTools.cpp:486 msgid "Edit current perspective" -msgstr "编辑当前外观" +msgstr "编辑当前布局" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -1922,11 +1952,11 @@ msgid "" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" -"精确地模拟XFB。\n" -"这会严重降低模拟速度并会禁用高分辨率渲染,但对于正确模拟一些游戏来说是必要" -"的。\n" +"精确地模拟 XFB。\n" +"这会严重降低模拟速度并会禁用高分辨率渲染,但\n" +"对于正确模拟一些游戏来说是必要的。\n" "\n" -"如果没有把握,请勾选虚拟XFB模拟。" +"如果没有把握,请勾选虚拟 XFB 模拟。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" @@ -1937,15 +1967,16 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"使用GPU材质对象模拟XFB。\n" -"修正许多不使用XFB模拟将会出现错误的游戏,同时不像真实XFB模拟那样慢。但在模拟" -"其余很多游戏(尤其是自制应用)时仍然会产生错误。\n" +"使用 GPU 材质对象模拟 XFB。\n" +"修正许多不使用 XFB 模拟将会出现错误的游戏,同时\n" +"不像真实 XFB 模拟那样慢。但在模拟其余很多游戏\n" +"(尤其是自制应用) 时仍然会产生错误。\n" "\n" "如果没有把握,请勾选此项。" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Emulated Wiimote" -msgstr "模拟Wii遥控器" +msgstr "模拟 Wii 控制器" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Emulation State: " @@ -1964,7 +1995,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"借助英伟达3D Vision技术(如果您的GPU支持)实现3D效果。\n" +"借助英伟达 3D Vision 技术 (如果您的 GPU 支持)\n" +"实现3D效果。\n" "有可能造成错误。\n" "需要启用全屏以生效。\n" "\n" @@ -1972,7 +2004,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 msgid "Enable AR Logging" -msgstr "启用动作回放记录" +msgstr "启用AR记录" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable Block Merging" @@ -1980,7 +2012,7 @@ msgstr "启用区块合并" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "启用边界框计算" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Enable Cache" @@ -1988,15 +2020,15 @@ msgstr "启用缓存" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Enable Cheats" -msgstr "启用作弊" +msgstr "启用金手指" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable Dual Core" -msgstr "启用多核处理" +msgstr "启用双核心" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Dual Core (speedup)" -msgstr "启用多核处理(加速)" +msgstr "启用双核心 (加速)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable Idle Skipping" @@ -2004,7 +2036,7 @@ msgstr "启用空闲步进" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Idle Skipping (speedup)" -msgstr "启用空闲步进(加速)" +msgstr "启用空闲步进 (加速)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "Enable MMU" @@ -2016,11 +2048,11 @@ msgstr "启用逐行扫描" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:769 msgid "Enable Screen Saver" -msgstr "" +msgstr "允许屏幕保护程序" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Enable Speaker Data" -msgstr "" +msgstr "启用扬声器" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable WideScreen" @@ -2048,11 +2080,11 @@ msgstr "" msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" -msgstr "启用快速光盘访问. 部分游戏需要. (ON = 快速, OFF = 兼容)" +msgstr "启用快速光盘访问。部分游戏需要。(开 = 快速,关 = 兼容)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Enable pages" -msgstr "Enable pages" +msgstr "启用页面" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" @@ -2073,7 +2105,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"启用此项以使用Dolphin主窗口而非单独的渲染窗口进行渲染。\n" +"启用此项以使用 Dolphin 主窗口而非单独的渲染窗口\n" +"进行渲染。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -2105,7 +2138,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"启用逐行扫描(如果被模拟的软件支持)。\n" +"启用逐行扫描 (如果被模拟的软件支持)。\n" "启用与否对多数游戏没有影响。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -2114,7 +2147,7 @@ msgstr "" msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" -msgstr "启用内存管理单元,一些游戏需要(ON = 兼容,OFF = 快速)" +msgstr "启用内存管理单元。一些游戏需要 (开 = 兼容,关 = 快速)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2143,7 +2176,7 @@ msgstr "增强" #: Source/Core/DolphinWX/Src/FrameAui.cpp:640 msgid "Enter a name for the new perspective:" -msgstr "为新视角输入一个名字:" +msgstr "为新布局输入一个名字:" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178 #, c-format @@ -2192,12 +2225,12 @@ msgstr "Escape" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30 msgid "Euphoria" -msgstr "Euphoria" +msgstr "欢快" #: Source/Core/Core/Src/ArmMemTools.cpp:78 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "Exception handler - access below memory space. %08llx%08llx" +msgstr "异常处理程序 - 访问下面的存储空间。 %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Execute" @@ -2206,12 +2239,11 @@ msgstr "执行" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Exit" -msgstr "" +msgstr "退出" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "导出所有存档" +msgstr "导出所有 Wii 存档" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2242,7 +2274,6 @@ msgid "Export all saves" msgstr "导出所有存档" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" msgstr "导出失败" @@ -2272,7 +2303,7 @@ msgstr "提取所有文件..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:642 msgid "Extract Apploader..." -msgstr "提取 Apploader..." +msgstr "提取应用加载器..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Extract DOL..." @@ -2297,23 +2328,23 @@ msgstr "正在提取 %s" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting All Files" -msgstr "提取所有文件中" +msgstr "正在提取所有文件" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 msgid "Extracting Directory" -msgstr "提取目录中" +msgstr "正在提取目录" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 msgid "Extracting..." -msgstr "提取中..." +msgstr "正在提取..." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904 msgid "FIFO Byte" -msgstr "" +msgstr "FIFO 字节" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32 msgid "FIFO Player" -msgstr "" +msgstr "FIFO 回放器" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:163 msgid "FRANCE" @@ -2329,7 +2360,7 @@ msgstr "连接失败!" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "Failed to download codes." -msgstr "下载代码失败." +msgstr "下载代码失败。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:872 #, c-format @@ -2348,13 +2379,14 @@ msgid "" "You may use the DSP HLE engine which does not require ROM dumps.\n" "(Choose it from the \"Audio\" tab of the configuration dialog.)" msgstr "" -"加载DSP ROM:»%s失败\n" -"DSP LLE需要此文件。\n" -"此文件含有受版权保护的数据,因此不包含在Dolphin中。\n" -"可使用DSPSpy从您的游戏主机中转储此文件。\n" +"无法载入 DSP ROM:\t%s\n" "\n" -"您可以使用不需要ROM转储的DSP HLE引擎。\n" -"(该选项位于配置对话框的“音频”选项卡)" +"使用 DSP LLE 需要此文件。\n" +"该文件由于包含受版权保护的数据因而未包含在 Dolphin 中。\n" +"请使用 DSPSpy 从您的真实主机中转储此文件。\n" +"\n" +"您可以使用不需要 ROM 转储的 DSP HLE 引擎。\n" +"(在设置对话框的“音频”选项卡中进行选择。)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131 @@ -2362,6 +2394,8 @@ msgid "" "Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"载入 bthprops.cpl 失败! 将无法连接真实 Wii 控制器并且 Dolphin 可能出乎意料地" +"崩溃!" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101 @@ -2369,6 +2403,7 @@ msgid "" "Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin " "might crash unexpectedly!" msgstr "" +"载入 hid.dll 失败! 将无法连接真实 Wii 控制器并且 Dolphin 可能出乎意料地崩溃!" #: Source/Core/Core/Src/Movie.cpp:785 #, c-format @@ -2381,7 +2416,7 @@ msgstr "读取 banner.bin 失败" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226 msgid "Failed to read bk header" -msgstr "" +msgstr "读取bk头失败" #: Source/Core/Core/Src/HW/GCMemcard.cpp:211 #, c-format @@ -2390,8 +2425,8 @@ msgid "" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" -"读取存档中的区块%d失败\n" -"记忆卡可能被截断\n" +"无法读取存档中的区块 %d\n" +"存储卡可能被截断\n" "文件位置:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:136 @@ -2399,7 +2434,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"未能正确读取区块分配表备份\n" +"无法正确读取区块分配表备份\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:130 @@ -2407,7 +2442,7 @@ msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" msgstr "" -"未能正确读取区块分配表\n" +"无法正确读取区块分配表\n" "(0x6000-0x7FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328 @@ -2418,14 +2453,14 @@ msgstr "从文件 %d 读取数据失败" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420 #, c-format msgid "Failed to read data from file: %s" -msgstr "" +msgstr "从文件读取数据失败: %s" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -"Failed to read directory backup correctly\n" +"无法正确读取目录备份\n" "(0x4000-0x5FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:118 @@ -2433,42 +2468,42 @@ msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -"正确的读取目录失败\n" +"无法正确地读取目录\n" "(0x2000-0x3FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130 msgid "Failed to read header" -msgstr "" +msgstr "读取头部失败" #: Source/Core/Core/Src/HW/GCMemcard.cpp:107 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -"正确的读取头失败\n" -"(0x000-0x1FFF)" +"无法正确地读取标头\n" +"(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "写入文件头失败 %d" +msgstr "无法读取 %d 的文件头" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" -msgstr "Failed to read unique ID from disc image" +msgstr "无法从光盘镜像读取独立 ID" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74 msgid "Failed to write BT.DINF to SYSCONF" -msgstr "Failed to write BT.DINF to SYSCONF" +msgstr "无法将 BT.DINF 写入 SYSCONF" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269 msgid "Failed to write bkhdr" -msgstr "Failed to write bkhdr" +msgstr "无法写入 bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "从文件 %d 读取数据失败" +msgstr "无法向文件 %s 写入数据" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2485,21 +2520,22 @@ msgstr "快速" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "Fast Depth Calculation" -msgstr "" +msgstr "快速深度计算" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Fast version of the MMU. Does not work for every game." -msgstr "MMU快速版本。 不是对所有游戏都有效。" +msgstr "MMU快速版本。不是对所有游戏都有效。" #: Source/Core/Core/Src/Movie.cpp:1042 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" -msgstr "致命的不同步。回放中止。(Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" +"致命的不同步。回放中止。(在PlayWiimote中发生错误: %u != %u, byte %u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:202 msgid "Fifo Player" -msgstr "" +msgstr "Fifo 回放器" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86 msgid "File Info" @@ -2507,7 +2543,7 @@ msgstr "文件信息" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300 msgid "File contained no codes." -msgstr "文件未包含代码." +msgstr "文件未包含代码。" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:400 msgid "File converted to .gci" @@ -2536,7 +2572,7 @@ msgstr "文件不能被识别成内存卡" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:281 msgid "File not compressed" -msgstr "文件不是已压缩文件" +msgstr "文件未压缩" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142 #, c-format @@ -2565,7 +2601,7 @@ msgstr "第一个区块" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Fix Checksums" -msgstr "修正校检和" +msgstr "修正校验和" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Force 16:9" @@ -2577,7 +2613,7 @@ msgstr "强制 4:3" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Force Console as NTSC-J" -msgstr "" +msgstr "强制使用NTSC-J" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407 msgid "Force Texture Filtering" @@ -2590,7 +2626,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"强制使用纹理过滤(即使被模拟游戏明确禁用它)。\n" +"强制使用纹理过滤 (即使被模拟游戏明确禁用它)。\n" "略微提高纹理质量但在一些游戏中会造成故障。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -2613,22 +2649,25 @@ msgid "" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " "setting when playing Japanese games." msgstr "" +"启用NTSC-J模式后任何语言的游戏都将会使用日版中的字体。\n" +"建议不要勾选此项,Dolphin默认使用NTSC-U模式,当运行日版游戏时这个设置会自动开" +"启。" #: Source/Core/Core/Src/HW/GCMemcard.cpp:62 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" msgstr "" -"Format as ascii (NTSC\\PAL)?\n" -"Choose no for sjis (NTSC-J)" +"使用ASCII格式 (NTSC\\PAL)?\n" +"选择“否”将使用Shift- (NTSC-J)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:266 msgid "Forward" -msgstr "Forward" +msgstr "前" #: Source/Core/DolphinWX/Src/NetWindow.cpp:156 msgid "Forward port (UPnP)" -msgstr "" +msgstr "转发端口(UPnP)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501 #, c-format @@ -2636,22 +2675,22 @@ msgid "Found %d results for '" msgstr "找到了 '的%d个结果" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "不能保存 %s" +msgstr "找到 %x 存档文件" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 msgid "Frame" -msgstr "" +msgstr "帧" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879 msgid "Frame " -msgstr "" +msgstr "帧" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 msgid "Frame Advance" -msgstr "Frame Advance" +msgstr "帧数步进" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Frame Dumps use FFV1" @@ -2689,7 +2728,7 @@ msgstr "法语" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42 msgid "Frets" -msgstr "Frets" +msgstr "品丝" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 @@ -2730,11 +2769,11 @@ msgstr "游戏没有运行!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:422 msgid "Game not found!" -msgstr "游戏没有找到!" +msgstr "游戏没有找到!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Game-Specific Settings" -msgstr "游戏特殊设置" +msgstr "特定游戏设置" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "GameConfig" @@ -2774,6 +2813,9 @@ msgid "" "native code handler by placing the codehandler.bin file into the Sys " "directory and restarting Dolphin.)" msgstr "" +"Gecko码无法运行 (CT%i CST%i) (%s)\n" +"(代码无效或不支持该类型。请将codehandler.bin文件放到Sys目录下并重启模拟器,尝" +"试使用原生代码。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 @@ -2794,7 +2836,7 @@ msgstr "德语" #: Source/Core/Core/Src/ActionReplay.cpp:439 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "GetARCode: Index is greater than ar code list size %lu" +msgstr "GetARCode: 索引大于 AR 码列表大小 %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:469 msgid "Graphics" @@ -2820,7 +2862,7 @@ msgid "" msgstr "" "显著提高渲染到纹理效果所生成纹理的质量。\n" "提高内部分辨率将增强此选项的效果。\n" -"轻微降低性能并有可能产生问题(虽然可能性不大)。\n" +"轻微降低性能并有可能产生问题 (虽然可能性不大)。\n" "\n" "如果没有把握,请勾选此项。" @@ -2842,11 +2884,11 @@ msgstr "绿 右" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39 msgid "Guitar" -msgstr "吉它" +msgstr "吉他 (吉他英雄)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Hacks" -msgstr "" +msgstr "修正" #: Source/Core/Core/Src/HW/GCMemcard.cpp:146 msgid "Header checksum failed" @@ -2875,6 +2917,14 @@ msgid "" "\n" "Sayonara!\n" msgstr "" +"对不起,\n" +"\n" +"Dolphin 需要 Mac OS X 10.7 或更高版本。\n" +"但是你运行的是较早版本的系统。\n" +"支持 OS X 10.6 的 Dolphin 最新版本为 3.5\n" +"请升级至 10.7 或更高来使用最新版 Dolphin。\n" +"\n" +"感谢您的使用!\n" #: Source/Core/DolphinWX/Src/Main.cpp:232 msgid "" @@ -2885,12 +2935,12 @@ msgid "" "\n" "Sayonara!\n" msgstr "" -"Hi,\n" +"对不起,\n" "\n" -"Dolphin 需要您的 CPU 支持 SSE2 指令集.\n" -"但是好像您的 CPU 并不支持, 因此 Dolphin 将不能运行.\n" +"Dolphin 需要您的 CPU 支持 SSE2 指令集。\n" +"但是好像您的 CPU 并不支持,因此 Dolphin 将不能运行。\n" "\n" -"杀呦啦啦(再见)!\n" +"感谢您的使用!\n" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 msgid "Hide" @@ -2934,12 +2984,12 @@ msgstr "匈牙利语" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Hybrid Wiimote" -msgstr "混合Wii遥控器" +msgstr "混合 Wii 控制器" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" +msgstr "IOCTL_ES_GETVIEWS: 试图从一个未知的ticket(标签)获取数据: %08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905 #, c-format @@ -2949,10 +2999,13 @@ msgid "" "TitleID %016llx.\n" " Dolphin will likely hang now." msgstr "" +"IOCTL_ES_LAUNCH: 游戏试图重新加载一个在 NAND 转储中无效的 IOS 或标题。\n" +"标题ID %016llx。\n" +"Dolphin 现在可能会中止。" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413 msgid "IOCTL_ES_READCONTENT - bad destination" -msgstr "IOCTL_ES_READCONTENT - bad destination" +msgstr "IOCTL_ES_READCONTENT - 损坏的目标" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "IPL Settings" @@ -2964,7 +3017,7 @@ msgstr "红外线" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "IR Pointer" -msgstr "IR 指针" +msgstr "红外线指针" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111 msgid "IR Sensitivity:" @@ -2990,7 +3043,7 @@ msgstr "图标" msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." -msgstr "" +msgstr "如果选择此项,边框寄存器将会更新。该设置用于纸片马里奥。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Ignore Format Changes" @@ -3004,9 +3057,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"忽略EFB格式的任何变化。\n" -"在许多游戏中会提高性能且无负面作用。但在其余一小部分游戏中也会导致图像瑕" -"疵。\n" +"忽略 EFB 格式的任何变化。\n" +"在许多游戏中会提高性能且无负面作用。但在其余\n" +"一小部分游戏中也会导致图像瑕疵。\n" "\n" "如果没有把握,请勾选此项。" @@ -3018,8 +3071,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"忽略CPU对EFB的任何读写请求。\n" -"在一些游戏中可提高性能,但可能禁用一些游戏相关特性或图像效果。\n" +"忽略 CPU 对 EFB 的任何读写请求。\n" +"在一些游戏中可提高性能,但可能禁用一些游戏相关\n" +"特性或图像效果。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -3028,14 +3082,12 @@ msgid "Import Save" msgstr "导入存档" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "导入存档" +msgstr "导入 Wii 存档" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "导出失败" +msgstr "导入失败" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -3062,9 +3114,8 @@ msgid "In Game" msgstr "进游戏" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "帧数限制:" +msgstr "增加帧数限制" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3081,7 +3132,7 @@ msgstr "输入" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Insert" -msgstr "插入" +msgstr "Insert" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166 msgid "Insert Encrypted or Decrypted code here..." @@ -3089,7 +3140,7 @@ msgstr "在这里插入加密的或者解密的代码..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Insert SD Card" -msgstr "插入SD卡" +msgstr "插入 SD 卡" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21 msgid "Insert name here.." @@ -3101,14 +3152,13 @@ msgstr "安装 WAD" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891 msgid "Install to Wii Menu" -msgstr "安装到Wii菜单" +msgstr "安装到 Wii 菜单" #: Source/Core/Core/Src/x64MemTools.cpp:288 #: Source/Core/Core/Src/x64MemTools.cpp:357 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "安装异常处理程序已经呼叫,但是这个平台上还不支持。" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1382 msgid "Installing WAD..." @@ -3131,7 +3181,7 @@ msgstr "完整性校验完成。没有发现错误。" msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." -msgstr "分区%d完整性校验失败。您的dump很可能已损坏或补丁错误。" +msgstr "分区 %d 完整性校验失败。您所转储的文件很可能已损坏或打了错误的补丁。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Interface" @@ -3151,8 +3201,8 @@ msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -"Internal LZO Error - decompression failed (%d) (%li, %li) \n" -"Try loading the state again" +"内部 LZO 错误 - 解压失败 (%d) (%li, %li) \n" +"请尝试重新加载状态" #: Source/Core/Core/Src/State.cpp:530 msgid "Internal LZO Error - lzo_init() failed" @@ -3164,7 +3214,7 @@ msgstr "内部分辨率:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" -msgstr "解释器(非常慢)" +msgstr "解释器 (非常慢)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Intro" @@ -3199,7 +3249,7 @@ msgid "" "%s\n" " You may need to redump this game." msgstr "" -"在以下gcm中发现了无效opening.bnr:\n" +"在此 gcm 中发现了无效 opening.bnr:\n" "%s\n" "您可能需要重新转储此游戏。" @@ -3209,19 +3259,19 @@ msgstr "无效录制文件" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471 msgid "Invalid search parameters (no object selected)" -msgstr "无效的搜索参数(没有选择对象)" +msgstr "无效的搜索参数 (没有选择对象)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454 msgid "Invalid search string (couldn't convert to number)" -msgstr "无效的搜索字串(无法转换成数字)" +msgstr "无效的搜索字串 (无法转换成数字)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "无效的搜索字符串(仅支持相等长度的字符串)" #: Source/Core/Core/Src/Core.cpp:530 msgid "Invalid state" -msgstr "Invalid state" +msgstr "无效状态" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3235,7 +3285,7 @@ msgstr "日本" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:47 msgid "JIT Recompiler (recommended)" -msgstr "JIT 重编译器(推荐)" +msgstr "JIT 重编译器 (推荐)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:48 msgid "JITIL experimental recompiler" @@ -3280,12 +3330,12 @@ msgstr "L" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:26 msgid "L Button" -msgstr "L 键" +msgstr "左键" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:48 msgid "L-Analog" -msgstr "L-摇杆" +msgstr "L-模拟" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Language:" @@ -3294,16 +3344,16 @@ msgstr "语言:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:418 #, c-format msgid "Last %i" -msgstr "" +msgstr "最近 %i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Latency:" -msgstr "延迟:" +msgstr "延迟:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:264 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "Left" -msgstr "左" +msgstr "左方向键" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64 msgid "Left Stick" @@ -3314,8 +3364,8 @@ msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -"左键单击检测热键.\n" -"按空格清除." +"左键单击检测热键。\n" +"按空格清除。" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742 msgid "" @@ -3323,17 +3373,17 @@ msgid "" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -"左键单击检测输入.\n" -"中键单击清除.\n" -"右键单击得到更多选项." +"左键单击检测输入。\n" +"中键单击清除。\n" +"右键单击得到更多选项。" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -"左/右单击得到更多选项.\n" -"中键单击清除" +"左/右单击得到更多选项。\n" +"中键单击清除。" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 msgid "Less Than" @@ -3341,7 +3391,7 @@ msgstr "小于" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Limit by FPS" -msgstr "" +msgstr "依据FPS限速" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979 msgid "Load" @@ -3352,91 +3402,80 @@ msgid "Load Custom Textures" msgstr "加载自定义纹理" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "载入状态(&L)" +msgstr "载入状态" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "载入存档插槽 1" +msgstr "载入最近状态 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "载入存档插槽 2" +msgstr "载入最近状态 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "载入存档插槽 3" +msgstr "载入最近状态 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "载入存档插槽 4" +msgstr "载入最近状态 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "载入存档插槽 5" +msgstr "载入最近状态 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "载入存档插槽 6" +msgstr "载入最近状态 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "载入存档插槽 7" +msgstr "载入最近状态 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "载入存档插槽 8" +msgstr "载入最近状态 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" -msgstr "载入存档插槽 1" +msgstr "载入状态 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "载入存档插槽 1" +msgstr "载入状态 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" -msgstr "载入存档插槽 2" +msgstr "载入状态 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 msgid "Load State Slot 3" -msgstr "载入存档插槽 3" +msgstr "载入状态 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 msgid "Load State Slot 4" -msgstr "载入存档插槽 4" +msgstr "载入状态 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 msgid "Load State Slot 5" -msgstr "载入存档插槽 5" +msgstr "载入状态 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 msgid "Load State Slot 6" -msgstr "载入存档插槽 6" +msgstr "载入状态 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 msgid "Load State Slot 7" -msgstr "载入存档插槽 7" +msgstr "载入状态 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 msgid "Load State Slot 8" -msgstr "载入存档插槽 8" +msgstr "载入状态 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "载入存档插槽 1" +msgstr "载入状态 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3457,13 +3496,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"加载User/Load/Textures/<游戏 ID>/目录中的自定义材质。\n" +"加载 User/Load/Textures/<游戏 ID>/ 目录中的\n" +"自定义材质。\n" "\n" "如果没有把握,请不要勾选此项。" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:37 msgid "Load preset values from hack patterns available." -msgstr "" +msgstr "从可用的修正模式加载预设值。" #: Source/Core/DolphinWX/Src/LogWindow.h:38 msgid "Log" @@ -3488,8 +3528,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"将每秒渲染的帧数记录于User/Logs/fps.txt。当您想要​衡量​Dolphin的性能时可启用此" -"功能。\n" +"将每秒渲染的帧数记录于 User/Logs/fps.txt。当您想要​\n" +"衡量 Dolphin 的性能时可启用此功能。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -3508,7 +3548,7 @@ msgstr "丢失服务器连接!" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:29 msgid "M Button" -msgstr "M 键" +msgstr "中键" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155 #, c-format @@ -3521,7 +3561,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "MMU Speed Hack" -msgstr "MMU 速度破解" +msgstr "MMU 破解加速" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:517 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 @@ -3549,8 +3589,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"通过移除雾提升远处对象的可见性,进而增加整体细节。\n" -"有些游戏依靠正确的雾模拟,禁用雾将破坏其可玩性。\n" +"通过移除雾提升远处对象的可见性,进而增加整体\n" +"细节。\n" +"有些游戏依靠正确的雾模拟,禁用雾将破坏其游戏\n" +"性。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -3561,7 +3603,7 @@ msgstr "最大" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 msgid "Memcard already has a save for this title" -msgstr "Memcard already has a save for this title" +msgstr "内存卡中已经有了该游戏的存档" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:278 msgid "Memcard already opened" @@ -3569,7 +3611,7 @@ msgstr "内存卡已经打开" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924 msgid "Memory Byte" -msgstr "" +msgstr "内存字节" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:212 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 @@ -3580,7 +3622,7 @@ msgstr "内存卡" msgid "" "Memory Card Manager WARNING-Make backups before using, should be fixed but " "could mangle stuff!" -msgstr "" +msgstr "内存卡管理器 ▲注意▲-使用前先备份,进行过修复但仍有可能损坏数据!" #: Source/Core/Core/Src/CoreParameter.cpp:376 #, c-format @@ -3592,12 +3634,12 @@ msgid "" "%s\n" "Would you like to copy the old file to this new location?\n" msgstr "" -"Memory Card filename in Slot %c is incorrect\n" -"Region not specified\n" +"在插槽 %c 中的内存卡文件名不正确\n" +"没有指定区域\n" "\n" -"Slot %c path was changed to\n" +"插槽 %c 路径被修改成\n" "%s\n" -"Would you like to copy the old file to this new location?\n" +"你想复制旧文件到这个新位置吗?\n" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 msgid "Memorycard filesize does not match the header size" @@ -3609,7 +3651,7 @@ msgstr "菜单" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Mic" -msgstr "Mic" +msgstr "麦克" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115 @@ -3635,7 +3677,10 @@ msgid "" "reset in most cases.\n" "\n" "If unsure, leave this unchecked." -msgstr "修改纹理以显示以哪种格式编码" +msgstr "" +"修改纹理以显示以其编码格式。通常需要重置模拟。\n" +"\n" +"如果不确定,不要勾选此项。" #: Source/Core/DolphinWX/Src/LogWindow.cpp:108 msgid "Monospaced font" @@ -3643,7 +3688,7 @@ msgstr "等宽字体" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296 msgid "Motion Plus" -msgstr "Motion Plus" +msgstr "动感强化器" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 @@ -3670,99 +3715,99 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:62 msgid "Multiply" -msgstr "多人游戏" +msgstr "乘号" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659 msgid "NOP" -msgstr "" +msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "注意:流大小与真实数据长度不匹配\n" +msgstr "注意: 流大小与真实数据长度不匹配\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:116 msgid "NP Add" -msgstr "NP Add" +msgstr "小键盘加" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:111 msgid "NP Begin" -msgstr "NP Begin" +msgstr "小键盘 Begin" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:119 msgid "NP Decimal" -msgstr "NP Decimal" +msgstr "小键盘点" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:113 msgid "NP Delete" -msgstr "NP Delete" +msgstr "小键盘 Delete" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:120 msgid "NP Divide" -msgstr "NP Divide" +msgstr "小键盘除" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:107 msgid "NP Down" -msgstr "NP Down" +msgstr "小键盘下" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:110 msgid "NP End" -msgstr "NP End" +msgstr "小键盘 End" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:98 msgid "NP Enter" -msgstr "NP Enter" +msgstr "小键盘 Enter" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:114 msgid "NP Equal" -msgstr "NP Equal" +msgstr "小键盘等号" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:103 msgid "NP Home" -msgstr "NP Home" +msgstr "小键盘 Home" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:112 msgid "NP Insert" -msgstr "NP Insert" +msgstr "小键盘 Insert" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:104 msgid "NP Left" -msgstr "NP Left" +msgstr "小键盘左" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:115 msgid "NP Multiply" -msgstr "NP Multiply" +msgstr "小键盘乘" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:109 msgid "NP Page Down" -msgstr "NP Page Down" +msgstr "小键盘 Page Down" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:108 msgid "NP Page Up" -msgstr "NP Page Up" +msgstr "小键盘 Page Up" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:106 msgid "NP Right" -msgstr "NP Right" +msgstr "小键盘右" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:117 msgid "NP Separator" -msgstr "NP Separator" +msgstr "小键盘 Separator" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:96 msgid "NP Space" -msgstr "NP Space" +msgstr "小键盘空格" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:118 msgid "NP Subtract" -msgstr "NP Subtract" +msgstr "小键盘减" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:97 msgid "NP Tab" -msgstr "NP Tab" +msgstr "小键盘 Tab" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:105 msgid "NP Up" -msgstr "NP Up" +msgstr "小键盘上" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:456 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46 @@ -3809,7 +3854,7 @@ msgstr "未找到镜像或者WAD" #: Source/Core/Core/Src/ConfigManager.h:17 msgid "No audio output" -msgstr "" +msgstr "无音频输出" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552 #, c-format @@ -3823,7 +3868,7 @@ msgstr "没有可用的说明" #: Source/Core/DolphinWX/Src/FrameAui.cpp:535 msgid "No docking" -msgstr "No docking" +msgstr "禁用停靠" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871 msgid "No file loaded" @@ -3840,7 +3885,7 @@ msgstr "没有已录制文件" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545 #, c-format msgid "No save folder found for title %s" -msgstr "No save folder found for title %s" +msgstr "没有找到名称为 %s 的存档文件夹" #: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138 #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118 @@ -3866,7 +3911,7 @@ msgstr "未设置" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141 #, c-format msgid "Not a Wii save or read failure for file header size %x" -msgstr "" +msgstr "不是 Wii 存档或因为文件标头大小 %x 无法读取" #: Source/Core/DolphinWX/Src/Main.cpp:669 msgid "Not connected" @@ -3904,15 +3949,15 @@ msgstr "双节棍控制器" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 msgid "Nunchuk Acceleration" -msgstr "Nunchuk 加速" +msgstr "双节棍加速度" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "Object" -msgstr "" +msgstr "对象" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122 msgid "Object Range" -msgstr "" +msgstr "对象范围" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Off" @@ -3924,11 +3969,11 @@ msgstr "偏移量:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 msgid "On-Screen Display Messages" -msgstr "屏幕显示消息(OSD)" +msgstr "屏幕显示消息" #: Source/Core/DolphinWX/Src/FrameTools.cpp:300 msgid "Online &Documentation" -msgstr "" +msgstr "在线文档(&D)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 #, c-format @@ -3968,7 +4013,7 @@ msgstr "OpenAL: 不能打开设备 %s" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "OpenCL Texture Decoder" -msgstr "OpenCL纹理解码器" +msgstr "OpenCL 纹理解码器" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "OpenMP Texture Decoder" @@ -3978,11 +4023,11 @@ msgstr "OpenMP纹理解码器" msgid "" "Opens the default (read-only) configuration for this game in an external " "text editor." -msgstr "" +msgstr "在外部文本编辑器中打开本游戏的默认 (只读) 设置。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:295 msgid "Opens the user specified overrides in an external text editor." -msgstr "" +msgstr "在外部文本编辑器中打开用户指定的覆盖设置。" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:81 @@ -3994,7 +4039,6 @@ msgid "Orange" msgstr "橙" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -4013,9 +4057,7 @@ msgstr "其他" msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." -msgstr "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." +msgstr "游戏运行期间其他客户端断开连接!! NetPlay 已禁用。您需要手动停止游戏。" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528 msgid "Output" @@ -4061,7 +4103,7 @@ msgstr "分区 %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:852 #, c-format msgid "Partition doesn't exist: %lu" -msgstr "" +msgstr "分区不存在: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "Patches" @@ -4092,7 +4134,7 @@ msgstr "完美" #: Source/Core/DolphinWX/Src/FrameAui.cpp:642 #, c-format msgid "Perspective %d" -msgstr "视角%d" +msgstr "布局 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152 #: Source/Core/DolphinWX/Src/FrameTools.cpp:463 @@ -4111,7 +4153,7 @@ msgstr "开始/暂停" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:359 msgid "Playable" -msgstr "可以玩" +msgstr "尚可" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141 msgid "Playback Options" @@ -4127,11 +4169,11 @@ msgstr "请确认..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:612 msgid "Please create a perspective before saving" -msgstr "Please create a perspective before saving" +msgstr "存储前请先创建一个布局" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:23 msgid "Plus-Minus" -msgstr "Plus-Minus" +msgstr "加-减" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Polish" @@ -4173,17 +4215,17 @@ msgstr "后处理效果:" #: Source/Core/Core/Src/Movie.cpp:932 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "在PlayController中提前结束影片。%u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:1051 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "在 PlayWiimote 中提前结束影片。%u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:1028 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "在PlayWiimote 中提前结束影片。%u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:35 msgid "Presets: " @@ -4207,7 +4249,7 @@ msgstr "打印" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949 msgid "Profile" -msgstr "配置" +msgstr "预设" #: Source/Core/DolphinWX/Src/ISOProperties.h:42 msgid "Properties" @@ -4233,12 +4275,12 @@ msgstr "R" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "R Button" -msgstr "R 键" +msgstr "右键" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 msgid "R-Analog" -msgstr "R-摇杆" +msgstr "R-模拟" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446 msgid "RAM" @@ -4246,11 +4288,11 @@ msgstr "内存" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:169 msgid "RUSSIA" -msgstr "俄语" +msgstr "俄罗斯" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:229 msgid "Radius" -msgstr "" +msgstr "半径" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577 msgid "Range" @@ -4266,15 +4308,15 @@ msgstr "真实" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64 msgid "Real Balance Board" -msgstr "" +msgstr "真实平衡板" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24 msgid "Real Wiimote" -msgstr "真实Wii遥控器" +msgstr "真实 Wii 控制器" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80 msgid "Real Wiimotes" -msgstr "真实Wii遥控器" +msgstr "真实 Wii 控制器" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205 @@ -4284,9 +4326,8 @@ msgid "Record" msgstr "录制" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "录制选项" +msgstr "录制输入" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4316,7 +4357,7 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"减轻栅格化3D图像产生的混叠。\n" +"减轻栅格化 3D 图像产生的混叠。\n" "这将使渲染出的图像看起来不那么斑驳。\n" "严重降低模拟速度且有时产生问题。\n" "\n" @@ -4355,7 +4396,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Render to Main Window" -msgstr "附加到主窗口" +msgstr "渲染到主窗口" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970 @@ -4372,12 +4413,12 @@ msgstr "回车" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 msgid "Revision:" -msgstr "" +msgstr "修订版:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:265 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:44 msgid "Right" -msgstr "右" +msgstr "向右键" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65 msgid "Right Stick" @@ -4389,12 +4430,9 @@ msgid "Rumble" msgstr "震动" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -#, fuzzy msgid "" "Run DSP LLE on a dedicated thread (not recommended: might cause freezes)." -msgstr "" -"在一个专门的线程上运行DSP HLE和LLE(不推荐:用于HLE时可能产生声音差错,用于" -"LLE时可能导致卡机)。" +msgstr "在专用的线程中运行DSP LLE (不推荐: 可能导致卡死)。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Russian" @@ -4419,56 +4457,52 @@ msgid "Save GCI as..." msgstr "保存GCI为..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "保存状态(&V)" +msgstr "保存最早状态" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "保存状态(&V)" +msgstr "保存状态" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" -msgstr "存档插槽 1" +msgstr "保存状态 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "存档插槽 1" +msgstr "保存状态 10" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" -msgstr "存档插槽 2" +msgstr "保存状态 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 msgid "Save State Slot 3" -msgstr "存档插槽 3" +msgstr "保存状态 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 msgid "Save State Slot 4" -msgstr "存档插槽 4" +msgstr "保存状态 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 msgid "Save State Slot 5" -msgstr "存档插槽 5" +msgstr "保存状态 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 msgid "Save State Slot 6" -msgstr "存档插槽 6" +msgstr "保存状态 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 msgid "Save State Slot 7" -msgstr "存档插槽 7" +msgstr "保存状态 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 msgid "Save State Slot 8" -msgstr "存档插槽 8" +msgstr "保存状态 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "存档插槽 1" +msgstr "保存状态 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4485,7 +4519,7 @@ msgstr "保存压缩的GCM/镜像" #: Source/Core/DolphinWX/Src/FrameTools.cpp:485 msgid "Save current perspective" -msgstr "保存当前视角" +msgstr "保存当前布局" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 msgid "Save decompressed GCM/ISO" @@ -4494,11 +4528,11 @@ msgstr "保存解压缩的GCM/镜像" #: Source/Core/Core/Src/Movie.cpp:794 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Savestate movie %s is corrupted, movie recording stopping..." +msgstr "即时存档影片 %s 被破坏, 影片录制停止..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Scaled EFB Copy" -msgstr "缩放EFB副本" +msgstr "缩放 EFB 副本" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546 #, c-format @@ -4507,11 +4541,11 @@ msgstr "正在扫描%s" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529 msgid "Scanning for ISOs" -msgstr "扫描镜像中" +msgstr "正在扫描镜像" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530 msgid "Scanning..." -msgstr "扫描中..." +msgstr "正在扫描..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:466 msgid "ScrShot" @@ -4606,15 +4640,15 @@ msgid "" msgstr "" "选择渲染时使用哪种宽高比:\n" "自动:使用原生宽高比。\n" -"强制16:9:将图像拉伸至16:9宽高比。\n" -"强制4:3:将图像拉伸至4:3宽高比。\n" -"拉伸到窗口:将图像拉伸至窗口大小。\n" +"强制 16:9: 将图像拉伸至 16:9 宽高比。\n" +"强制 4:3: 将图像拉伸至 4:3 宽高比。\n" +"拉伸到窗口: 将图像拉伸至窗口大小。\n" "\n" "如果没有把握,请选择“自动”。" #: Source/Core/InputCommon/Src/InputConfig.cpp:49 msgid "Selected controller profile does not exist" -msgstr "所选控制器配置不存在" +msgstr "所选控制器预设不存在" #: Source/Core/DolphinWX/Src/LogWindow.cpp:109 msgid "Selected font" @@ -4630,7 +4664,8 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" "选择全屏模式所使用的显示分辨率。\n" -"该数值应始终大于或等于内部分辨率。对性能的影响可以忽略。\n" +"该数值应始终大于或等于内部分辨率。对性能的影响\n" +"可以忽略。\n" "\n" "如果没有把握,请使用您的桌面分辨率。\n" "如果仍然不能确定,使用最高的有效分辨率。" @@ -4644,11 +4679,12 @@ msgid "" "\n" "If unsure, use Direct3D 11." msgstr "" -"选择供内部使用的图像应用程序接口(API)。\n" -"Direct3D 9通常最快,而OpenGL会更加精确,Direct3D 11介乎两者之间。\n" -"请注意Direct3D后端只在Windows下可用。\n" +"选择供内部使用的图像应用程序接口。\n" +"Direct3D 9 通常最快,而 OpenGL 会更加精确,\n" +"Direct3D 11 介乎两者之间。\n" +"请注意 Direct3D 后端只在 Windows 下可用。\n" "\n" -"如果没有把握,请选择Direct3D 11。" +"如果没有把握,请选择 Direct3D 11。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" @@ -4659,11 +4695,12 @@ msgid "" "\n" "If unsure, use OpenGL." msgstr "" -"选择内部使用哪种图像应用程序接口(API)。\n" -"Direct3D 9通常最快,而OpenGL更加精确,Direct3D 11介乎两者之间。\n" -"请注意Direct3D后端只在Windows下可用。\n" +"选择内部使用哪种图像应用程序接口。\n" +"Direct3D 9 通常最快,而 OpenGL 更加精确,\n" +"Direct3D 11 介乎两者之间。\n" +"请注意 Direct3D 后端只在 Windows 下可用。\n" "\n" -"如果没有把握,请选择OpenGL。" +"如果没有把握,请选择 OpenGL。" #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Send" @@ -4671,11 +4708,11 @@ msgstr "发送" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110 msgid "Sensor Bar Position:" -msgstr "传感器栏位置" +msgstr "传感器栏位置:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:64 msgid "Separator" -msgstr "分割" +msgstr "Separator" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Serbian" @@ -4698,22 +4735,21 @@ msgstr "设置为默认内存卡 %c" #: Source/Core/Core/Src/ActionReplay.cpp:450 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive: Index is greater than ar code list size %lu" +msgstr "SetARCode_IsActive: 索引大于 AR 码列表大小 %lu" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:521 msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." -msgstr "设置延迟(以毫秒计)。较高的值或将减少音频噼啪声。仅适用于OpenAL后端。" +msgstr "设置延迟 (以毫秒计) 。较高的值或将减少音频噼啪声。仅适用于OpenAL后端。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Settings..." msgstr "设置..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "安装Wii内存: 不能找到设置文件" +msgstr "安装Wii内存:无法创建设置文件" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4725,7 +4761,7 @@ msgstr "短名称:" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92 msgid "Shoulder Buttons" -msgstr "" +msgstr "肩部按钮" #: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "Show &Console" @@ -4744,9 +4780,8 @@ msgid "Show &Toolbar" msgstr "显示工具栏(&T)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "默认" +msgstr "显示默认值" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -4754,7 +4789,7 @@ msgstr "显示驱动器" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" -msgstr "显示EFB复制范围" +msgstr "显示 EFB 复制范围" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Show FPS" @@ -4770,7 +4805,7 @@ msgstr "显示 GameCube" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 msgid "Show Input Display" -msgstr "显示输入显示" +msgstr "显示输入回显" #: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Italy" @@ -4844,7 +4879,7 @@ msgstr "显示第一区块" #: Source/Core/DolphinWX/Src/FrameTools.cpp:131 msgid "Show lag counter" -msgstr "" +msgstr "显示丢帧计数器" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" @@ -4898,7 +4933,7 @@ msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310 msgid "Sideways Wiimote" -msgstr "Sideways Wiimote" +msgstr "横置 Wii 控制器" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" @@ -4910,15 +4945,15 @@ msgstr "大小" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:702 msgid "Skip BIOS" -msgstr "跳过BIOS" +msgstr "跳过 BIOS" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Skip DCBZ clearing" -msgstr "" +msgstr "跳过DCBZ清除" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Skip EFB Access from CPU" -msgstr "跳过EFB访问" +msgstr "跳过 EFB 访问" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" @@ -4929,6 +4964,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"以牺牲模拟准确性为代价略微提高缓存 EFB 到\n" +"内存的速度。\n" +"有时也会提高视觉质量。\n" +"如果遇到任何问题,请尝试提高纹理缓存精确度或\n" +"禁用此项。\n" +"\n" +"如果没有把握,请不要勾选此项。" #: Source/Core/DolphinWX/Src/FrameTools.cpp:389 #: Source/Core/DolphinWX/Src/FrameTools.cpp:403 @@ -4960,8 +5002,8 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" "软件渲染比其他后端慢一个数量级。\n" -"该项仅当用于调试目的时有所帮助。\n" -"您真的想要启用软件渲染吗?如果没有把握,请选择“否”。" +"该渲染器仅适用于调试目的。\n" +"您真的想要启用软件渲染吗? 如果不确定,请选择“否”。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Sound Settings" @@ -5002,11 +5044,13 @@ msgid "" "\n" "If unsure, select 640x528." msgstr "" -"指定渲染使用的分辨率。选择较高的分辨率将显著提高图像质量,但也将严重影响性能" -"且可能在一些游戏中引起故障。\n" -"“640x528的倍数”比“窗口大小”略慢,但产生更少问题。一般而言,内部分辨率越低,性" -"能将越高。\n" -"如果没有把握,请选择640x528。" +"指定渲染使用的分辨率。选择较高的分辨率将显著\n" +"提高图像质量,但也将严重影响性能且可能在一些\n" +"游戏中引起故障。\n" +"“640x528 的倍数”比“窗口大小”略慢,但产生更少\n" +"问题。一般而言,内部分辨率越低,性能将越高。\n" +"\n" +"如果没有把握,请选择 640x528。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Speed up Disc Transfer Rate" @@ -5028,7 +5072,7 @@ msgstr "开始" #: Source/Core/DolphinWX/Src/FrameTools.cpp:197 msgid "Start &NetPlay" -msgstr "开始网络对战(&N)" +msgstr "开始 NetPlay(&N)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:347 msgid "Start Re&cording" @@ -5068,8 +5112,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"在GPU材质对象中存储EFB副本。\n" -"这并不十分精确,但对多数游戏来说效果足够好且与缓冲EFB到RAM相比有显著提速。\n" +"在 GPU 材质对象中存储 EFB 副本。\n" +"这并不十分精确,但对多数游戏来说效果足够好且与\n" +"缓冲 EFB 到 RAM 相比有显著提速。\n" "\n" "如果没有把握,请勾选此项。" @@ -5079,11 +5124,11 @@ msgstr "拉伸到窗口大小" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47 msgid "Strum" -msgstr "Strum" +msgstr "弹拨" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:65 msgid "Subtract" -msgstr "Subtract" +msgstr "减号" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109 #, c-format @@ -5096,21 +5141,22 @@ msgstr "成功导入存档文件" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Swedish" -msgstr "" +msgstr "瑞典语" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276 msgid "Swing" -msgstr "摇摆" +msgstr "挥舞" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Synchronize GPU thread" -msgstr "同步GPU线程" +msgstr "同步 GPU 线程" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual " "Core mode. (ON = Compatible, OFF = Fast)" -msgstr "同步GPU与CPU线程以帮助防止双核模式下的偶发卡死。(开=兼容,关=快速)" +msgstr "" +"同步 GPU 与 CPU 线程以帮助防止双核模式下的偶发卡死。 (开=兼容,关=快速)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:785 @@ -5132,15 +5178,15 @@ msgstr "Tab" #: Source/Core/DolphinWX/Src/FrameAui.cpp:531 msgid "Tab split" -msgstr "Tab split" +msgstr "Tab split(标签分割)" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41 msgid "Table Left" -msgstr "Table Left" +msgstr "左唱盘" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42 msgid "Table Right" -msgstr "Table Right" +msgstr "右唱盘" #: Source/Core/DolphinWX/Src/FrameTools.cpp:363 #: Source/Core/DolphinWX/Src/FrameTools.cpp:466 @@ -5150,7 +5196,7 @@ msgstr "屏幕截图" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "TaruKonga (Bongos)" -msgstr "TaruKonga (Bongos)" +msgstr "TaruKonga (森喜刚鼓)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535 msgid "Test" @@ -5192,8 +5238,8 @@ msgid "" "The file %s already exists.\n" "Do you wish to replace it?" msgstr "" -"文件 %s 已经存在.\n" -"您要替换它么?" +"文件 %s 已经存在。\n" +"是否替换?" #: Source/Core/AudioCommon/Src/WaveFile.cpp:39 #, c-format @@ -5205,7 +5251,7 @@ msgstr "文件%s无法以写入形式打开。请检查该文件是否已经被 #: Source/Core/AudioCommon/Src/WaveFile.cpp:32 #, c-format msgid "The file %s was already open, the file header will not be written." -msgstr "The file %s was already open, the file header will not be written." +msgstr "文件 %s 已经打开,文件头不会被写入。" #: Source/Core/Core/Src/Boot/Boot.cpp:320 #, c-format @@ -5222,7 +5268,7 @@ msgstr "名称不能包含字符 ','" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "产生的已解密动作回放代码不包含任何行。" +msgstr "产生的已解密 AR 代码不包含任何行。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" @@ -5231,7 +5277,8 @@ msgid "" "\n" "If unsure, use the rightmost value." msgstr "" -"越往“安全”方向调节,模拟器丢失内存中纹理更新的机遇越小。\n" +"越往“安全”方向调节,模拟器丢失内存中纹理更新的\n" +"机率越小。\n" "\n" "如果没有把握,请将滑块拖动至最右。" @@ -5247,7 +5294,7 @@ msgstr "您的系统不支持选定的语言。正在退回系统默认。" #: Source/Core/Core/Src/NetPlayClient.cpp:93 msgid "The server and client's NetPlay versions are incompatible!" -msgstr "服务器与客户端的NetPlay版本不兼容!" +msgstr "服务器与客户端的 NetPlay 版本不兼容!" #: Source/Core/Core/Src/NetPlayClient.cpp:90 msgid "The server is full!" @@ -5255,7 +5302,7 @@ msgstr "服务器已满!" #: Source/Core/Core/Src/NetPlayClient.cpp:96 msgid "The server responded: the game is currently running!" -msgstr "服务器回应:游戏正在运行!" +msgstr "服务器回应: 游戏正在运行!" #: Source/Core/Core/Src/NetPlayClient.cpp:99 msgid "The server sent an unknown error message!" @@ -5278,9 +5325,7 @@ msgstr "主题:" msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." -msgstr "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." +msgstr "必须有一个标签给 00000001/00000002。你的NAND转储可能不完整。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "" @@ -5294,11 +5339,11 @@ msgstr "" msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." -msgstr "此动作回放模拟器不支持修改动作回放本身的代码。" +msgstr "此Action Replay模拟器不支持修改Action Replay本身的代码。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." -msgstr "这会导致Wii Menu和一些游戏减速。" +msgstr "这会导致 Wii 菜单和一些游戏减速。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" @@ -5312,22 +5357,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "此功能使您能够改变游戏的摄影机。\n" -"按住鼠标右键移动鼠标以摇动镜头,按住鼠标中键移动鼠标以移动。\n" -"按住SHIFT并按下WASD中的一个将以固定步长移动摄影机(SHIFT+0加速,SHIFT+9减速)。" +"按住鼠标右键移动鼠标以摇动镜头,按住鼠标中键\n" +"移动鼠标以移动。\n" +"按住 SHIFT 并按下 WASD 中的一个将以固定步长\n" +"移动摄影机 (SHIFT+0加速,SHIFT+9减速)。\n" "按SHIFT+R以重置摄影机。\n" "\n" "如果没有把握,请不要勾选此项。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 -#, fuzzy msgid "" "This limits the game speed to the specified number of frames per second " "(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to " "throttle using the DSP (might fix audio clicks but can also cause constant " "noise depending on the game)." msgstr "" -"如果设置的帧数限制高于游戏的全速(NTSC:60, PAL:50)。选择“音频”以使用DSP限制速" -"度(可能修正咔嗒声但也可能导致持续的噪音,因游戏而异)。" +"该选项将游戏速度限制为制定的帧率 (NTSC全速为60,PAL全速为50) 。也可以选择音频" +"以使用DSP限制速度 (可能修正咔嗒声但也可能导致持续的噪音,因游戏而异) 。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" @@ -5336,12 +5382,12 @@ msgid "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." msgstr "" -"这将分离视频与CPU线程,以便于在不同的核心中运行。\n" -"在有多于一个核心的PC中将带来大幅提速,但可能导致偶发性的崩溃或故障。" +"这将分离视频与 CPU 线程,以便于在不同的核心中运行。\n" +"在有多于一个核心的 PC 中将带来大幅提速,但可能导致偶发性的崩溃或故障。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:287 msgid "This will let you Manually Edit the INI config file" -msgstr "这将允许你手动编辑INI配置文件" +msgstr "这将允许你手动编辑 INI 配置文件" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:237 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:242 @@ -5367,19 +5413,16 @@ msgid "Toggle All Log Types" msgstr "切换所有日志类型" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "宽高比:" +msgstr "切换宽高比" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "EFB副本" +msgstr "切换 EFB 副本" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "切换所有日志类型" +msgstr "切换雾" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5388,7 +5431,7 @@ msgstr "切换全屏" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 msgid "Toggle IR" -msgstr "" +msgstr "切换内部分辨率" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 @@ -5409,15 +5452,15 @@ msgstr "扳机" #: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101 msgid "Trying to read from invalid SYSCONF" -msgstr "正在尝试从无效的SYSCONF中读取" +msgstr "正在尝试从无效的 SYSCONF 中读取" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31 msgid "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" msgstr "" -"正在尝试从无效的SYSCONF中读取\n" -"Wiimote bt ids将不可用" +"正在尝试从无效的 SYSCONF 中读取\n" +"Wiimote bt ids 不可用" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Turkish" @@ -5425,7 +5468,7 @@ msgstr "土耳其语" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33 msgid "Turntable" -msgstr "唱机转盘" +msgstr "转盘 (DJ 英雄)" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 msgid "Type" @@ -5438,7 +5481,7 @@ msgstr "UDP 端口:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" -msgstr "UDP Wiimote" +msgstr "UDP Wii 控制器" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:193 msgid "UNKNOWN" @@ -5458,6 +5501,8 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"无法从给出的值中创建补丁。\n" +"项目未修正。" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111 #, c-format @@ -5466,9 +5511,9 @@ msgid "" "decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"不能将输入的动作回放代码的第 %lu 行作为加密或解密的代码分析。 请检查是否输入" -"正确。\n" -"是否忽略此行继续分析?" +"无法将所输入 AR 代码的第 %lu 行作为有效的加密或解密代码进行分析。 请确保代码" +"输入正确。\n" +"是否要忽略此行继续分析?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:430 #, c-format @@ -5480,13 +5525,12 @@ msgid "Undo Load State" msgstr "撤销载入状态" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "撤销载入状态" +msgstr "撤销保存状态" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "意外的 0x80 呼叫? 正在中止..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192 msgid "Unknown" @@ -5500,27 +5544,27 @@ msgstr "未知 DVD 命令 %08x - 致命错误" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444 #, c-format msgid "Unknown command 0x%08x" -msgstr "" +msgstr "未知指令 0x%08x" #: Source/Core/Common/Src/SysConf.cpp:132 #, c-format msgid "Unknown entry type %i in SYSCONF (%s@%x)!" -msgstr "Unknown entry type %i in SYSCONF (%s@%x)!" +msgstr "未知的项目类型 %i 在 SYSCONF (%s@%x)!" #: Source/Core/Core/Src/NetPlayClient.cpp:296 #, c-format msgid "Unknown message received with id : %d" -msgstr "Unknown message received with id : %d" +msgstr "收到未知的消息,ID: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:394 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "Unknown message with id:%d received from player:%d Kicking player!" +msgstr "收到未知的消息,ID:%d 来自玩家:%d 剔除玩家!" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:262 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 msgid "Up" -msgstr "上" +msgstr "向上键" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 @@ -5529,11 +5573,11 @@ msgstr "更新" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311 msgid "Upright Wiimote" -msgstr "直握 Wiimote" +msgstr "直握 Wii 控制器" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "Use EuRGB60 Mode (PAL60)" -msgstr "使用 EuRGB60 模式 (PAL60)" +msgstr "使用欧洲 RGB60 模式 (PAL60)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295 msgid "Use Fullscreen" @@ -5554,6 +5598,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"使用精确度较低的算法计算深度值。\n" +"在一些游戏中将导致问题但可能带来可观的提速。\n" +"\n" +"如果不能确定,请勾选此项。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5563,7 +5611,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "使用多个线程解码纹理。\n" -"可能带来提速(尤其在含有多于两个核心的CPU上)。\n" +"可能带来提速 (尤其在含有多于两个核心的 CPU 上)。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -5575,6 +5623,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"使用不稳定的方法来加速 OpenGL 的顶点流。在已支持\n" +"的 GPU 中尚未发现问题,反之则可能会造成严重的稳定\n" +"性及图像的问题。\n" +"\n" +"如果不确定,不要勾选此项。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5598,9 +5651,8 @@ msgid "V-Sync" msgstr "垂直同步" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU 速度破解" +msgstr "VBeam 破解加速" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5620,7 +5672,7 @@ msgstr "详细" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "Vertex Streaming Hack" -msgstr "" +msgstr "顶点流破解" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:389 msgid "Video" @@ -5642,7 +5694,7 @@ msgstr "WAD 安装失败: 创建 %s 错误" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524 msgid "WAD installation failed: error creating ticket" -msgstr "" +msgstr "WAD 安装失败:创建标签错误" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" @@ -5652,7 +5704,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "等待场消隐期以减少撕裂。\n" -"模拟速度低于100%时会降低性能。\n" +"模拟速度低于 100% 时会降低性能。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -5664,15 +5716,15 @@ msgstr "警告" #: Source/Core/Core/Src/Boot/Boot.cpp:279 msgid "Warning - starting DOL in wrong console mode!" -msgstr "Warning - starting DOL in wrong console mode!" +msgstr "警告 - 正在错误的终端模式下开始 DOL!" #: Source/Core/Core/Src/Boot/Boot.cpp:329 msgid "Warning - starting ELF in wrong console mode!" -msgstr "Warning - starting ELF in wrong console mode!" +msgstr "警告 - 正在错误的终端模式下开始 ELF!" #: Source/Core/Core/Src/Boot/Boot.cpp:209 msgid "Warning - starting ISO in wrong console mode!" -msgstr "Warning - starting ISO in wrong console mode!" +msgstr "警告 - 正在错误的终端模式下开始 ISO!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563 #, c-format @@ -5693,7 +5745,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"警告: 这会覆盖以下文件夹中与您的记忆卡里的文件同名的任何已存在存档:\n" +"警告: 这会覆盖以下文件夹中与您的存储卡里文件同名的任何已有存档:\n" "%s\n" "要继续吗?" @@ -5704,6 +5756,8 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +"警告: 您读取的存档在当前影片结束之后。 (字节%u > %u) (帧%u > %u) 。您需要读取" +"另一个存档方可继续,或关闭只读模式再读取此状态存档。" #: Source/Core/Core/Src/Movie.cpp:854 #, c-format @@ -5712,6 +5766,8 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +"警告: 您读取的存档在 %d (0x%X) 字节处与影片不匹配。您需要读取另一个存档方可继" +"续,或关闭只读模式再读取此状态存档。否则将可能发生不同步。" #: Source/Core/Core/Src/Movie.cpp:864 #, c-format @@ -5731,6 +5787,18 @@ msgid "" "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +"警告: 您所读取存档的第%d帧与影片不匹配。您需要读取另一个存档方可继续,或关闭" +"只读模式再读取此状态存档。否则将可能发生不同步。\n" +"\n" +"更多信息: 当前影片长度为%d帧而状态存档的影片长度为%d帧。\n" +"\n" +"在第%d帧,当前影片按下了:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"\n" +"在第%d帧,状态存档的影片按下了:\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:96 #: Source/Core/AudioCommon/Src/WaveFile.cpp:119 @@ -5739,11 +5807,11 @@ msgstr "波形文件写入器 - 文件未打开." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60 msgid "Whammy" -msgstr "Whammy" +msgstr "颤音" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409 msgid "Widescreen Hack" -msgstr "宽屏破解" +msgstr "强制宽屏" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:300 msgid "Width" @@ -5755,11 +5823,11 @@ msgstr "Wii" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:380 msgid "Wii Console" -msgstr "Wii控制台" +msgstr "Wii 控制台" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:837 msgid "Wii NAND Root:" -msgstr "Wii NAND 根目录:" +msgstr "Wii NAND 根目录:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1330 msgid "Wii save files (*.bin)|*.bin" @@ -5772,40 +5840,40 @@ msgstr "WiiWAD: 不能从文件读取" #: Source/Core/Core/Src/HW/Wiimote.cpp:20 #: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote" -msgstr "Wii遥控器" +msgstr "Wii 控制器" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21 #, c-format msgid "Wiimote %i" -msgstr "Wii遥控器 %i" +msgstr "Wii 控制器 %i" #: Source/Core/DolphinWX/Src/Main.cpp:671 msgid "Wiimote Connected" -msgstr "Wii遥控器已连接" +msgstr "Wii 控制器已连接" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108 msgid "Wiimote Motor" -msgstr "Wiimote 马达" +msgstr "Wii 控制器马达" #: Source/Core/DolphinWX/Src/FrameTools.cpp:472 msgid "Wiimote settings" -msgstr "Wii遥控器设置" +msgstr "Wii 控制器设置" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48 msgid "Wiimotes" -msgstr "Wii遥控器" +msgstr "Wii 控制器" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:121 msgid "Windows Left" -msgstr "窗口左侧" +msgstr "左 Windows" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:123 msgid "Windows Menu" -msgstr "窗口菜单" +msgstr "菜单键" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:122 msgid "Windows Right" -msgstr "窗口右侧" +msgstr "右 Windows" #: Source/Core/DolphinWX/Src/LogWindow.cpp:124 msgid "Word Wrap" @@ -5820,7 +5888,7 @@ msgstr "工作中..." #: Source/Core/DolphinWX/Src/NetWindow.cpp:353 msgid "Write memcards (GC)" -msgstr "" +msgstr "写入存储卡 (GC)" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 msgid "Write to Console" @@ -5846,16 +5914,16 @@ msgstr "XAudio2 CreateSourceVoice failed: %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101 #, c-format msgid "XAudio2 init failed: %#X" -msgstr "XAudio2 init failed: %#X" +msgstr "XAudio2 加载失败: %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111 #, c-format msgid "XAudio2 master voice creation failed: %#X" -msgstr "XAudio2 master voice creation failed: %#X" +msgstr "XAudio2 主声音创建失败: %#X" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776 msgid "XF reg" -msgstr "" +msgstr "XF 注册" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25 msgid "Yellow" @@ -5867,21 +5935,21 @@ msgid "" "All Wii games will work correctly, and most GC games should also work fine, " "but the GBA/IPL/CARD UCodes will not work.\n" msgstr "" -"您正在使用Dolphin团队制作的自由DSP ROM。\n" -"所有Wii游戏都能正确运行,多数GC游戏也将运行良好,但GBA/IPL/CARD UCode将无法运" -"行。\n" +"您正在使用 Dolphin 团队制作的自由 DSP ROM。\n" +"所有 Wii 游戏都能正确运行,多数GC游戏也将运行良好,但GBA/IPL/CARD UCode将无法" +"运行。\n" #: Source/Core/Core/Src/DSP/DSPCore.cpp:116 msgid "" "You are using an old free DSP ROM made by the Dolphin Team.\n" "Only games using the Zelda UCode will work correctly.\n" msgstr "" -"您正在使用Dolphin团队制作的旧版自由DSP ROM。\n" -"只有塞尔达UCode的游戏能够正确运行。\n" +"您正在使用 Dolphin 团队制作的旧版自由 DSP ROM。\n" +"只有使用塞尔达 UCode 的游戏能够正确运行。\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:63 msgid "You can't close panes that have pages in them." -msgstr "You can't close panes that have pages in them." +msgstr "你不能关闭含有页面的面板。" #: Source/Core/DolphinWX/Src/NetWindow.cpp:239 msgid "You must choose a game!!" @@ -5893,11 +5961,11 @@ msgstr "您必须输入一个名称!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "您必须输入一个十进制或者十六进制值." +msgstr "您必须输入一个有效的十进制、十六进制或八进制值。" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655 msgid "You must enter a valid profile name." -msgstr "您必须输入一个有效的配置文件名称." +msgstr "您必须输入一个有效的预设名称。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." @@ -5910,7 +5978,7 @@ msgid "" "If you select \"No\", audio might be garbled." msgstr "" "您的DSP ROM校检不正确。\n" -"是否要现在停止以处理这个问题?\n" +"是否要现在停止以处理这个问题?\n" "如果选择“否”,声音可能会出现混乱。" #: Source/Core/Core/Src/CoreParameter.cpp:177 @@ -5919,7 +5987,7 @@ msgid "" "Continue with PAL region?" msgstr "" "您的 GCM/ISO 文件似乎是无效的 (无效的国家)。\n" -"是否要使用 PAL 地区继续?" +"是否要使用 PAL 地区继续?" #: Source/Core/Common/Src/SysConf.cpp:45 #, c-format @@ -5930,11 +5998,11 @@ msgid "" msgstr "" "您的 SYSCONF 文件大小不正确。\n" "正确的大小为 0x%04x (但您的是 0x%04llx)\n" -"是否要生成一个新的?" +"是否要生成一个新的?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "ZTP hack" -msgstr "ZTP 破解" +msgstr "塞尔达传说:黄昏公主 修正" #: Source/Core/Core/Src/ActionReplay.cpp:377 msgid "Zero 3 code not supported" @@ -5943,7 +6011,7 @@ msgstr "Zero 3 代码不支持" #: Source/Core/Core/Src/ActionReplay.cpp:398 #, c-format msgid "Zero code unknown to dolphin: %08x" -msgstr "Zero code unknown to dolphin: %08x" +msgstr "Dophin 未知的 Zero 代码: %08x" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504 @@ -5958,7 +6026,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[故障中]\n" -"高亮显示EFB所复制的区域。\n" +"高亮显示 EFB 所复制的区域。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -5977,9 +6045,10 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[实验性]\n" -"使用OpenCL框架将纹理解码工作转载至GPU旨在提高模拟速度。\n" -"然而目前已知在多款游戏中会导致纹理缺陷。并且多数情况下比常规的CPU纹理解码要" -"慢。\n" +"使用 OpenCL 框架将纹理解码工作转载至 GPU 旨在\n" +"提高模拟速度。\n" +"然而目前已知在多款游戏中会导致纹理缺陷。并且\n" +"多数情况下比常规的 CPU 纹理解码要慢。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -5993,7 +6062,7 @@ msgid "" msgstr "" "[实验性]\n" "通过缓存显示列表略微提高模拟速度。\n" -"另一方面也可能产生问题。\n" +"然而也可能产生问题。\n" "\n" "如果没有把握,请不要勾选此项。" @@ -6008,17 +6077,16 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947 msgid "s" -msgstr "" +msgstr "s" #: Source/Core/Core/Src/x64MemTools.cpp:242 #, c-format msgid "unknown flavor %d (expected %d)" -msgstr "" +msgstr "未知的类型 %d (预期为 %d)" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "Unknown message received with id : %d" +msgstr "接收到未知消息" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -6026,92 +6094,12 @@ msgstr "wxExecute returned -1 on application run!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:43 msgid "zFar Correction: " -msgstr "zFar 修正: " +msgstr "远剪裁平面修正: " #: Source/Core/DolphinWX/Src/PHackSettings.cpp:38 msgid "zNear Correction: " -msgstr "zNear 修正: " +msgstr "近剪裁平面修正: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| 或" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "精确VBeam模拟" - -#~ msgid "" -#~ "Allows toggling certain options via the hotkeys 3 (Internal Resolution), " -#~ "4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "允许在模拟窗口中通过以下快捷键切换特定选项:3(内部分辨率)、4(宽高比)、" -#~ "5(复制EFB)和6(雾)。\n" -#~ "\n" -#~ "如果没有把握,请不要勾选此项。" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "启用热键" - -#~ msgid "" -#~ "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -#~ "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -#~ msgstr "" -#~ "启用杜比定向逻辑II模拟5.1环绕声。仅适用于OpenAL后端。可能需要将soft_oal." -#~ "dll重命名为OpenAL32.dll以生效。" - -#~ msgid "Export failed, try again?" -#~ msgstr "导出失败,需要重试吗?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "监听失败!!" - -#~ msgid "Failed to load bthprops.cpl" -#~ msgstr "加载bthprops.cpl失败" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "不能载入 hid.dll" - -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic配置" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY 被调用, 请报告bug!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "如果帧率不稳定,此选项可能有所帮助 (ON = 兼容, OFF = 快速)" - -#~ msgid "Import failed, try again?" -#~ msgstr "导入失败,要重试吗?" - -#~ msgid "In-Game" -#~ msgstr "进游戏" - -#~ msgid "Last Overwritten State" -#~ msgstr "最后覆盖状态" - -#~ msgid "Last Saved State" -#~ msgstr "最后保存状态" - -#~ msgid "Local" -#~ msgstr "本地" - -#~ msgid "Reconnect Wiimote on State Loading" -#~ msgstr "读取状态时重连Wii遥控器" - -#~ msgid "Set" -#~ msgstr "设置" - -#~ msgid "Skip Dest. Alpha Pass" -#~ msgstr "忽略目标Alpha通道" - -#~ msgid "Wii Save Import" -#~ msgstr "导入 Wii 存档" diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 5d60a06a81..a4ef9eb2fd 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -4,12 +4,13 @@ # # Translators: # khiav , 2011 +# Sentret_C , 2013 msgid "" msgstr "" "Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-09 06:28-0500\n" -"PO-Revision-Date: 2013-04-04 08:13+0000\n" +"PO-Revision-Date: 2013-09-10 08:16+0000\n" "Last-Translator: delroth \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/dolphin-" "emu/language/zh_TW/)\n" @@ -105,9 +106,9 @@ msgid "%s failed to open" msgstr "開啟 %s 失敗" #: Source/Core/Core/Src/x64MemTools.cpp:182 -#, fuzzy, c-format +#, c-format msgid "%s failed: kr=%x" -msgstr "開啟 %s 失敗" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403 #, c-format @@ -309,9 +310,8 @@ msgid "(off)" msgstr "(關閉)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559 -#, fuzzy msgid "+ ADD" -msgstr "^ 新增" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663 msgid "0x44" @@ -398,7 +398,6 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:104 -#, fuzzy msgid "" "ALERT:\n" "\n" @@ -414,19 +413,6 @@ msgid "" "\n" "The host must have the chosen TCP port open/forwarded!\n" msgstr "" -"警告:\n" -"\n" -"網路對戰目前只能在下列狀況下正常使用 設定:\n" -" - 雙核心 [關閉]\n" -" - 聲音鎖定 [關閉]\n" -" - DSP-HLE 使用 \"無聲音\" 或 DSP-LLE\n" -" - 手動設定的額外控制器設定為使用 [標準控制器]\n" -"\n" -"所有玩家應該使用相同版本的 Dolphin 和設定。\n" -"停用所有記憶卡或者在開始之前使用傳送。\n" -"Wiimote 支援尚未完成。\n" -"\n" -"您必須至主機的 TCP 埠口進行設定!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:94 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:99 @@ -692,7 +678,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" -msgstr "" +msgstr "阿拉伯語" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667 #, c-format @@ -744,15 +730,15 @@ msgstr "自動" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346 msgid "Auto (Multiple of 640x528)" -msgstr "" +msgstr "自動 (640x528 的倍數)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346 msgid "Auto (Window Size)" -msgstr "" +msgstr "自動 (視窗尺寸)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 msgid "Auto adjust Window Size" -msgstr "" +msgstr "自動調整視窗尺寸" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -975,7 +961,7 @@ msgstr "Caps Lock" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" -msgstr "" +msgstr "加泰隆尼亞語" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:299 msgid "Center" @@ -1189,9 +1175,8 @@ msgstr "連接" #: Source/Core/DolphinWX/Src/FrameTools.cpp:377 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#, fuzzy msgid "Connect Balance Board" -msgstr "連接 USB 鍵盤" +msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "Connect USB Keyboard" @@ -1470,9 +1455,8 @@ msgid "Decompressing ISO" msgstr "ISO 解壓中" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 -#, fuzzy msgid "Decrease Frame limit" -msgstr "更新遊戲列表" +msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967 msgid "Default" @@ -1502,7 +1486,7 @@ msgstr "刪除已存在的檔案 '%s' ?" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680 msgid "Description" -msgstr "" +msgstr "描述" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535 msgid "Detect" @@ -1715,11 +1699,10 @@ msgid "Dolphin was unable to complete the requested action." msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 -#, fuzzy msgid "" "Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF " "= Compatible)" -msgstr "開啟快速光碟存取。部份遊戲需要。(ON = 兼容、OFF = 快速)" +msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:263 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:45 @@ -2111,9 +2094,8 @@ msgid "Exit" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 -#, fuzzy msgid "Export All Wii Saves" -msgstr "匯出所有存檔" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Export Failed" @@ -2144,9 +2126,8 @@ msgid "Export all saves" msgstr "匯出所有存檔" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113 -#, fuzzy msgid "Export failed" -msgstr "匯出失敗" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:552 msgid "Export save as..." @@ -2341,9 +2322,9 @@ msgstr "" "(0x0000-0x1FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299 -#, fuzzy, c-format +#, c-format msgid "Failed to read header for file %d" -msgstr "檔案 %d 寫入檔頭失敗" +msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:48 msgid "Failed to read unique ID from disc image" @@ -2358,9 +2339,9 @@ msgid "Failed to write bkhdr" msgstr "寫入 bkhdr 失敗" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428 -#, fuzzy, c-format +#, c-format msgid "Failed to write data to file: %s" -msgstr "從檔案 %d 讀取數據失敗" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205 #, c-format @@ -2369,7 +2350,7 @@ msgstr "檔案 %s 寫入檔頭失敗" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Farsi" -msgstr "" +msgstr "波斯語" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Fast" @@ -2520,9 +2501,9 @@ msgid "Found %d results for '" msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65 -#, fuzzy, c-format +#, c-format msgid "Found %x save files" -msgstr "無法儲存 %s" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937 @@ -2586,7 +2567,7 @@ msgstr "全螢幕" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 msgid "Fullscreen resolution:" -msgstr "" +msgstr "全螢幕解析度:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 msgid "GCI File(*.gci)" @@ -2895,14 +2876,12 @@ msgid "Import Save" msgstr "匯入存檔" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 -#, fuzzy msgid "Import Wii Save" -msgstr "匯入存檔" +msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93 -#, fuzzy msgid "Import failed" -msgstr "匯出失敗" +msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "" @@ -2929,9 +2908,8 @@ msgid "In Game" msgstr "遊戲中" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#, fuzzy msgid "Increase Frame limit" -msgstr "畫格速限制:" +msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 @@ -3026,7 +3004,7 @@ msgstr "內部 LZO 錯誤 - lzo_init() 失敗" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353 msgid "Internal Resolution:" -msgstr "" +msgstr "内部解析度:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:43 msgid "Interpreter (VERY slow)" @@ -3215,58 +3193,48 @@ msgid "Load Custom Textures" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232 -#, fuzzy msgid "Load State" -msgstr "讀取進度(&L)" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#, fuzzy msgid "Load State Last 1" -msgstr "讀取儲存格 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#, fuzzy msgid "Load State Last 2" -msgstr "讀取儲存格 2" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221 -#, fuzzy msgid "Load State Last 3" -msgstr "讀取儲存格 3" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222 -#, fuzzy msgid "Load State Last 4" -msgstr "讀取儲存格 4" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223 -#, fuzzy msgid "Load State Last 5" -msgstr "讀取儲存格 5" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224 -#, fuzzy msgid "Load State Last 6" -msgstr "讀取儲存格 6" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225 -#, fuzzy msgid "Load State Last 7" -msgstr "讀取儲存格 7" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226 -#, fuzzy msgid "Load State Last 8" -msgstr "讀取儲存格 8" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Load State Slot 1" msgstr "讀取儲存格 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#, fuzzy msgid "Load State Slot 10" -msgstr "讀取儲存格 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 msgid "Load State Slot 2" @@ -3297,9 +3265,8 @@ msgid "Load State Slot 8" msgstr "讀取儲存格 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#, fuzzy msgid "Load State Slot 9" -msgstr "讀取儲存格 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Load State..." @@ -3512,6 +3479,13 @@ msgid "" "\n" "\n" msgstr "" +"移動滑鼠指針至某一選項上方以顯示詳細描述。\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:62 msgid "Multiply" @@ -3839,15 +3813,11 @@ msgid "Orange" msgstr "橘" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:455 -#, fuzzy msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the saves to a new memcard\n" msgstr "" -"在檔案目錄中的檔案順序與區塊順序不符合\n" -"按右鍵匯出所有存檔,\n" -"並匯入存檔至一張新的記憶卡中\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 @@ -4127,9 +4097,8 @@ msgid "Record" msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:357 -#, fuzzy msgid "Record input" -msgstr "播放錄像" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161 msgid "Recording Info" @@ -4251,23 +4220,20 @@ msgid "Save GCI as..." msgstr "另存 GCI ..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228 -#, fuzzy msgid "Save Oldest State" -msgstr "儲存進度(&V)" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231 -#, fuzzy msgid "Save State" -msgstr "儲存進度(&V)" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 msgid "Save State Slot 1" msgstr "儲存至儲存格 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#, fuzzy msgid "Save State Slot 10" -msgstr "儲存至儲存格 1" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 msgid "Save State Slot 2" @@ -4298,9 +4264,8 @@ msgid "Save State Slot 8" msgstr "儲存至儲存格 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#, fuzzy msgid "Save State Slot 9" -msgstr "儲存至儲存格 1" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:407 msgid "Save State..." @@ -4519,9 +4484,8 @@ msgid "Settings..." msgstr "設定..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252 -#, fuzzy msgid "SetupWiiMem: Cant create setting file" -msgstr "SetupWiiMem:無法找到設定檔" +msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "Shake" @@ -4552,9 +4516,8 @@ msgid "Show &Toolbar" msgstr "顯示工具列(&T)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 -#, fuzzy msgid "Show Defaults" -msgstr "預設值" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show Drives" @@ -5141,19 +5104,16 @@ msgid "Toggle All Log Types" msgstr "全選/全部取消" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#, fuzzy msgid "Toggle Aspect Ratio" -msgstr "畫面比例:" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#, fuzzy msgid "Toggle EFB Copies" -msgstr "全選/全部取消" +msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#, fuzzy msgid "Toggle Fog" -msgstr "全選/全部取消" +msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:465 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 @@ -5251,9 +5211,8 @@ msgid "Undo Load State" msgstr "取消讀取進度" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230 -#, fuzzy msgid "Undo Save State" -msgstr "取消讀取進度" +msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726 msgid "Unexpected 0x80 call? Aborting..." @@ -5361,9 +5320,8 @@ msgid "V-Sync" msgstr "垂直同步" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -#, fuzzy msgid "VBeam Speed Hack" -msgstr "MMU 速度修正" +msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 msgid "Value" @@ -5656,7 +5614,7 @@ msgstr "您必須輸入一個有效的設定檔名稱。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:929 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "您必須重新啟動 Dolphin 使更改生效。" +msgstr "You must restart Dolphin in order for the change to take effect." #: Source/Core/Core/Src/DSP/DSPCore.cpp:109 msgid "" @@ -5753,9 +5711,8 @@ msgid "unknown flavor %d (expected %d)" msgstr "" #: Source/Core/Core/Src/x64MemTools.cpp:236 -#, fuzzy msgid "unknown message received" -msgstr "接收到帶有未知 id 的錯誤訊息:%d" +msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165 msgid "wxExecute returned -1 on application run!" @@ -5772,53 +5729,3 @@ msgstr "zNear 修正:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545 msgid "| OR" msgstr "| 或" - -#~ msgid "Accurate VBeam emulation" -#~ msgstr "精確的 VBeam 模擬" - -#~ msgid "" -#~ "Could not set pads. The player left or the game is currently running!\n" -#~ "(setting pads while the game is running is not yet supported)" -#~ msgstr "" -#~ "無法設置控制器。有玩家存留或者遊戲正在執行!\n" -#~ "(還不支援在遊戲執行時設定控制器)" - -#~ msgid "Enable Hotkeys" -#~ msgstr "開啟快捷鍵" - -#~ msgid "Export failed, try again?" -#~ msgstr "匯出失敗,要重試嗎?" - -#~ msgid "Failed to Listen!!" -#~ msgstr "監聽失敗!!" - -#~ msgid "Failed to load hid.dll" -#~ msgstr "讀取 hid.dll 失敗" - -#~ msgid "HCI_CMD_INQUIRY is called, please report!" -#~ msgstr "HCI_CMD_INQUIRY 被調用,請回報!" - -#~ msgid "" -#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#~ msgstr "開啟記憶體管理單元,某些遊戲需要。(ON = 兼容、OFF = 快速)" - -#~ msgid "Import failed, try again?" -#~ msgstr "匯入失敗,是否重試?" - -#~ msgid "In-Game" -#~ msgstr "遊戲中" - -#~ msgid "Last Overwritten State" -#~ msgstr "最後覆蓋的進度" - -#~ msgid "Last Saved State" -#~ msgstr "最後使用的進度" - -#~ msgid "Local" -#~ msgstr "本地" - -#~ msgid "Set" -#~ msgstr "設定" - -#~ msgid "Wii Save Import" -#~ msgstr "匯入 Wii 存檔" diff --git a/Source/Core/DolphinWX/Info.plist.in b/Source/Core/DolphinWX/Info.plist.in index 24d0117576..c9e0eaaeb7 100644 --- a/Source/Core/DolphinWX/Info.plist.in +++ b/Source/Core/DolphinWX/Info.plist.in @@ -35,14 +35,30 @@ CFBundleLocalizations ar + ca + cs + de el en es + fa fr + he hu + it + ja + ko + nb + nl + pl pt pt_BR + ru + sr + sv tr + zh_CN + zh_TW CFBundlePackageType APPL From 91c0e02609f9982150f9d2c2b8a82a3c7862a256 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 21 Sep 2013 20:20:38 +0200 Subject: [PATCH 239/267] Don't require running Dolphin in the directory that contain Languages/ on Windows --- Source/Core/DolphinWX/Src/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index efa838ecc5..285fc2729e 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -407,7 +407,7 @@ void DolphinApp::InitLanguageSupport() m_locale = new wxLocale(language); #ifdef _WIN32 - m_locale->AddCatalogLookupPathPrefix(wxT("Languages")); + m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages")); #endif m_locale->AddCatalog(wxT("dolphin-emu")); From f9b0b0471b36b9a270ff9bed8371a0cd0b6265ec Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 22 Sep 2013 02:51:08 +0200 Subject: [PATCH 240/267] D3D11: Fix various MSAA related issues. How did any of this ever work? >_> --- .../Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 819fd46974..1dd98edd2e 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -247,7 +247,7 @@ ID3D11PixelShader* PixelShaderCache::ReinterpRGBA6ToRGB8(bool multisampled) { // create MSAA shader for current AA mode char buf[1024]; - const int l = sprintf_s(buf, 1024, reint_rgba6_to_rgb8_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode)); + const int l = sprintf_s(buf, 1024, reint_rgba6_to_rgb8_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count); s_rgba6_to_rgb8[1] = D3D::CompileAndCreatePixelShader(buf, l); @@ -273,7 +273,7 @@ ID3D11PixelShader* PixelShaderCache::ReinterpRGB8ToRGBA6(bool multisampled) { // create MSAA shader for current AA mode char buf[1024]; - const int l = sprintf_s(buf, 1024, reint_rgb8_to_rgba6_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode)); + const int l = sprintf_s(buf, 1024, reint_rgb8_to_rgba6_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count); s_rgb8_to_rgba6[1] = D3D::CompileAndCreatePixelShader(buf, l); @@ -291,7 +291,7 @@ ID3D11PixelShader* PixelShaderCache::GetColorCopyProgram(bool multisampled) { // create MSAA shader for current AA mode char buf[1024]; - int l = sprintf_s(buf, 1024, color_copy_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode)); + int l = sprintf_s(buf, 1024, color_copy_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count); s_ColorCopyProgram[1] = D3D::CompileAndCreatePixelShader(buf, l); CHECK(s_ColorCopyProgram[1]!=NULL, "Create color copy MSAA pixel shader"); D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorCopyProgram[1], "color copy MSAA pixel shader"); @@ -307,7 +307,7 @@ ID3D11PixelShader* PixelShaderCache::GetColorMatrixProgram(bool multisampled) { // create MSAA shader for current AA mode char buf[1024]; - int l = sprintf_s(buf, 1024, color_matrix_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode)); + int l = sprintf_s(buf, 1024, color_matrix_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count); s_ColorMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf, l); CHECK(s_ColorMatrixProgram[1]!=NULL, "Create color matrix MSAA pixel shader"); D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorMatrixProgram[1], "color matrix MSAA pixel shader"); @@ -323,7 +323,7 @@ ID3D11PixelShader* PixelShaderCache::GetDepthMatrixProgram(bool multisampled) { // create MSAA shader for current AA mode char buf[1024]; - int l = sprintf_s(buf, 1024, depth_matrix_program_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode)); + int l = sprintf_s(buf, 1024, depth_matrix_program_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count); s_DepthMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf, l); CHECK(s_DepthMatrixProgram[1]!=NULL, "Create depth matrix MSAA pixel shader"); D3D::SetDebugObjectName((ID3D11DeviceChild*)s_DepthMatrixProgram[1], "depth matrix MSAA pixel shader"); From eb2e3cff7e9666fd96fbd7c1cde180d56292926e Mon Sep 17 00:00:00 2001 From: TheCow Date: Sat, 21 Sep 2013 23:34:58 -0400 Subject: [PATCH 241/267] D3D11: Create temp EFB texture with correct multisample mode. Fixes issue 6482. --- Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp index 6f64cea0ec..2e72380603 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp @@ -70,10 +70,10 @@ FramebufferManager::FramebufferManager() D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetRTV(), "EFB color texture render target view"); // Temporary EFB color texture - used in ReinterpretPixelData - texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, 1, 0); + texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality); hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf); CHECK(hr==S_OK, "create EFB color temp texture (size: %dx%d; hr=%#x)", target_width, target_height, hr); - m_efb.color_temp_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM); + m_efb.color_temp_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM, (sample_desc.Count > 1)); CHECK(m_efb.color_temp_tex!=NULL, "create EFB color temp texture (size: %dx%d)", target_width, target_height); SAFE_RELEASE(buf); D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetTex(), "EFB color temp texture"); From 53b93f8cd55c7fe84a3e24879bee74ee621e8ecb Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 22 Sep 2013 13:54:47 +0000 Subject: [PATCH 242/267] Allow GLES3 hardware to support FSAA. Need a GUI option for this on Android devices. --- Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp | 4 +--- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index f3b8578b23..9eac9f603b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -99,7 +99,6 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms GL_REPORT_FBO_ERROR(); } -#ifndef USE_GLES3 else { // EFB targets will be renderbuffers in MSAA mode (required by OpenGL). @@ -150,7 +149,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms glBindTexture(getFbType(), m_resolvedDepthTexture); glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0); - glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL); // Bind resolved textures to resolved framebuffer. @@ -165,7 +164,6 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer); } -#endif // Create XFB framebuffer; targets will be created elsewhere. glGenFramebuffers(1, &m_xfbFramebuffer); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index d7a891ecd1..d5299e4c3e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -141,7 +141,6 @@ void OpenGL_ReportARBProgramError() bool OpenGL_ReportFBOError(const char *function, const char *file, int line) { -#ifndef USE_GLES unsigned int fbo_status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (fbo_status != GL_FRAMEBUFFER_COMPLETE) { @@ -154,12 +153,14 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line) case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: error = "INCOMPLETE_MISSING_ATTACHMENT"; break; +#ifndef USE_GLES case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER: error = "INCOMPLETE_DRAW_BUFFER"; break; case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER: error = "INCOMPLETE_READ_BUFFER"; break; +#endif case GL_FRAMEBUFFER_UNSUPPORTED: error = "UNSUPPORTED"; break; @@ -168,7 +169,6 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line) file, line, function, error); return false; } -#endif return true; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index c94776ef7f..54a2ac5735 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -32,6 +32,7 @@ #define GL_BGRA GL_RGBA #define glDrawElementsBaseVertex(...) #define glDrawRangeElementsBaseVertex(...) +#define glRenderbufferStorageMultisampleCoverageNV(...) #endif #else #define TEX2D GL_TEXTURE_RECTANGLE_ARB From 196953c50ae0a5784343378e6b87826bbe6921ef Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 14 Sep 2013 20:48:23 +0200 Subject: [PATCH 243/267] Use the new Dolphin icon --- Installer/Dolphin.ico | Bin 25214 -> 51936 bytes Source/Core/DolphinWX/Src/Frame.cpp | 2 +- Source/Core/DolphinWX/resources/Dolphin.c | 307 ++++++----------- Source/Core/DolphinWX/resources/Dolphin.icns | Bin 16512 -> 103023 bytes Source/Core/DolphinWX/resources/Dolphin.png | Bin 2438 -> 1202 bytes Source/Core/DolphinWX/resources/Dolphin.xpm | 341 ++++++++++++------- 6 files changed, 316 insertions(+), 334 deletions(-) diff --git a/Installer/Dolphin.ico b/Installer/Dolphin.ico index 8ebe725760ea545ac1e15beb02e94dce594f0175..5e133fcd9baeceeb502acd9b22b0ae8a03546c78 100644 GIT binary patch literal 51936 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 literal 25214 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

|&q865A=wcgqq7AqNr(9*atqWfpN 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 oWtzciV4OjiBT~6 z2T4gZ{z23x@`oA~Axcb4K*A*?MAB3Is6yI$SVW3YZAIE1_kYpt(e82|+r6D#-X44B zQCq}6$o*j_`Q^>L_vX!;dGF26VolRfF&l-7+~yr9x&s)sA1bN?%q_6#0kjm1qktoG zp1``ZvzOu5JN>$$c0ePb63}3X1i-LCgMeOxt_5@$4(LrW_*d4w?puG;Cjbk#0@)6D zD63#Lp#_``S$}UUK_)AURE5|Ryx2%&1tsHG))dY)ms(Nf-LO|yMV3wV&yApP?@_5l{gm8IXRP-k#H%FgwSPV9m>lI> z)^zy%H!MRHBK2LTzmYAmY`J&SYS@JfX#^vkPh?F3x)<;$U?rdwfB}p#-UxUN^a4Ot zeNGNe_w9Ok4}tBDLjFuJ1a^oiYMbYgW@K4pN5t5%BqUG&9ta)~!|^F2v6dPMIiM%u zs#kse#(yS`>eY-0;`F4|RP|}FcfZrK3~3rhL*JfyyL*?v67;vtbq`n4`rsPN(8i5n$(D#CTIPZY#lNc#2cT%7j zfq&S22)q-3e&dL*86oO}n5K^9#==+_NmIhdWnOn2<~0fVkmOlxP&%0 zY|fuX3+R2%pBtjWrv`okesjK(xW{(X&?fd3gz1-|jE)0F0CKjZazOY3Ts#m5>H&R> zDH@IZ*k_HN{!NLUIseR(de3__YZmO)Re#kBt129c=(w54nJ1&ao;wCI0p^TCLiSlX zZc}o6f*b4kc?9?aSzB)Ze|izMLuP&imjsvM`Dm!8H$`OmEBE8R7YlUOE0Xj^_~c1@ zG8zlPxDDh9BOFhG?9)HH0ukuDfiF`e0~K`hI7k%i1iFE>JN7v0y%P(TIL$M30)Lpc zG;w#jJ1vViGpuXP$y7oe&=9kat8?p#`@GJ>uFr4Xn=sbj#}Rp2u4rm4EKypK(!p>~ z_jo3i+=y%U73ER7JQ*4Nj6W0H#Sl`IcgQef?#d!;|ws)+~>cfm$oD;}i wtZ=`4fy>_ipZ}QP`Cqen2a4^$RTlvU079)PY=tc|>i_@%07*qoM6N<$f>_T!82|tP delta 2427 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 diff --git a/Source/Core/DolphinWX/resources/Dolphin.xpm b/Source/Core/DolphinWX/resources/Dolphin.xpm index 8d3df77781..ef8d837539 100644 --- a/Source/Core/DolphinWX/resources/Dolphin.xpm +++ b/Source/Core/DolphinWX/resources/Dolphin.xpm @@ -1,129 +1,214 @@ /* XPM */ -static const char *Dolphin_xpm[] = { -"32 32 94 2", -" c None", -". c #000000", -"+ c #1A496C", -"@ c #091A27", -"# c #3AA4F0", -"$ c #3AA3EF", -"% c #3CA1EA", -"& c #1A4A6D", -"* c #3AA2ED", -"= c #F7FAFA", -"- c #FFFFFF", -"; c #FDFDFD", -"> c #49A1E0", -", c #3BA2EC", -"' c #FBFDFC", -") c #FEFFFD", -"! c #4EA3E0", -"~ c #3DA1E9", -"{ c #D1E1EB", -"] c #8ABBDE", -"^ c #F2F6F7", -"/ c #FAFBFC", -"( c #CEDEEA", -"_ c #E5EEF2", -": c #BBD2E1", -"< c #B3CFE5", -"[ c #FFFFFE", -"} c #FEFFFE", -"| c #E8F0F3", -"1 c #E4ECF1", -"2 c #E5EDF0", -"3 c #E9F0F3", -"4 c #FEFEFE", -"5 c #F9FBFB", -"6 c #B0CCE0", -"7 c #FEFEFF", -"8 c #F9FAFB", -"9 c #43A1E4", -"0 c #EFF3F6", -"a c #F0F5F7", -"b c #97C1DE", -"c c #FEFEFD", -"d c #FDFDFC", -"e c #97BEDB", -"f c #FBFCFC", -"g c #EDF3F6", -"h c #6EADDA", -"i c #F3F6F8", -"j c #3BA1EA", -"k c #6EADDB", -"l c #F4F8F9", -"m c #F1F6F7", -"n c #3FA1E7", -"o c #9BC1DD", -"p c #FCFDFC", -"q c #FBFDFB", -"r c #B9D1E1", -"s c #E0EBF2", -"t c #D3E3EF", -"u c #FFFEFE", -"v c #F2F7F7", -"w c #D5E4F0", -"x c #F6F9F9", -"y c #BDD5E5", -"z c #EBF1F4", -"A c #DEEAF2", -"B c #AAC9DE", -"C c #FEFFFF", -"D c #EFF4F6", -"E c #F8FAFB", -"F c #A0C4E1", -"G c #D6E5F0", -"H c #FAFCFC", -"I c #BDD5E7", -"J c #EEF3F7", -"K c #F3F7FA", -"L c #C7D8E4", -"M c #CDDEEC", -"N c #DAE6ED", -"O c #9AC2DF", -"P c #E8EFF4", -"Q c #ACCDE3", -"R c #8DBBDC", -"S c #D5E3EB", -"T c #FDFFFE", -"U c #FCFDFD", -"V c #FEFDFD", -"W c #F7F9FA", -"X c #FDFEFD", -"Y c #E7EFF4", -"Z c #A4C7E0", -"` c #F9FDFB", -" . c #F6FBFC", -".. c #B8D1E3", -" . . + . . . . . . . . . . . . . . . . . . . . . . . . ", -". @ . . # # # # # # # # # # # # # # # # # # # # # # # # . . ", -". . # # # # # # # # # # # # $ . . . . . % # # # # # # # # # . ", -"& . # # # # # # # # # # # * . = - - - ; . > # # # # # # # # . ", -". # # # # # # # # # # # , . ' ) - - - - ) . ! # # # # # # # # . ", -". # # # # # # $ . . # $ . ; - - - - - - - - . ~ # # # # # # # . ", -". # # # # . . . { ] . . ^ ) - - - - - - - - / . # # # # # # # . ", -". # # # . ( _ . : < . . [ } - - - - - - - - [ . # # # # # # # . ", -". # # # # . | 1 2 3 . . 4 - - - - - - - - - 5 . $ # # # # # # . ", -". # # # # . 6 [ } 7 . . 4 - - - - - - - - - 8 . 9 # # # # # # . ", -". # # # # . 0 } - - - - - - - - - - - - - - - 4 . # # # # # # . ", -". # # # # . a ) - [ - - - - - - - - - - - - - ; . # # # # # # . ", -". # # # # . b = c 4 - - - - - - - - - - - - d . ~ # # # # # # . ", -". # # # # # . . . e f - - - - - - - - - - g . , # # # # # # # . ", -". # # # # # # # # . h i - - - - - - - - ) . j # # # # # # # # . ", -". # # # # # # # # # . k l - - - - - - - } m . n # # # # # # # . ", -". # # # # # # # # # # . o } - - - - - - - - p . , # # # # # # . ", -". # # # # # # # # # # $ . } - - - - - - - - 4 q . # # # # # # . ", -". # # # # # # # # # # . r - - - - - - - - - } 4 s . # # # # # . ", -". # # # # # # # # # # . t - - - - - - - - - u v . # # # # # # . ", -". # # # # # # # # # # . w - - - - - - - - - x . # # # # # # # . ", -". # # # # # # # # # # . y [ - - - - - - - - z . # # # # # # # . ", -". # # # # # # # # # # $ . ) - - [ - - - - - A . # # # # # # # . ", -". # # # # # # # # # # . B C - - [ D E - - - F . # # # # # # # . ", -". # # # # # # # # # # . G - - - H . I - - J . # # # # # # # # . ", -". # # # # # # # # # # . K - - - L . M - [ N . # # # # # # # # . ", -". # # # # # # # # # . O - - - - . . P - - 5 Q . $ # # # # # # . ", -". # # # # # # # # . R q - - - - . . i - - - 7 l . # # # # # # . ", -" . # # # # # # # . S T [ [ U V . . 5 W ; - X Y . # # # # # . ", -" . # # # # # # # . Z ` .... . ~ , . . . . . . # # # # # # . ", -" . . # # # # # # . . . . # # # # # # # # # # # # # # . . ", -" . . . . . . . . . . . . . . . . . . . . . . . . "}; +static char *Dolphin[] = { +/* columns rows colors chars-per-pixel */ +"128 128 80 1 ", +" c #0057AB", +". c #0159AD", +"X c #035EB1", +"o c #0662B5", +"O c #0866B5", +"+ c #0A68B7", +"@ c #0867BB", +"# c #0B6BBC", +"$ c #0E70BC", +"% c #0666C0", +"& c #0769C4", +"* c #0A6DC2", +"= c #0E72C4", +"- c #0E74CA", +"; c #1176C2", +": c #147BC4", +"> c #137CCC", +", c #0F7AD6", +"< c #0E79D8", +"1 c #127DD3", +"2 c #107FE2", +"3 c #1780C7", +"4 c #1681CD", +"5 c #1984CC", +"6 c #1C89CD", +"7 c #1683D5", +"8 c #1885D2", +"9 c #1A89D3", +"0 c #1484DD", +"q c #1788DF", +"w c #1B8CDC", +"e c #1E91DB", +"r c #2294D5", +"t c #2598D7", +"y c #2196DD", +"u c #269CDA", +"i c #289EDB", +"p c #2AA2DD", +"a c #1788E0", +"s c #198BE1", +"d c #1487E9", +"f c #1488EE", +"g c #1E93E2", +"h c #1C94EC", +"j c #1F98EB", +"k c #1F9AF3", +"l c #1994FA", +"z c #1D9BFF", +"x c #239BE5", +"c c #239CEB", +"v c #219DF6", +"b c #209EFE", +"n c #26A0E6", +"m c #2BA5E4", +"M c #2EA9E3", +"N c #26A1EC", +"B c #29A4EB", +"V c #2CAAED", +"C c #31AFE7", +"Z c #33B4EB", +"A c #36B9EE", +"S c #38BAEE", +"D c #27A5F6", +"F c #28A6F5", +"G c #2DADF2", +"H c #25A5FE", +"J c #27A8FF", +"K c #2AADFF", +"L c #2FB1F7", +"P c #2EB3FF", +"I c #32B4F3", +"U c #36BAF3", +"Y c #31B6FF", +"T c #34BBFF", +"R c #3EC6F7", +"E c #3AC4FF", +"W c #3ECAFF", +"Q c #41CDFF", +"! c #44D1FF", +"~ c None", +/* pixels */ +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ..O...X ~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ . ~~~~~~~~~~~~ O6uCS!!!!!!!QSpt:o~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~ +$6666ppp66663$. ~~~~~ OrS!!!!!!!!!!!!!!!RC~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~ .#6iZQ!!!!!!!!!!!!!!!!!!AMt3+ :Z!!!!!!!!!!!!!!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~ .$rZ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Ct5+ :S!!!!!!!!!!!!!!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~ .:pQ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Q!!!!RM6+ ;S!!!!!!!!!!!!!!!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~ $iQQ!!!!!!Q!Q!!!!!!!Q!!!!!!!Q!!!!!!Q!!!!!!!!!Q!RMZ!!!!!!Q!!!!!!!!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~ :Z!!!Q!!!!Q!!!!!!!!!!!!!!!!Q!!!!!Q!!!!!!Q!Q!!!!!!QQ!Q!!Q!!!!!!!!!!!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~ $AQQQQ!!QQ!QQQ!!QQ!QQ!QQQ!!Q!QQ!!Q!Q!Q!!QQ!QQW!Q!QQ!QQQQQQQQ!!!!QQQQ!Q~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~ XmQQQQQQQQQQQQQQQQQQQQQ!QQQQQQQQQQQQQQQQQQQQQQQQQQ!!QQ!QQQQQQQQQQQQ!QQQA ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~ .rWQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQWQQQQQQQQQQQQQQQQQU ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~ OAQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQWQQQQQQQQQQQQQQQQQQQQQX ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~ ;RWQQWQWQQQQQQWQWQQQQWQQQWQQQ~~~~~~~~~~~~~~~~QQQQQQWQQQWQWQQQWQWQQQWQQQQQQQW6 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~ 9WWWWWWWWWWWWWWWWQWWWWWWW~~~~~~~~~~~~~~~~~~~~~~~~~~~WWWWWWWWWWWWWWWWWWWWQQRRWRo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~ 9WWWQWWWWWQWWWWQWWWWWQW~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~WWQWQWQWQQWWQWWWWQRWWV. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~ 5WWWWWWWWWWWWWWWWWWWW~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~WQEWWEWWWEWWWWWWWWQm. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~ $WWWEEWWWWEWWWEWEWEW~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~WWWWEWWWEWWWEWWWmX ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~ oTWWEWWWWEWWEWEWWEEW~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~EWEEWWEEWWEWEWIo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~ mWWEWEWEEEWEEWEWEW~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~WEWEWEWWWEEWEU$ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~ ;EEEEEEEEEEEEEEEEW~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~EEEEEEEEEEEWT: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~ GEEEEEEEEEEEEEEEE~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~EEEEEEETEEEW4 ~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~#EEETEETEEEETEEEE~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~EEEEEEEEEEEy. ~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~ yEEEEEETEEETEEEE~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ETEEETEEEEm.. ~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~ IETETTEETETETETG. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ETEETTTETVo ~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~+EETETEETETEETEE4 . X##$##. . ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ETEEETTETGX ~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~>TTETTTTTTETTETTo+;>yyxVVTETEETTTTETETTETVVny9>#. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~TTETETTEV. ~~~~~~~~~~~~~~~~~~~~~~", +"~~~~ eTTTTTETETTETTTTETTTETTTTTTETTTTETTTTETTTTTTTTTTTGx8;. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~TTTTEETTVX ~~~~~~~~~~~~~~~~~~~~~", +"~~~ BTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTmw# ~~~~~~~~~~~~~~~~~~~~~~~~~~~TTTTTTTTB. ~~~~~~~~~~~~~~~~~~~~", +"~~~ oTTTTTTTYTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTYTTTTTTTTTTTTTTTTTTLe= ~~~~~~~~~~~~~~~~~~~~~~~~~TTTTTTTTc. ~~~~~~~~~~~~~~~~~~~", +"~~ xTYTTTTTYTTTYTTTTYYTTTYTYTYTYTYTTYYTTTTTYTTTTTYTTYTTTTYTTTTTTLw+ ~~~~~~~~~~~~~~~~~~~~~~~~~TTYYTYTx ~~~~~~~~~~~~~~~~~~~", +"~ 8TYTTTPTTTPTYYYTYYTYTYTYTYTYTYTYTYTYTTTYYYYTYTTYTYTYTYTYTYYTYYTTYN:.. ~~~~~~~~~~~~~~~~~~~~~~~~YTYTTTTw ~~~~~~~~~~~~~~~~~~", +" =YYYYYPTYYPTPTYTYYYYYYYYY~~~~~~~~~~~YYYYYTYTYYYYYYYYYYYYYYYYYYYYYYYTK9X ~~~~~~~~~~~~~~~~~~~~~~~YYYPTPT> ~~~~~~~~~~~~~~~~~", +" XKYYYPYYYYYYYYYYYYY~~~~~~~~~~~~~~~~~~YYPYYYYYYPYYYYYYgYYYYYYYYYYYYYYYYYPwo ~~~~~~~~~~~~~~~~~~~~~~YYYYYYP# ~~~~~~~~~~~~~~~~", +" xYPPYPPPPPYPPP~~~~~~~~~~~~~~~~~~~~~~~~PPYPPPPPPPYPPPY#~~~~~PPPPPPPPPYPPPPPgo ~~~~~~~~~~~~~~~~~~~~~~PPYPPPGX ~~~~~~~~~~~~~~~~", +":PPPPPPPPPPP~~~~~~~~~~~~~~~~~~~~~~~~~~~PYPPPPPPPPPPPPP>~~~~~~~~~PPYPPPPPYPPPK9X ~~~~~~~~~~~~~~~~~~~~~PPPPPPx ~~~~~~~~~~~~~~~", +"cPPPPPPPPP~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~PPPPPPPPPPPPPPw ~~~~~~~~~~~PPPPPPPPPYYK7. ~~~~~~~~~~~~~~~~~~~~~PPPPPP7 ~~~~~~~~~~~~~~", +"KPKPPPPP~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~PPPPPKPKPKPPKD ~~~~~~~~~~~~~~~PKYYKKKYKD* . ~~~~~~~~~~~~~~~~~~~~PPPPPK@ ~~~~~~~~~~~~~~", +"FPPKK~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~KKKKPKPKPPKPKP* ~~~~~~~~~~~~~~~~KKYKYPKPKw. ~~~~~~~~~~~~~~~~~~~~KKKPPc. ~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~KPPKKKPKKKKPKg ~~~~~~~~~~~~~~~~~~KKKKPKKD= ~~~~~~~~~~~~~~~~~~~~KKKKK1 ~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~KKKKKKKKKKKKK= ~~~~~~~~~~~~~~~~~~~~KKKKKK7. ~~~~~~~~~~~~~~~~~~~KKKKKKO ~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~KKKKJKKKKKKKD@ ~~~~~~~~~~~~~~~~~~~~KKKKKcX ~~~~~~~~~~~~~~~~~~KKKKKj ~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~JKJKJKKJKJJD@ ~~~~~~~~~~~~~~~~~~~~~JKJKD* ~~~~~~~~~~~~~~~~~~JKJKJ1 ~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~JJJKJKJJJJJH= ~~~~~~~~~~~~~~~~~~~~~JJJJ- ~~~~~~~~~~~~~~~~~~JJJJDo ~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~JJJJJJJJJJJqX ~~~~~~~~~~~~~~~~~~~~~JJJ7 ~~~~~~~~~~~~~~~~~~JJJJs ~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~JJJJJHJJJv- ~~~~~~~~~~~~~~~~~~~~~~JJ0 ~~~~~~~~~~~~~~~~~~JJJJ@ ~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~HJJHHHJJh# ~~~~~~~~~~~~~~~~~~~~~~~~Ja. ~~~~~~~~~~~~~~~~~~JJHh ~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~jhkvh#~~~~~~~~~~~~~~~~~~~~~~~~~ka ~~~~~~~~~~~~~~~~~HHHH- ~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~0. ~~~~~~~~~~~~~~~~~~HHHv. ~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~- ~~~~~~~~~~~~~~~~~~~HHH1 ~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~bzzX ~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Hbb0 ~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~bHbo ~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~bza ~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~zzzo.~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~zz<.~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~bzX~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~zz< ~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~zl ~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~zz* ~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~zd ~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~zX~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~l< ~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~lX~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~f& ", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~2 ", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~2.", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~&", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~%", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +}; From 1f95a294cd5b26545e976565a6d94db9037397dc Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 21 Sep 2013 07:27:45 +0200 Subject: [PATCH 244/267] Add the new 'Clean' themes from MaJoR and default to Clean by changing the name of the config key (yes, hack) --- Data/Sys/Themes/Clean Blue/README.txt | 3 +++ Data/Sys/Themes/Clean Blue/browse.png | Bin 0 -> 342 bytes Data/Sys/Themes/Clean Blue/config.png | Bin 0 -> 511 bytes Data/Sys/Themes/Clean Blue/dsp.png | Bin 0 -> 1481 bytes Data/Sys/Themes/Clean Blue/fullscreen.png | Bin 0 -> 741 bytes Data/Sys/Themes/Clean Blue/gcpad.png | Bin 0 -> 1524 bytes Data/Sys/Themes/Clean Blue/graphics.png | Bin 0 -> 938 bytes Data/Sys/Themes/Clean Blue/nobanner.png | Bin 0 -> 321 bytes Data/Sys/Themes/Clean Blue/open.png | Bin 0 -> 925 bytes Data/Sys/Themes/Clean Blue/pause.png | Bin 0 -> 359 bytes Data/Sys/Themes/Clean Blue/play.png | Bin 0 -> 622 bytes Data/Sys/Themes/Clean Blue/refresh.png | Bin 0 -> 1182 bytes Data/Sys/Themes/Clean Blue/screenshot.png | Bin 0 -> 1020 bytes Data/Sys/Themes/Clean Blue/stop.png | Bin 0 -> 352 bytes Data/Sys/Themes/Clean Blue/wiimote.png | Bin 0 -> 939 bytes Data/Sys/Themes/Clean Lite/README.txt | 3 +++ Data/Sys/Themes/Clean Lite/browse.png | Bin 0 -> 377 bytes Data/Sys/Themes/Clean Lite/config.png | Bin 0 -> 483 bytes Data/Sys/Themes/Clean Lite/dsp.png | Bin 0 -> 1432 bytes Data/Sys/Themes/Clean Lite/fullscreen.png | Bin 0 -> 658 bytes Data/Sys/Themes/Clean Lite/gcpad.png | Bin 0 -> 1545 bytes Data/Sys/Themes/Clean Lite/graphics.png | Bin 0 -> 923 bytes Data/Sys/Themes/Clean Lite/nobanner.png | Bin 0 -> 321 bytes Data/Sys/Themes/Clean Lite/open.png | Bin 0 -> 828 bytes Data/Sys/Themes/Clean Lite/pause.png | Bin 0 -> 355 bytes Data/Sys/Themes/Clean Lite/play.png | Bin 0 -> 617 bytes Data/Sys/Themes/Clean Lite/refresh.png | Bin 0 -> 1212 bytes Data/Sys/Themes/Clean Lite/screenshot.png | Bin 0 -> 1084 bytes Data/Sys/Themes/Clean Lite/stop.png | Bin 0 -> 344 bytes Data/Sys/Themes/Clean Lite/wiimote.png | Bin 0 -> 923 bytes Data/Sys/Themes/Clean Pink/README.txt | 3 +++ Data/Sys/Themes/Clean Pink/browse.png | Bin 0 -> 368 bytes Data/Sys/Themes/Clean Pink/config.png | Bin 0 -> 520 bytes Data/Sys/Themes/Clean Pink/dsp.png | Bin 0 -> 1614 bytes Data/Sys/Themes/Clean Pink/fullscreen.png | Bin 0 -> 796 bytes Data/Sys/Themes/Clean Pink/gcpad.png | Bin 0 -> 1627 bytes Data/Sys/Themes/Clean Pink/graphics.png | Bin 0 -> 979 bytes Data/Sys/Themes/Clean Pink/nobanner.png | Bin 0 -> 321 bytes Data/Sys/Themes/Clean Pink/open.png | Bin 0 -> 940 bytes Data/Sys/Themes/Clean Pink/pause.png | Bin 0 -> 368 bytes Data/Sys/Themes/Clean Pink/play.png | Bin 0 -> 652 bytes Data/Sys/Themes/Clean Pink/refresh.png | Bin 0 -> 1276 bytes Data/Sys/Themes/Clean Pink/screenshot.png | Bin 0 -> 1128 bytes Data/Sys/Themes/Clean Pink/stop.png | Bin 0 -> 365 bytes Data/Sys/Themes/Clean Pink/wiimote.png | Bin 0 -> 998 bytes Data/Sys/Themes/Clean/README.txt | 3 +++ Data/Sys/Themes/Clean/browse.png | Bin 0 -> 471 bytes Data/Sys/Themes/Clean/config.png | Bin 0 -> 526 bytes Data/Sys/Themes/Clean/dsp.png | Bin 0 -> 1454 bytes Data/Sys/Themes/Clean/fullscreen.png | Bin 0 -> 884 bytes Data/Sys/Themes/Clean/gcpad.png | Bin 0 -> 1675 bytes Data/Sys/Themes/Clean/graphics.png | Bin 0 -> 940 bytes Data/Sys/Themes/Clean/nobanner.png | Bin 0 -> 321 bytes Data/Sys/Themes/Clean/open.png | Bin 0 -> 1041 bytes Data/Sys/Themes/Clean/pause.png | Bin 0 -> 405 bytes Data/Sys/Themes/Clean/play.png | Bin 0 -> 662 bytes Data/Sys/Themes/Clean/refresh.png | Bin 0 -> 1284 bytes Data/Sys/Themes/Clean/screenshot.png | Bin 0 -> 1182 bytes Data/Sys/Themes/Clean/stop.png | Bin 0 -> 382 bytes Data/Sys/Themes/Clean/wiimote.png | Bin 0 -> 1092 bytes Source/Android/assets/Dolphin.ini | 2 +- Source/Core/Core/Src/ConfigManager.cpp | 4 ++-- 62 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 Data/Sys/Themes/Clean Blue/README.txt create mode 100644 Data/Sys/Themes/Clean Blue/browse.png create mode 100644 Data/Sys/Themes/Clean Blue/config.png create mode 100644 Data/Sys/Themes/Clean Blue/dsp.png create mode 100644 Data/Sys/Themes/Clean Blue/fullscreen.png create mode 100644 Data/Sys/Themes/Clean Blue/gcpad.png create mode 100644 Data/Sys/Themes/Clean Blue/graphics.png create mode 100644 Data/Sys/Themes/Clean Blue/nobanner.png create mode 100644 Data/Sys/Themes/Clean Blue/open.png create mode 100644 Data/Sys/Themes/Clean Blue/pause.png create mode 100644 Data/Sys/Themes/Clean Blue/play.png create mode 100644 Data/Sys/Themes/Clean Blue/refresh.png create mode 100644 Data/Sys/Themes/Clean Blue/screenshot.png create mode 100644 Data/Sys/Themes/Clean Blue/stop.png create mode 100644 Data/Sys/Themes/Clean Blue/wiimote.png create mode 100644 Data/Sys/Themes/Clean Lite/README.txt create mode 100644 Data/Sys/Themes/Clean Lite/browse.png create mode 100644 Data/Sys/Themes/Clean Lite/config.png create mode 100644 Data/Sys/Themes/Clean Lite/dsp.png create mode 100644 Data/Sys/Themes/Clean Lite/fullscreen.png create mode 100644 Data/Sys/Themes/Clean Lite/gcpad.png create mode 100644 Data/Sys/Themes/Clean Lite/graphics.png create mode 100644 Data/Sys/Themes/Clean Lite/nobanner.png create mode 100644 Data/Sys/Themes/Clean Lite/open.png create mode 100644 Data/Sys/Themes/Clean Lite/pause.png create mode 100644 Data/Sys/Themes/Clean Lite/play.png create mode 100644 Data/Sys/Themes/Clean Lite/refresh.png create mode 100644 Data/Sys/Themes/Clean Lite/screenshot.png create mode 100644 Data/Sys/Themes/Clean Lite/stop.png create mode 100644 Data/Sys/Themes/Clean Lite/wiimote.png create mode 100644 Data/Sys/Themes/Clean Pink/README.txt create mode 100644 Data/Sys/Themes/Clean Pink/browse.png create mode 100644 Data/Sys/Themes/Clean Pink/config.png create mode 100644 Data/Sys/Themes/Clean Pink/dsp.png create mode 100644 Data/Sys/Themes/Clean Pink/fullscreen.png create mode 100644 Data/Sys/Themes/Clean Pink/gcpad.png create mode 100644 Data/Sys/Themes/Clean Pink/graphics.png create mode 100644 Data/Sys/Themes/Clean Pink/nobanner.png create mode 100644 Data/Sys/Themes/Clean Pink/open.png create mode 100644 Data/Sys/Themes/Clean Pink/pause.png create mode 100644 Data/Sys/Themes/Clean Pink/play.png create mode 100644 Data/Sys/Themes/Clean Pink/refresh.png create mode 100644 Data/Sys/Themes/Clean Pink/screenshot.png create mode 100644 Data/Sys/Themes/Clean Pink/stop.png create mode 100644 Data/Sys/Themes/Clean Pink/wiimote.png create mode 100644 Data/Sys/Themes/Clean/README.txt create mode 100644 Data/Sys/Themes/Clean/browse.png create mode 100644 Data/Sys/Themes/Clean/config.png create mode 100644 Data/Sys/Themes/Clean/dsp.png create mode 100644 Data/Sys/Themes/Clean/fullscreen.png create mode 100644 Data/Sys/Themes/Clean/gcpad.png create mode 100644 Data/Sys/Themes/Clean/graphics.png create mode 100644 Data/Sys/Themes/Clean/nobanner.png create mode 100644 Data/Sys/Themes/Clean/open.png create mode 100644 Data/Sys/Themes/Clean/pause.png create mode 100644 Data/Sys/Themes/Clean/play.png create mode 100644 Data/Sys/Themes/Clean/refresh.png create mode 100644 Data/Sys/Themes/Clean/screenshot.png create mode 100644 Data/Sys/Themes/Clean/stop.png create mode 100644 Data/Sys/Themes/Clean/wiimote.png diff --git a/Data/Sys/Themes/Clean Blue/README.txt b/Data/Sys/Themes/Clean Blue/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean Blue/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean Blue/browse.png b/Data/Sys/Themes/Clean Blue/browse.png new file mode 100644 index 0000000000000000000000000000000000000000..2a56c1434093cc6dfdbef470e657e6d5d507c9ee GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GKRjI=Ln>}1{rUgj{;&g+S{ozVVm^rib^|6u?!%kv_j9i5 zNlId!RKMaagP6jz1O+|i0)~&`8|E!_v6vyy(N@vHn)6`)|07mnk0#WIoZOYb@5rON zRi`60jCGQYNW?!@OWp>aNeT%H9*4OrL>ywyJ2f&pWWHqYNK?7wu!HT^lct;dIn-B$ zm`OcjdL$&OB!1?PXQiG;y89{Cde1Yg^(*Icdzcz@C!2@|Sc;d_tIk>BwUa$i@5LXd zNHn2;tV_%`-fDF# kKKOyLM|od4k3a%L+ljK9N-ZmaLBPP^>FVdQ&MBb@0Jdy@4*&oF literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Blue/config.png b/Data/Sys/Themes/Clean Blue/config.png new file mode 100644 index 0000000000000000000000000000000000000000..487d479e0899ec936a476b4334a53cc741f763ca GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@j0-(o978H@CH?vT-~O-z(=oyK4S@zcj;DCS+FI|wlAQK$ zC*LszGY_6{r6rrb`tTUv3pd(O7;dzu))-N7HobNDS^q*R;z7yH z+xJDH_glJlJXH7QI{Z00SW>Dqt>Nga^?ySjKo=uKZv2DfLR-QdU z{}L{qKW}EF^Z8x+k57+eP0ns~xcZOb;uZfE9-bJ7Gwfdln6E7Iclg5_t(2moS$*?Z zsNseUt`2{GXR{uD=$gw@Y*d$A$f7OMd>~)rpS!1-ieX6Sq)bP0l+XkK?a|qW literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Blue/dsp.png b/Data/Sys/Themes/Clean Blue/dsp.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd741e2abfb9458d833f210b90065a469d2166b GIT binary patch literal 1481 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 literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Blue/graphics.png b/Data/Sys/Themes/Clean Blue/graphics.png new file mode 100644 index 0000000000000000000000000000000000000000..f0b30dbccf1efa4422cfbf9ce34f9a15c9a7a6ad GIT binary patch literal 938 zcmV;b16BNqP)siF`c6zl_~ zt*!QvlE+MDJa=*@eN84alhR!H$V|97-*?aJo^YmVLM<188n2oQ5Nbuty(osBv+(5K zB?yHd0O3#X3cFDlgKYXP^u*p#0TMjdW`HA&yXpedn1^n$Nw5R}lA}kGO+TJpj6=q0 z|G>b&tHHs+*=juxw}!gl{LQ4riQIyf2Zdrht{>a8qN-|+5VEZ{6N$v3si~>)YS{Dn zJeeJR_%?N}yOe{)Bs7YA;c!@wMx&b3k0X)D(UFl6^cJiH6_CkfxW2x=x|CsVsRHH! zJUM+AU2JqAMuQ5FWf|Jq+Ujh+Z2~xsqvVE*jZVa8gdS8xJRVnIro0EJ0Jq*uL(qZv z8dN|m7E@tzs{q~HNKk2=LCgddfJv@y;Ilno*dg#DAdWbW_#H%mq9|dT&mjkh~=W(0mGz zcS-==+lrXs!R=%Dv{N31V^R0V8%g+N58{3n)%K$ka z_qzUx-eEw5c7H<{6`;-AZv~is-;YB=+UkLR@a@e#3tsnAj{EhetWU~`+#GXFJ?)b0 zne%uQ>Z)b-9A%+!9YGLT26}Khcl_lTp~wvI6%()j!yn+w&d9DK%q#g)Gop)w2A`ST@MB^VJ zmmY@R19R01;NfxRC1&}J;z)x8KNs=aP?-?m;am3M|Lmlo_(N=!J*;+^eSTku^7saO+MV4PyZ98&R5I~RG02l6b!ij5FK#sHm zk(xo24+DoSbyJROtDxm(LC;P=W@!S(pT35%p%l&ZY6S4CI%w9(>{(DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Blue/open.png b/Data/Sys/Themes/Clean Blue/open.png new file mode 100644 index 0000000000000000000000000000000000000000..c541bf50d3bbc1906a4c532f34513a09c8f784af GIT binary patch literal 925 zcmV;O17iG%P)N(KBbC8G~ z1p|ixGknx!8+nEY8n`7;jvQvVsSW{eDrAP8j9-B!`8?dxjipF|nH+^A0>G@I?HsgE zw?U(c&+EBAD2;#uH&A3*6OVBO)OZt|RPGC@FN|fc1Q(br*U8zH2B5P8uxZmn^~Rh2 zz0L{bz+#~hJ{ zI#;1bijE(8DhKjwL=?bZ)UAdFPgg|7N=r)#&LxO-4iNxp*`(%g}022px`I8e4hk~-s z5kg$cJKy$4Q?}aXYK*RJ(SH!fpJTCDkf>UuPk6xy)G?7D7Y9hAFaokEvGC?IvvWds zP^bZ{LVGU=Ed{}cF4>`_StW4giV$P1teh#pI_4v~)l3OTj9U~%*-%}%_P~iMFyN;K zJ1vm`jMRC9^na7cD&?1g9B4-j&$>Np`~{LEmC&HjHSX#@Lu>TBeIAWQM@6w@-hi&_ zT+f8PkTn8K9C-5GQPC_(wgqHMv7VIR7$N4I)oRtVzfpcX7*(oSyDL)_-2EVUUk2mh z#qAu=66Z4n#3FKD?laeXi&^~nl_A5_+I<@pb-j;;GLsxMO$#jqG^ZlIwMW|A@ln~z zJPm)RfMEqtIn&`zBXFc@I&^8jCFwCIQvf2fx_EC;EbZu*Hx0){Z@yD0J&rGgBd`*3 z(d|k{0BKXe3*KdQZlI|w2M~OD+zQ&<$WrZjIhFdNK8f%2PDs-LK>NCsNy|UohbX0p z(yEGb8HZv9h_FlvKtyT#)L_*Mx6-fYzXTWnpL|((_-A3q00000NkvXXu0mjfpw^-_ literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Blue/pause.png b/Data/Sys/Themes/Clean Blue/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..49d7a763475565c222b0b11920c1e12d6b0609d5 GIT binary patch literal 359 zcmV-t0hs=YP)+!F-@NX==z00XByJOcD%#kv#(BgTxsaevzPtYzMF~{QFNxFEMJ!b^rsa z&nQqc>HxAG@aI2u)Q}$n|EQy8Gzvy@!O(TUzyH)xGZ;gFxCY7JKX1U*EDVGAcSfQ8}TzZVP(zD;MC{z3&5Fw}GaBffF~8U;KIi~oLx z3jJdE^J@vim$!`!xiXJIp-GP@0EPfi0|c`%FtH{v@QUALnEQ1yL)Q&adW3)g!@S?` zad_n`!{1+17+&4$VyMx3N4rFb2mw_5pMjf!iLIPLTrElR&AEbxC-~Ys61{OyK4xtMS6F;;tRG;RiUP(x-13>s60|x^WdliGY z)+L6Hr!It|h58PFJA_e*fkSXNL-*SbhOjBDWEI75@Q2Jc!@s{@7+ycT&9EwmkunGT zCBp$!>zrY3`-)m0C}L?11d%T(B1+6|NmonduJKL z`m9L|k4`=VihKg%?;zc@4}l*auP~gM*Tk@=;S7-X0f@f>@o!@43KpVELTupow+9Rl z4$oj%9=-u;F(|lyLVZnng9K*?{Q2>m;pyqw3`_i0K!f@-G`RneT0@c+0)KzLW_WgP z4#S%0T*vVG>T5KM|IxZS<^p0NSnj5V z#mIIN;{awLW`zbZ#Xd%N05MVUmy}dJy!r+7=(vt{%>V)n0QChpaJRL`%m4rY07*qo IM6N<$g4ya7?f?J) literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Blue/refresh.png b/Data/Sys/Themes/Clean Blue/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..da87dba7602426074406949157d1c153aebda47b GIT binary patch literal 1182 zcmV;P1Y!G$P)CM6?ka8VOY1oejs{P54l_%Mn(G6{ifMwV&(xx3{<0dG1}?)nq4m?may{=e*DRdCuiDO~Ya~9*f)- zoq(9?a2&U=9op5r2ym$w$dUkuPe)h5S@Z&U;eK#@IgJT~C^U5tn)U~#CpuBHVuXmX z!Bxrg_*&kLYDWwGujWF4Lrd^6NQECj5I1C`sl-oW_GUd^x#JAJF^E)=@S~v`BHv7X ziN@vZV&LE}E_^wA97{_2Nb3zq5Y7Z%cpL@pep+`F{U@Bd@FO>BNP%V~6?UZN&SwD* zhc1`FeRmgWy?((?R$~2-r+*{`-nlilU08~*l+c_YWZK?N7fM$2fD^n>^QaY^SOKZH zg4x6PZACzU=gDKV*j#ux_!|QLUi@{=k60uMn`Fm*73C=PJWZNc#rAhA8%>L_@Cc0>(i0406}E5ukZ7Mx36bR@9RE*-Vc4$3mKXx zCwwNSX2kKTBaWuw7g4-?XU4d(Z~+hZy<4IDXYusJ0FG4t#0b~jVs!UNJPuub4N}oz zX1!^4m=h2oI38x$k6r4Z=OiOMrAe)m$NS^8uor%mb;hVx1TusuQjZG?5V=E;*Up{cADjUhFcJ0Yj% zbLj*3U|V+w?5?$W+&LA@1b5)@>UK2T(6YUjC-XYs3!t~*Wz0_c^N4bR+_4*;%~G~8 z@Go;<3g_D{;@ESQ2>tzo9v!)2V)#3>Zrp{7-I~>$`R|0u+;O{-tP3jnewc7Z*>)IYB%?1HaikhGUe?n%c{a$pE9-*V|NCW> w6ey$#PmdeLAflNb-KIww5m?Mm^nU~x0OI(T(r=@Y`~Uy|07*qoM6N<$f`m*p(*OVf literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Blue/screenshot.png b/Data/Sys/Themes/Clean Blue/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..82c7599c1fbf55e9435034e63cacd851ff9126a0 GIT binary patch literal 1020 zcmVf{{l(4>I2^2k447fgOFo3K+>d*smTF<8+@J`e0*{cvz9p}?u9CQ zIdq0S|J3&`$1!Y6EMf}8qT1a?mM2GPfeT$Nb@IqDlc=9)68xckBxZ1ohHK@cNj2*FQj5Zjb+q|o;xQ9hh^&Gve6FtS5yy15-5$cr zHm`E`@cYntnS~$;=UldkmOJ~JQMz~yx<0Xu9o+I`Z8OQz72E)4UjqtEAA~0im^?ET zB~NP+8=nzT?slCq*ay_CZ)&KZ&6ykf7#b(-N1;z?hNL}DbQW>R%`|s{uQ80J#f%RR zD^=x&8&M>X%h`#lb@jsX0LslV4%N|5CcRW zp0J9(Xhf_Ww})dG)^6@2-gnU{z%p|r^0=&A;BiMFC|ov;h=n|rE?R;0!0+#mC|e{= zSerjLYn_q1Rb(yPt}ZA#(;u;3T4P29v2;=5BFc^`1d3rUD_SAQkB)ceM#P$%E^tf` zD^W=1j6Mefaw>K|&q8rLD_J*AXI`RCcx4#Q+Ik(QmR{r-hRuJqig>4}DWHUNAks)o zKZN-k?&5Wgo8IiGoVOn<_tj!X<`PJ<2Ca{u;ZDg@TI=DlUtVlL;&*xU1PW?{G3 zR2Hi~9{aqPDM&O`L)PU)B{LiXuh#~RVpR8+ZY`3guSTJ{n$Glk;`tslz&izsHXE{b z6M+&)74_lw+CmEW(QCemgtXi!Px1sR&3sOw5%PmyR9`g1-d@W%WFE86_ue3VnUUg_ zN=aoHi%+jGd0iIRzTCi#jfXMN-6IM8SwgW8#0#%TWA#BMz9HD5#zNqb1~nwD=;QJj qe~kIWx#A85ZDJ2;!v8z|DZl_{N^v|{>=FO~0000YE|&+#s~6ApS)fUSxHZ|(@O{_<5)oIT7c@0z;xaL-Ss1Ie+Se7o}61n*Tikv z5h?7pDb!k@0IwTHzYO!I@}ZfYG&*Q6XyaR0t^8CFM%{Qq$Y#_0000k!h6r<12uQ#M4T#`T3>qQ?2}U#`WIM!#Q6xmc z#4%wKXY1uM&Y899Acy5s?NqLI+*kuSnG*5CjS)B91@;a2K%#Old0or4V3qS`OS* z!N#7lh|$yfd1iBE%>SPi05RI<^o-HQv&>>1io|%KAk^SqtR3o`2l2a8gzqTCmoLM` z9nqY)8!0=|ZtbDxVn{^vD&i5s#A^G!1agSbu*rx=a%Db((7=vb&~8Ue zBX;pJfIW!&;#-#lAxqb^!PEfSE2S)+fN}*8-U&+|5YNPS55knH=MXq60F@A64JPon zPT*wGmTZ69hnfJvJw4mGEUiii`y!w#_cdZKyCORu#9o(dLkyOpGScL@I~PDz&wsBEm;LwpG*M<@AL9L2-xs(Bn}xe z%e!&IqVwomlg2<6bM*R_Bg|GpfYq`fotW|{kV(#>FXLGS&VAsZ*0(ysY$f*rzSto4 z?Tv@P%Ho9ditUo0_BS2Rn+D$mW}Zx<&?GOQK8?KNKJ|^LL+f2(3UpMe0D;Ndzrae3 z=I;0;GXZ103sM4(0_-Rc30si@Y`iI$e>%WVMi%{FU)^NekaS$M0DRtxffE?MFa^t> zLtr)rVZ48imq`g!cPDhFfgQbXZ_S9uMM5e+KfKZ}z%WmETfp)HI%w{fs^Yb)xn4FZ zQR~I^t!dM=+T!l8#5Qo*>$nsGrM-@`576MIXBZWGM#{Z(-F^NOU;tQ(CRFLaih=+D N002ovPDHLkV1iwbqEY|= literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/README.txt b/Data/Sys/Themes/Clean Lite/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean Lite/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean Lite/browse.png b/Data/Sys/Themes/Clean Lite/browse.png new file mode 100644 index 0000000000000000000000000000000000000000..1d47b81cff93e406f2e432d335e05e963b91a577 GIT binary patch literal 377 zcmV-<0fzpGP)_HOCl4dwbOD4< z%8kgBfrMQ7((f&R^68G_2#Iz1Y(>s63`}=p+qRd6=vojeb`b)M2Q{=5?R(spbsXox zmz&1s?WYGsp}V4>NO-=FU{y~w1c;7bVkN+WGT{&knx;{j%JaPAC;)muQc%~mHU+-# zZxnQ0hoS%&52t`JTth(+7z*~KpsFh68H8bY90foRND9ib)TSVcqKyKe07(JXv`PxF zSjBN{DA<>Rq9~Mynk32h{0s6t*LGo=rW*x70g?jj1x85$_KKBdnW5l!2KoEf@hrdq X-QtjrUG|$n00000NkvXXu0mjf@Ufhz literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/config.png b/Data/Sys/Themes/Clean Lite/config.png new file mode 100644 index 0000000000000000000000000000000000000000..3bb655cb1c2b3ca3dc36822565805474855db2bd GIT binary patch literal 483 zcmV<90UZ8`P)%)v2zot}{SlyLa#YD@V$3WoEdM}qXm)S_@fVl_7z_;!Re=-_1@?ad;$Jsz z+*mFqCYHB&@#2plK}JT#OrY2#ApV79#}}9;Mx?0VK#CG_z#ky~FCZWwR9#(NC@3iC z4-$O;{{6<**4BPtT6hPwj|Hms2Z&~*LCMMm#C%W>F+eT)1jOHf_#Zv87swIp(4gjl zvYF_fy@&-wWkXW37qNh(Y)E4EA{G#x4N1vfq-0s5vmq(ji6eW*9Lmz^?!R002ovPDHLkV1o2T&B6cx literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/dsp.png b/Data/Sys/Themes/Clean Lite/dsp.png new file mode 100644 index 0000000000000000000000000000000000000000..4685ab5e93250a0c08a3fb7d76aff6e7762774d8 GIT binary patch literal 1432 zcmV;J1!ww+P)u}x0n7K54k$__xJ0>VsRO64VF@1=iuP*Hc*qW+SS!HZFhH9Nzc|Sz7En&HqMKH z``+H(Hv6E{>6G|L#{FP@ef^iYxw#)^XJ_XtDk|pO-Q7jlUyF>4ycQZ7dIKK5&Xwou z0HBw!?XVHx1Mt||+R~Z}<gYDOlAr#z$jW;S~hU&+}_^) zW>Qkp2ab-85_5VyJUqnMwk!hBXf)3N0H~S5!ooWvBO|J=uC91+uQLFisRF%Te`f9M>?mRU9fVOmFfi}{ z9z2AYoZG?)0Dy$~`1te<4h~i>E-o&Vm6hEF2iE!e%r+wK1<%er_xJbTgXfCz@$s*a z&jd0|gkqz{M!?qAmZBg+=x^86)w#vQ#FV6_rdB2)U0Akn9&dvk^UFl?r(S+B0H?tyU~$uX(00RaEi)m5d{Bt!-1$z#eZy$1;? zyaalmdJI((+i&oGpA54+pqFT(31D06g@!P)6;XE|6ONi zXC^>6kQ{+Vwdfif8&x48AwE{8AUHVqjndN6RSc8`QcRwK4}!3;unts40ez1)Y&SVM zSril$RLiD`xB~Y7Ix#V!lS-x6FO&kV5Ijo7)&_!o9u*b!3ETOQYj*%?TUuIbV|xIX zC-e@+TPQ`)am$?H7vcaE$D#`2Vq;^!RIAm=o}QiwY&v*yCib(Hg3|jYB_(AD^Wg>n zU$dG6wEX=1KFiC?b3wfqLvbHGHL|GyA51$-I)FQwpP&CCIy$-nsS_jobah@e5?c_Ns=J(dt*0$~tQ zV1`X(T3XtVnECJK=H@=etDn&4rRnMErfG)>Ifr?%MwMG%Uw;#w^8xN(J}>l^4kR8Z zF)b$@YIrB%o?=lEQ#iErFE20uj8?6o0Td7r;N|b{ACGh-<2izR%I51pX`dO#wr0+7 zTI5npA7Yr?>ged`gHjoXa8YQpQ4tXl0(8lz6OlDamBKa7)qxqJc^(H0Yiny?)3`<0 zB{<#m0gTMtd5;W{2ejzkoD5$FbU$Jbq?S_Ph*0_!6&1bj?d^RNq4T|rvp*v77e@P& z=H})al}fcrQ_|9rj3VNKC1!Ry!3vpW)sG)$>6!VVWp<+_4j35$J!9PFl70Xg7@fzg maf@Zh2pq9t`me8l1Q-Bcb-d!NFdn}E0000jn(-=Pi*#)u_WH%$o5#PUm?_gtNE2XE;fBpK^&B@7G0dfEb zkn;#gi_$stUjscY#{y)q0fR(z0HPmcCmYBCOh5-wwq+uLE#|04&HnK*Z0VKX;_0 zq_pqbx9<}^8=ah-_~y)+Q^wBD?hUmZZxn*!NZ|hc`|k;PrMp`qb_BF$tVB?O38M~Yga9njj^Dq&`3 z_VMV^qj(D?YinypkXoucz|zuk;{5sZQ-Bsc0oG(#9pT{Mzz9?$BQG!CN2~+DxnS3> zUGH(oZ2{uNK)iy?g2*3;bAZ?lTh?`Ra}y*~6vsgwK`tnTI)dyd0F~iZ6jVmGM5O@& zMKLAdKd}yYJrE5Nm;?TO`t)fT7Z+DPJ#GK??b}L_-OQlWe&ND}Yrs6t&dkg#3+$@# zfVyk6!vFsLd->(dmnAJNExkaGe_({RjJbhW5Qur9p~6TbkAu<#D8YROVo=uq3bP0l s60D%Aln#A`f6yxZH?-m!;Q%1O0HF3pd<&05v;Y7A07*qoM6N<$g4&HDga7~l literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/gcpad.png b/Data/Sys/Themes/Clean Lite/gcpad.png new file mode 100644 index 0000000000000000000000000000000000000000..03066ac511a9d4774bb749e4cc4784b03d7a0b2b GIT binary patch literal 1545 zcmV+k2KM=hP)$<*|C z**xOqsCo40(R1zhoSx5p+uYV4ll8}5`0-wz=Y5~&eQw|T32wJrb}yS;c8}YA1@0@L zycJ<_aq)qWkdQTTE})rArU-w3|0IP%k%Va!pdlJE$pl<=xm=U$>+3_o!NErN_37mU zSa*^mI2?{^+9;KR*=&B^&(E(4(|v$xYisLM2#f?R6Z41v66Z8il$L8aQmYH0Rbo3Ou0Z4@C&CMIS_ zXB&-1Jp$}yo{|zT0ga;aKpyZhFbSDYqSuiE3gmAXOh-&V0qHE9S|D%`I17A83sX~5 z#_;fPF|f=MKIi1*FQ-igCg{zV|GXyzXzz2kI zC=rK)OW@=F9SY1P#ZOH;1IwC@wAzm$M6;5^WVQ(Q8_*ws~b`MaOHkz;PZ^f0o7@8ynuUv$JaH zUhZw;8Vb&-&d$zuWX+))t=ik$YZGH&S(5t{p`&eWZPW4b@j93~j|+$i_<}8P7+G_% zzP_GZAb{r*1QcWZ9DP_h3(nB(o12?YqD^FGW{RmTHjDToazlYdX-$UL%Afo=8ii(QH;o;$F&^O5fm6etK9UUFn z;LE{-BaX6ZU|^sfd_5efO1QHpFfi~1Nj4a^6oKR*EFw(XDj(bIl9(9zV?bOt`PP&I^R z{iUU)gGAKnbS}OnWyw5e!ve4hnjLU6NU2q(%`q?S+2k`EWo2dEID4FA0M@RqE-H2o zvVa4DV#HT0H!d#j5u{`rKOkMiTw7b~W=lA(d*)nwNqHLhT;gqa;B&&Q7NqU#>FMcN zV`F38b#-;4bf$ofvb?-JHGfo8eB*VjJMQMY3^J4~!-p01xJM8lr|e&W{pZ?+2dOB- vlX)CJZt=gsEeWXIYN8D1|LV`^9{~mcYmx5@8#>fd00000NkvXXu0mjfSVGh| literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/graphics.png b/Data/Sys/Themes/Clean Lite/graphics.png new file mode 100644 index 0000000000000000000000000000000000000000..7b7b42573cb7a68c61e4084d8067f256d8e0f022 GIT binary patch literal 923 zcmV;M17!S(P)A!>7+b{BB&}eQCLtfq zUHtvicQtJ;x!gtC#Ros`-rc+Z@AuySlOvy!^__ z%G|=j!b{xKgl)6}W94!=Pj3r_!V8znRmW;{<>vnW{?}+Ux;hLyR$9pAa_839*S}HU z?RI-5_JU&%njVkmK=0$x(b221Sj-A0oqZR_TtqO2al>g;BE&wSwh=2fa1ISnr05`jlb^0zCPyol=U@03=e0sY8 z0^|YhTm~)zC9?u#S$1~0phJ;t!q!dTlUV_xDE7_*tbk;~))n9NdYwW z8t}u^_A3az3la8$n$PF6o3J+pWDRP^v4*{1OfLxcur&T;GI`g`Y_P9?z~uqHy=^uY z@a>*UW;1B)jJaoCM`kk==U$ zBiE6eY78`SI(Pi$8KKM!h(>{zN~L~Dl76hxEJLA?ug_-HWFSt3;$LFQ8Vp9wZMWO0 zp6kA>R4N>sVcAS786KlDnam^(D)$k=Gdnvw6hOKIOQjOGxw-jle0=;p>isIV-rZpZ zh#-B9C4Y$1O#1=E^j(2qF!+eZA~O_>eLgWU@wnd^L(=;-J3K5OmgaOiE#atkM1Vp< z^+MMexhI>=()qD1KA+FaEWX;sUzf{3zzA?*etv#791hUR3ix;tj xoY%>7O@zYIP3DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/open.png b/Data/Sys/Themes/Clean Lite/open.png new file mode 100644 index 0000000000000000000000000000000000000000..dd4cdb576d68ca3f9472e952a50f12d5da17cb69 GIT binary patch literal 828 zcmV-C1H=4@P)z@i!H ziZP7mo;mm2dk5OGEb5Shp$lXELx%?~$!r5lCG4IO&O8~&K1dZDf4u?OCMk6W|3Y`J`y+9BKc!WUSXWUWz zWB`Ak%jLdo0Zb+ndEep#lGcn21Y~G)8u0ykx;n20*)rO)v8Kyb_DW zwkQ7!pN+tIWLr=Gf^=5IHGvS_;48s3fL#p8vfRSPs?)ihj(41Z1Z%xs4;G8X8hQ|X zV*pfNBh30g=ct-=G#Y(_=}V-O4rdY^|AONVOaAp_Tt}RvP@Up4=cx|3q3itoJX@>PL{vTkf(Gb` z^LIQmC{{Iyv*xuOyX^&RqtPgII-OyqQZYdB761wqhZ39zLod9X{0;ywcL7lpGcYnG z&ffZQAt6~XM(P~xxgC!wyKAwfQc2`_{xy`HASw3HhOk{Vo6V2)di@7&U&(m8d4%j+ z(t}=zh;(42VNGers1vP})ixq0?7))$JqN=KTbY1rXr372-qkJJIJ|Tg6f_k>%djnP2`G61OvJ*l8 zA4j8@;p!Ttxb3IGUd$Q-|D6@{7}ojMEM@r!FaVs)_9EzyYMKB5002ovPDHLkV1nY8 Bngsv= literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/play.png b/Data/Sys/Themes/Clean Lite/play.png new file mode 100644 index 0000000000000000000000000000000000000000..afb0702c9dca005ac3d72cfc7faef76f36b84cd7 GIT binary patch literal 617 zcmV-v0+#)WP)=8%i7Hca=Co$_xrzQ5uqUfjYb3MEvP6;12nSd@p!JZ^(_ZbtJRQ^%s{Nq zJkRfXypdF0`9*_nm0ibp|9fsq$yHqMgSF6?LL}10t|A>)R>;hlML!uRd zNxuav;7&}j>5L}<7%9PsMAiT6T<{kM*X7adTYv!o$5gkB!E6<300000NkvXXu0mjf D)z%9n literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Lite/refresh.png b/Data/Sys/Themes/Clean Lite/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..995326f4bdbc92211745f8b51ac90b1be63d1ea1 GIT binary patch literal 1212 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 literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Pink/README.txt b/Data/Sys/Themes/Clean Pink/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean Pink/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean Pink/browse.png b/Data/Sys/Themes/Clean Pink/browse.png new file mode 100644 index 0000000000000000000000000000000000000000..64c4546127608100c5ed89664a38fc14a73b70b0 GIT binary patch literal 368 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 ZFaUUQvO>9mIs^a!002ovPDHLkV1m$o1YrOG literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Pink/graphics.png b/Data/Sys/Themes/Clean Pink/graphics.png new file mode 100644 index 0000000000000000000000000000000000000000..a82403b9525e20c3008629e685f821e3b9390f59 GIT binary patch literal 979 zcmV;^11$WBP)8(S4dIE+@YW4uD6^cs>F+r676Wj4@5f0UMS*ueJ$>DN@@)PmhA}UB0IydQMNzeS+2`}^@9*#DP&MroK$0Y?v$NBc z_cIAr&@}UcdXDeeBHw66`rs6R=Xnqghg~40Sp!fMh0Tp3-)KbohNL-#2m}HGm@5R3 zS4RK?6iWnsf?)g4_d?8S4>1Q&0{-0O=soloJ3! z5WIOmrvQLVgQL~Jahzu(!1^F8r|dzhMOw5Az_P5cX3E!(K#3(-SdJilw+leiv`}mW z7#rW(hctoHm`wnF;|M6a69C+{9_g1I0JPLydB48^BsCfn^UI(<=(6#>I;2F2+_4^D zDDGdIit%>rSI*xXWhvVBcC6)$uVybOc+Bp*YEGZ!US2x{@%dn2?q`>-su`dmG8=mG zd-yh1x$UtB)pzwMzG6@8O_A(ZgR>;5Q)PBSMoN*oh*WCo@H8zG;f~{T#{xwRS@Hq8 zRNxJE^~^D}bu&%ZK~v=Njv||tMua_aAgBx>Q;13xZ!k*(FUMOx%qZqz3imKm_7SO^ zHdEbwA(8jCO{eA?Y6cS>eonA#m{hW0p{cezC~o_bk);=bE3Gq?0?=yo)nf+I7x7I> zS_0C$5x_(1bRiiU;7=U}BJVK|zp|#@cVBP4QS6MtSp6?R328MoFO4S{(Y4ZJR+T|A zR0S4P*?OyGtAH6HM`WOd*%0-859;QF@r?7N(^yCE|I$7 z6d)fbkeJd$&?0{F5IT`Y?pF<*0{pXL<@HB^0RX#Tesa#Q3A6wJ002ovPDHLkV1kNg By(0hs literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Pink/nobanner.png b/Data/Sys/Themes/Clean Pink/nobanner.png new file mode 100644 index 0000000000000000000000000000000000000000..08a30884310ecba0d240432e197700b8db560f68 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!VDzk-zB62DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean Pink/open.png b/Data/Sys/Themes/Clean Pink/open.png new file mode 100644 index 0000000000000000000000000000000000000000..cc26643975090e9e2163646d8cad7d2928216ab0 GIT binary patch literal 940 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 literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean/README.txt b/Data/Sys/Themes/Clean/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean/browse.png b/Data/Sys/Themes/Clean/browse.png new file mode 100644 index 0000000000000000000000000000000000000000..fb88269afe1b9a95efeaf8c4fc52692ff49fa150 GIT binary patch literal 471 zcmV;|0Vw{7P)M9$+Ca?(z zCLoxB2hUtsB!30Dw00raN0Oqjx-7c{mXTVm*mN~2s1_!6B>Q&c!J<1Qmz`Yav zMd05PKqCvDN1o?3_`13fhz3C*;jb-o0vI2vs&cX{uP&_XdR&J;H;8jxw-E&4<-&d6 zb72@tgaE>z5`cguVNKIGNs?YB&@|1M2Q9aFDzZ9)C4Ari#+T0nyMLQSh-VLpzBUp< zzz-S0G!Art0BGr#5ZIG&3}7w7nSkRsn=Xjs_&gVY0BNEkq9G%&ZTqkbk|epi0FsHK zxEj!P-2-7oQP{cw3QR?41ZG50bh&`73oOf`iV8%NW!ZTy071cVyxM--KDfX%O{#6T z0FCE)es=*RqwT;{Y&YRe0Za{{iL0+YanKn50OMvf(fB90YUu@+sRaN|j;Qxu|d7UIlCP5H9+P3|S=i~ACtI=po z+U@pJx7+nG2gXjPQym^>WdY1IO$DkIE+ES?WwBVapmQ~j<2oGqcn-zX4a3MGX{*eE zu}}cR$7Rb+@FTv8T7W(pjm{Wjr%@E$t~z7v3ic1K>)!MGn>_Yoy#Q>Tt$h-qmw;aa zhOaXi49;Oa=0o^8o6YWE_4&|iJT}5rHU&6n2jGXiA%!RU1P{S;VGId)VG%m_RVerT zHyBdz!bEX76MUayvQmjO$|jbm8ym!n95c|5lp43p$MkZ)le8ynQ}~0!M*LRv~K|h0FNqePX<1y QDgXcg07*qoM6N<$g8e=4MF0Q* literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean/dsp.png b/Data/Sys/Themes/Clean/dsp.png new file mode 100644 index 0000000000000000000000000000000000000000..5da533c5b0e8924be1e90360eada730c77eb7f72 GIT binary patch literal 1454 zcmV;f1yTBmP)JJfTBvzP;rJMUxrYJHy7%3Zb$QavPn;)``4jDyZ+YbqBlnv)v=GZKvPP9Qp zN`GuB*63{fsIk$^@5C70^Iq;NsZBC zNd%UQ7#J;tN!X;rp9g|rafCvlpv@}1Uf+Q^4M-d;*x1+@URqk}hCCP?92|urd0t*# zhFYyY7at#A5*{9&?SUs^Ae0(-K_G0>0de>uAg9bEg*0M=h9=!^w*VK;jg5^N`uh6r zVrsjfpg>(-Uj7384>F_e?d=12HI|i?y^@-m`U!}sJTd59syMmdBqU`d;!3clP3!CH z_q)2f^mBMBDk^jUzlt?yc~5e3vXGLJ@|VNmxZ2s-c{@El{m-JJqHn^&!p;)LVO+nB zh!?VKZ*N>#9Vxkd-Kh$cqM&w2nCb4gmG*FC>>GO*4Bmx z1_u79t*w0nZZAS_ctSbl0!9auqW?*-_7Xgy>*?v~MAD8ko;LzMbAS@jZnytVN+Kg8 z-{DH2oB-JJ%*@QSp`jrY%@r3HU(jeYAA&>_lZ=Upxq`p?R##W=U@n6QA1egJ*lM*7 zBCF2;APue+fhq0_3k#n@`7c=h5Mn`Pe2=xCOJNWNxuVU;$Ou_kS-H#BABh0F3uPzF z&(Hsj?)4&DCAojOzrX)iEVV)Yf!HCBG4~_>b216+QDkOjK94Y3C=VF-NFneb;UbF( zkVbkC3L?D;aZ*I2ZB8iMr0z##*;^DYD0dJ6#y(aRAg-t3S_>x^N>M;}tIe&Ox zWo6|hxIKhPfPiykWMnQXDk||rWk^XE9UWba9xxB<&7>TSg$M{qNlC`~`uaC%zfPwM zYG`P_})W#jtQ)s{0Z2p=;gm7FW0={y}L<4;|XxBfbtYa z`c3mBpJANmJE6B6Ao_H1jFm>Z!OA2# z5eG?J()nSR#ywvIm_)FoT=9%PfZP&^9aetuSs3VV!+!-B0EQ82E3pV*IsgCw07*qo IM6N<$g4V{G^8f$< literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean/fullscreen.png b/Data/Sys/Themes/Clean/fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..f7d469cf55c1b0ec1db11a3293c79e635e907d7f GIT binary patch literal 884 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 O0000DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean/open.png b/Data/Sys/Themes/Clean/open.png new file mode 100644 index 0000000000000000000000000000000000000000..f8acbcefaa9466aeef112c202b406ed882e93fb5 GIT binary patch literal 1041 zcmV+s1n&EZP)0Vdv{0YUS-E`fZD-l5jy9t6eO9erZLZInFTxcIuLlW~a?@7Ot z=E~GIGo!V*uon(9Oy-{Ro$q|-+zH=oHo3=K0{6)4KLCDiZtjVfU}a^6Z!{V&MNv!} z42GtX>GgUvP4f-*2$Cdm4`DihFicELyf>Ll&hGARuB)r7qX7h`)9Iq2P{_Qxx*8uH z9sTPbCIH4rB=VYqg9QrE(F8%@c%G+gWN2u}ytcL$9~l`TR=E2b4*<4>g@p_O(6VS# zyR-{1dwc6R1f0>Bbh1waA??Rn5&lLw~-7ECf>5+hu#R?9#i{K?6QVp5s` z&~L$DFl#g#Z-Rq9etms?IFU&Br>3S#v$M0`(N?Kasgx=fi;~@Lw*W{$NmsuBP|^S# zHJwgpg=)^8U0+}84i66p3G~j+ju9X}na$>Un-$*Wa+RyqD&4DUKwxMTj7L@?)fX9w z5TF}^9EKn(xm=F(`~Bzg7N+;|`Mh4m=kF!xq*`)*d3os$hr`rvHdcc9`S~J7_(x=# zm9qoQ@X2J-LHm?C;Z6XKkB>bwGcz?(I~ydJgp$o>%VJ*@z$978_=AIk=W2tE0TAS) z_)kVN01oX(M@Kc>^Gxv+809FT?;CP)Zf$K1UR+$*XkRCvWb6zP(-MMS6NRGz3B7fc)Ob%lyT#ZPi$w97sxqkh)^sZK2*J8|Ji;>4nU~~d**GJ2; zKDLl5*?(Jsrx0-*Z+ze1gCZg9L}ppGP1E#%8ykRO6Yzo{NWenJaYR{`p>5j<%pbvS z12Aj?3m6fYfS{sTAi{YPybp#=z{Lcrs_J1Rq1=HOHUZp?D2k%xb1-ZI7#L-xJ_ln& z0ROFyfDSWV0(qXdPDS)N7$XH}aFqf&%ybF7%BlJVI?Qwxz(a)wR~ z!)pR#xhtEXIc>>w7!v}2+!cT0;yPc=?g9(|K>$2`#)1Xm00000NkvXXu0mjfoNA#t literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean/play.png b/Data/Sys/Themes/Clean/play.png new file mode 100644 index 0000000000000000000000000000000000000000..0fb30540dc6e7b14b9f82f777b208f563d94eeaf GIT binary patch literal 662 zcmV;H0%`q;P)|a3e^XJbcU%!5BT(@rBV^C<)BMMl6fPsU9gMo{Si;bI`JBgp4|7K)l4PK(;BpAi5n{loSsWZ3yw}^?Tb&e#5aj@nh3JleIRtD7 z6BEoKj=*$s!PnQf#opeYn`R+^jzMVzluJN~73dHSphK#F(Q?Vn&CP{SXb|Oq-@kto zg+U>LU?v5C(gzTK0hSxLuU)&wNU;M*trxz3|9<%D z)vNUn9z3{$ufU?Z1Ax)+^7-@UooCLR*#hLg2jb5lBWUgbV7C1C`Sa&xmo8nJ^x?yY zXF#D(pnw3miRK{yOn_G&K7818=gyroK<)=1{t6N%rmkQiwj99b0HDJjynFX<2GG|V zpcaFI`zO@bls8ClIRMCi4h-hmK#NyEgZeWxxc`t^Lz3hGApIH`&vSs;YB|vN?~yG2 z%|K?=OpF8m1DgTYK7RbT{{H>@>%M*a_8QINf3$9pZ~-x_y8S{8i;?Xl#sSPg%nA)+ wihYdk0AixxFDa>dc=ZeD(QzH^ngIkD030D+Bb@Ss(*OVf07*qoM6N<$f^FF>&j0`b literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean/refresh.png b/Data/Sys/Themes/Clean/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..068d4976f01903ca5bd02ea4299ff3794df08081 GIT binary patch literal 1284 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 literal 0 HcmV?d00001 diff --git a/Data/Sys/Themes/Clean/wiimote.png b/Data/Sys/Themes/Clean/wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..07d63ab8417106dcdaf96fb7f838f63fb0809037 GIT binary patch literal 1092 zcmV-K1iSl*P)S1gr;U>cv%3h;OTO^-Aw=yhj?@Vxm+&DamZgIL&qfna66q&4;&|< zb1s+bEx@Dz$_8B;H#2moIlYL;rf_b9bA~)IF){J%?CdNd<=S2ofO;M{wrQHSFf}#R z&i3TwWP3K7T>y}Zc9l3_9~cV+nptTf4J|`MLt$#Q&+tngqMnWf~1nfGlYW zE5I@UtU5>Mg4yMrQiS@%2!IZd-_dz30L(~OgyFHyVtq0_q>!|_5ur~5SDGM4lD=*= z0!0}AVHnjjpFlA7TLplqkfcem@g#*^+%f%@}DCIDzgRbWI;D*&`qDz)wR`_HX_6LL(AfK>oy zRiN$e?ryOZ1?$U#zS5W)0j5S5e77pMtpF&*W(D3vyH{YeFYKcW?*Uu-GltI=rmF?BsD zC;>P)IQYVx%PBZMKK{%xBeIDobar=lGXkBp97dG@XaH~s089Exkk^&Hy}h4C0QBve zXBMgF5PU3CX@Lf zt&poqTDg4wI~>V(!~cBN0HCJZvABS`m1|g0>={|PbY-9a1Q-B+gCH*D`+8mg0000< KMNUMnLSTY+ruJn3 literal 0 HcmV?d00001 diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini index 87cb8139f7..944bbf75bb 100644 --- a/Source/Android/assets/Dolphin.ini +++ b/Source/Android/assets/Dolphin.ini @@ -56,7 +56,7 @@ ShowStatusbar = True ShowLogWindow = False ShowLogConfigWindow = False ShowConsole = False -ThemeName = Boomy +ThemeName40 = Clean [Hotkeys] Open = 79 OpenModifier = 2 diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index a4298949f0..d93378f91f 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -189,7 +189,7 @@ void SConfig::SaveSettings() ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow); ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow); ini.Set("Interface", "ShowConsole", m_InterfaceConsole); - ini.Set("Interface", "ThemeName", m_LocalCoreStartupParameter.theme_name); + ini.Set("Interface", "ThemeName40", m_LocalCoreStartupParameter.theme_name); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++) @@ -342,7 +342,7 @@ void SConfig::LoadSettings() ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false); ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false); ini.Get("Interface", "ShowConsole", &m_InterfaceConsole, false); - ini.Get("Interface", "ThemeName", &m_LocalCoreStartupParameter.theme_name, "Boomy"); + ini.Get("Interface", "ThemeName40", &m_LocalCoreStartupParameter.theme_name, "Clean"); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++) From 323ecdb7728f1fa2d013d8ca2aa9b2bb04170de0 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 21 Sep 2013 16:06:29 +0000 Subject: [PATCH 245/267] Ship vcomp100.dll with Dolphin --- Externals/msvcrt/Win32/vcomp100.dll | Bin 0 -> 51024 bytes Externals/msvcrt/x64/vcomp100.dll | Bin 0 -> 57168 bytes Source/Core/DolphinWX/Dolphin.vcxproj | 8 +++++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Externals/msvcrt/Win32/vcomp100.dll create mode 100644 Externals/msvcrt/x64/vcomp100.dll diff --git a/Externals/msvcrt/Win32/vcomp100.dll b/Externals/msvcrt/Win32/vcomp100.dll new file mode 100644 index 0000000000000000000000000000000000000000..579e4381ff4e4a2e40abf00ce16624390ef604b9 GIT binary patch literal 51024 zcmeFae_UMEnLmDp8DJ77nTY|N7>pA`DhgVX88kR*!7xBffFT43CV)u*0TaOC-u$Tf zfxV$}Jx=Rq*LHPlTV30(yW3su*4Ee`3LynztR~S~@9X>hXGsqCo^zh_oacGYbDr~@ANNpr*CWix7&9RRgN*ILlYX+r?@RwWiR_tI z|7Iq8e%c@B?=h_S!J}Osw+yn!<3}Np{Wr1jBU39zn`HJ@sq_o;HLhDcTUuy*CPnj$Pqsd#_qnccAc~i zX{SgDo`{b>pKMThqp!`k0cnB<&@OO(KLQA^+4z5>uWn-t0RPU6gf0XU-p>#s zezF<6BO?00um3+vVE4mlD}w8gufu%igfzf zj`zr)KYbhh9zS7QL0#c`gc0<;k!hgg$xhz@0>MQ7tVM*v_3TCgebo%kK z9JY!TOnTqUHn0}9iM6stECc^!)`*g|Y$N_f{(Mn5DpSk~QC|%!Vr6)%5%sQQ9#D|W zN+a@1*-}vCL24OWfoEjdTvmzlIVisjP?0!2z_Ch{BKTUijWx4%;GhwlFm{jNpqAAk zhkn|agj^|@9`LUKHi|6+773+%0^3IB5br+7#)tP7;NAetK7rT4wy*|Z z+=!S1rF@{F5#{a?u@(U@BfS+RB*fMsFB;z_lx)MlbtqHE<_jamK!*?isK#3Wum4P@ zD-WfpZk-x}T!^-t4{Y;UD&804S&ML;z_O4zLwRHf8Cw&ACWxv~Es<%_7<7n<`Gk?m z-w;*X)Ud7y*h`f&>}>s_69n&8`QEI}yV1=f2VDyKvQboM1m)(&>wz7o9c{?pupH zeG}96PLXz#b28k|kv6f8QrG0PXQxQZxoI-o!#8*Oh_Aw&ahhxJULFyr{DWRS|L>OR z@Zoshozd~GmC^CMlIZy1(&%`7d8co4Ri`f-VHv_21d4A$2+R2&AE%!ezd^ck@Ujg# z^ki&Ee`bF-Tel#3>X-fv+m&%SXhOl2rMabd{@~iLJz`!}{Da3m4?OY1ifNR-c|*&l z)ov6PncOp~qC zSD_XTIFI=Y6H7|{g~v-uRZl3{uYSr=J5!LgiyGNeg=Q-YaS*Neh^JX@X zcUHY0F!g%gH!P_#TX)0MGwvAx*vz1OJeXt#=E3I-jQPDW_1vs<#nihG$e*O`Jv73H zxaUn{uRoW?cuRvx7C`b5_h)iaP#)l!R4{mia2y$IMR_3QZ>1fyzF@9bEioZHr+MLV zf8rMF3x;|%M(K`G_5yv6{MQP-;)=lxs@Y>#JzaiJm$%gKIp{4d1%9>aU`6l(<@B z1goXD^hl|G&pvN?P(H{rlZj}#KX?Q+?L)~oiGGR?{+Q&F=|FyIX=zgs&@T`E4dp=v zq^cES6jAF2h&GfN5CD`nj%R@IB&FyG1cu|`!nVnUMc!0}19O5&sX(HP#K|*J+d)tW z;g2F|N!5GOG)hUbiP-xTLlaWWU-x`X^%`C{>inZNr;f4xJ+IP_P^j{zv%#cv0P&$c zA3-<4x5cYnhH<4bD4ThIc@xvV^|xS9*_T*d6;aObu>jPpX&8?xz1nlZV6d{X$50?qJfb0Q3fvmJkWO)m3{O;xc9_}D%bT(*vkJ{>;i$iGbeGXzXy((@0#hVQPdx_`lvA$K@`{cw$>lt^hY}vl za0cDO(zSf2gIC)+f>NyZN+n~HXgJexOg`oe1~XmgX2B#zbPYJW-0w(ne5pyjA1W3! zWbH7^bNW0ZP*CQ6M>Z|)3dHiIi4U<(PcUG2_ers;XCz>K>UmU*H+SDIqq<|H{kGpD z&g9uZW(9cr5+*@?1(qj&hb-s0PR|A4mYM)@GjDT%;Edf}@>M*}xj$>ih!pDv+BkQt z4YXOm*Uh_8RRX`D!H;0hbHt#$(Al-bb3ryXrL6WBj+6xD5$#9iP~Rcsq4SH%0@Hy^ zj^%NnjThP;@`Tuh5rGL&3yPuUXg3CQE~vclxx7dX%giWt^ntH^Cie>^7RQwVBdR24c0o zbzn)h@zFCs4VIbt`+c6#3+N?UEz0$9&`FwG2osf*3&MMNofecoi0n9e|Kyp}Ln_eM zK-v+0n}nD*_*O@koQbaQMXYK18oagQEd-=zCmE0J(a@va1Dj*`fDRfsvZf~7jh`X~ zS4M)e5q%9*kfulUIqR>>%)@WbJ?t+EE;!VVuBY0hY03qIWO5!37@K15Qtq}e)obd_ zMpl7stmB4;DNDJ(&BWuBkr-)h1;35x48DaiE10wjuTOPB1Ncnke2jG4nMVpbx^{gW zd@Ic}s*Ke7PB{1HIJ<_dznBRgug+R(k*$9DY_I36L0g5nwYt;-1KVZ^Cangdn(9d9 zDB-=z{@{?c+q_IpZHig#FETx7P(}>$+(4XOv9i;`q_b%F-aIp`)LNhjAy96kPG#6- zQp~{~#liZrP1$JCKCp*cLxM4MbZxy}j^jBd)zIV4F}InFU8=#lh|l8v-Q6Zgp2CsEZR{x1*G^ew?j`8= zYBOhst55wB)kpJ-;nxg9q@BhZOl4Gakz2;A%vw2Sv*Q`18XpY?`2g(Nov{7NR+B-> zDd%l=9#_F%3wlk;h*7?bZ+5^$UdxTJf-j2p4F#q^ z+89`zd^Io502o-mw<{H3O9-sQVep#yvXof`mYV7?Tfpz=i%Z2Y16zCrJj0FXu@w{i z2Hl^ii71oN7kBHIDg)QLq||u~W9K|rs{&MFeYC68+hiz()ygx$EiKS3D6BZmF@rKJ z8JS!vQ3}{d(5tv-6n4QgD(r8TXLPesSUxg>fj`tljb|n0THB}4iy`M>_s8-KbPm-B z1sdFqO7va?bBNOJZt4B3vP9|1tTNlKcy+d74F>7}nC3A%4-d<>?10FLQ)jEzzzU#A z^H}tZ;VK)wjPje@AMcp%FECi2ea+Y%xE#LG4Bk(XSNyq#U?A4HU+E88pDnampY_;` zg=QmYNl@dXyWJ@p+$yc>d@$(TFUXSTb59C~M`p$_2u}=FhkH^fmWbG3EqVXhWDT5$ z@4&e1-YdPHRp^ikvI>)T&D$QERcPOG1u&>)D(gvw^;HT?!NGKtgRR3P1{?wxOvv0q zONm!=(6HLiKUTU8$`KYQ;#J9fhuwX2mwmg*eSXVj5x7*_;5Ll7LKrqsH@7gcv;rtj z+)XHe09cN&;dhib*zhrRhg}6K%&K4n&py7=TVA4>ssMPJAK(MLPc1vE$|H~S)9xd? zzP6nlv9_zZe0C*207PEkA^2**4;jz!w`W(K4J_sd5(>{s^Mmr)(v@EAzktl>8JUfV zO9(>g4JvO01Jj*d&cn)ULFE8u7G&K4{2Krh`~7GKq|7d}fUnYWNXcu`en@0d4&;R# zkvPdsvXxfw5q`8IC{OcyhWtB*R8O*I9-(&25l!z+%Iz;xaV+2d{a7&Yc1w5)owYT$+T0(Fk{*`C4uq@x}i+L{KNL^T6N1%$_r0d(*e z$X0e(7<}JC3x^BDRL>BU{K}3ll#-8&a#Sc0g)#;)=Vdz*JC5y&MQ-3FzBjEGdJ8(N z9mjT_0xf$*bodx)vjw`>aab}2X%;+6DQEcs=&mKJY>1cH;MeXjWUDc}%+9-^&S&xJ z8RCbm&mJ@$$+kY*oz`RQRj=S>iIg!~fD~Ssj3h&J?^I4@K;8L>^PKyFoZzoI=-+Wr zt#Sp7yvn8h_FORN?v?K21&O@GMBS8xDb;4lDZ6Gsvt`GYIJMBB$|+npf@O)+Lx^Cr zyVu%r9W>niinU__p3ZYw@~E|A7G8N-YF`YVO!b*~S-NUemz&ghwb-P_sCSwMx5fZ^ ze-65kwc}Ypp)za7&+q~|l3}hYx zJ@63hbNfqHYW<{Cg?2zFhuQE^>KK1g3+*bDurM7y1lk``zYqP}tXg?ts=CF5ey1AL z5+r4)S#V?E&Da&qpuEjidev8*A4)90n z6|x%Klc8n+Wbh%qNZ_>lm0h=@fA_ZCr0hs$yRO(Cr|ht^EmpD^4yN2~VuRIyC6U&RpGpN7Se^0}|T7#tjf8vc`R2xKw@y32%~NK>nX z1FA<;%T7sV#RLAzPJs_H5tuPxP85`p_ont1CM_t1ITYM9T5*w+RnJKfqn3T3eFQAf ze&`yM+aIWIiP%RV4pVAKvX(V+t~5l05ejApwF%nrbL7MJs6EMk2(GbQlGsD?MZ(kr%I4n6!pak^ZzoI|M$rELoVAAz?sx z;VBpv?$N0EjxvZP3*aFe3NY^FIbfNrd~;%Xd6NO%PUC=s%(SPkBKT-$KjZ=G zB=C{YRK3;CFIRI@ESz~OO8IMeO$@FiIu_{8(-pxjrr^!|La@ygbi$92Qj)cbc%7PT zzADAszJ0L^6xn%EvK*(2Lv%mBGXpNjWt6iyx!hZh0e_`-6-si{rp1H^9P<(3|CIZs zB^f-=?9NY>*1>hD#qh63D2u zM)TX!3N_EBm%{pm_C0{}&9*gA=2-0*7A!+96Y5oVr89r-l8l{Yyuj=(PL&IJfrVGt zvGS7UvuCxMWVf>`D?fRs%fBU~{q`6+Hmk@iC1fkTiSGR5?f+ff6C$=Z&JZk4M=jcq zP}>;EVtodV8}YY<=h?s?T;V(vPL~?T_!P;r^yG>BW`N&$r$3)xN0?uS_EUgElXQLq z`D6Twxl2h2$WeA>5Zg<3Zs7$sV!H)~*CCh7; z@8sDQcdxuum&dLCElWrqGqS2};HW6kT{tS_l1g&&q&1l@~J(T_$u!YB^-U=Ksy*gKB%bSWNLDgy zyQV#G06XGLEwek%o$JY#QnKX4T~;K*_$!6BpekDeE{u{PA1~40Y6u9JnK}&e)iN7d z5cr3}`y-Iys>Eg1-T#bQmq~?9lJ>-3A<~gbX!T97QWy(pGTMWAB~4y@G(+>)`{Ey_ zg`X|0)@S8JBhcp8@*Xw6LEW+uN*UyRgLIamsZ}cuBeU-Q2~s8_oDYP~!@PG`2GXtM zoFA49*>D>$YTMP~T3%5L5@>)vq!w>fD;fg-#CMn>6Zr;ze(>Hdi_+EV)wI80ossur z@{mI#7m*9s(1zJ_h4vuK9cm!0_nDf$3T*{{=cC) z2P-=cTX&y8yaIBATL3X*@nGUQMX6@N40-Scz%|fTu(l9|MH55 zAi-kzkZ)GHV(;y;d$p6NfCN2fUByLe#W3UrS=zslQruR6La|hvSNj>26dJTplm*Zf zMAKSK304V0S`xL$1T`_k%)&ABuU(R%n*?VUT+Ss%d3vzeA*Br-LREY@8DDG1AMn1! zV?nnnw7HjCFgzBg4nBv(tbB)DC7jh!vc`q5##p0w7n&tk`|U>Q>liDX`l3K;(UL8 zhP%uxB|c)}hyJRgfRb|bv_rC5{`qZ$@VZTezqXf@C#M3$zAXv>$ zAAFl+xy2z%AZb44xp3+|Ls?srcdmv#hvvFHX6aUv=*{iB$l0*LvP(1EuWV1;wb1Pu z+TsW#Aadm{%;|=Fvr$$E7n6msc=bt!(kq66|KRcn<`Qats#=jAD29kDl6T(a&tF0! zPL2?dwH@Dbt;Ma2-ZRhY#<&PYH@m4=KlMF3x+V9&m13Kt_|o?2jd_{ zU2ayF+bY81CwZ$&6G{994kMhp?3CG_WOcb+U79@J4)%z4fUfbqFpkD;*T2l;xYk0OK@CNMMEAbr`%)hqP8ZW3@TlunD<11=` zRQ;S`O-*#2idb;K43?kPDnEkR$!mZe_7@ImEr|K^HgcQ0Y*f027XbwZ-Sd1e))L+B zz49>{y=SHs!P~_YIgp4w8Z0!R7g~CAGg1ujOfZ+l9K`mVK`ie_a;lsX-5ZPar?vM7 zQBUD1Er=)2YsD@Frk=;73QRgTH}DY}#`67nwcPAJ-!{#Cw9V*8M_j@W`14xPHPc?_ zJ-li}tZ>eDdq(Bwc{!FxH}bcw&sL45^`JY?0!hWzXFoNLs97O0v4&CxG8ci&qC^$V zVW#GoL?+nrdt>iCY%ez+;)@e}rfSisH!0UJ7(8XYi5a{3BkkxPgkctcgjSVk!uCj~ zNV6cV{b5SWF+FF97JNuq>}UXL*ypH3!gB;H$1m;@!@jaN4s}!2rTi`vw1Z~pT~&E-^RoZu7&PcV01BS?_*IO*?sZ-a9aSPk8|3G z*xsUK-qeWhhY62zDxGX-Zb~{7^UnW*LVjBm$xX5GZ;Qsoe8;~c zC0#2)rvD|X1naI9Cd`8z>Z+6!Hz4IW_o|dcDUVlg);=rW zp5k!#$-m)i0sV&jpP1g*L#0-rRAO451G+i4C`GJC1g=E4!qALH%Wy$i_0ER5lUU6& zt4q|?&@8ZmiP0pXr_ccG;71{F{^^*=LpveO@P}yS0h8b|M+tnDRam67hIK47*9(znrE6;ijStwn26#_MxYkiUi2aUeg%{}Rzf zZG`r)TRWCxZ4)h-Z0*Rw8_i^SQHprvL14hP1f_1(T9y$rLKA*O;z%0-a>v}a6LM2h zq(y*FM?6tHp#ozI086MC4v|=lug`u%Uy=B#ZHx&l~&&8OY*kD@v^3C9Y^~KYUfSPYni<6(R$tGu4V4;60CJBj3S8lmi+xs3`ai|i5 zX#(%#2edWhM8e;%E>-g#{`{0C_<;kMLt^8X_eJZasF?-{Q9nj$)QnLYi(r_fIN*b; z#VPQP!*pSVCMA+C+I0|grAN_~s&w5Ax~`uEQ08tFDPgkHx?0mWH%H`CVo;#)#?U9eTY! zld{*cT-H!qZ?1cR0jC?_H(%{Ox^u2Szd_kL%CO5-;oupnG;4{1xnFl8L6c3~zcm*;uB-fW9*ey3UWJ zftlh~Sahry!ndo!%*$+jVy|id_r|hOwFJw{iN=FL97`%0G4=vr`~T%&7L(#yV8%*v zFSy3uNPa^EORZmqr4pEU3^8a#OiVDSMvf@@sHBw;e?4La($yFLB>2OYtyY#xV`92e zm(HBW`01rsTmW}yuvVZjVycX(Tn68}5=w-*o$7IEr5=>PDUY&I<*)77_!Zl~8OlAQ z47k;r5p6L5^!l+Bx)2c~c~B#>A%lK39?tdby+N$rVt^?&L+_P7dzPHO{a2W=CU}zN z#TY5zVqxFu3V%`Tz5DIP{@(X%r0|*nbk;|%uHS+D>^OPe~t>ESe%99;jsc7V$M)3zaz9ZBcd}aryQb5eYUI&Iit@$(9bUC#z z{&~^5a4JB1x^~|kG}`bX(59AUV6?&fzbu2q1}cR@WMHkj9E;Uj9zcNs6B^WkWoK&t zLTvJ*qmOEpOJV-%QpKSv6?3;TyY)NY0yF*}i^0#6`Z($+`vAW6E(=zv<&m~nTCjx? zg=`;(8X5`h2eZr0ma9ug)Y4Hc9vGqe$evwh0|4z~en8|MWZrVD|7#zDo-|ML+%gBi z2nKrrm_FinsYU6rW16=8LA~vSmY>49y7r%f2Rk`UFnXR0`K>rv3Hx@ohWC!|=ZoFDi(mvEo}Z}HXN=)Z58=gdwJRB@FZ1UuA=H>>ZpEOO zx?DaTiCvr|#StCs;fNzTt)=`baYW}0*uu~eoqc0RbV|ZUblymtctnTJ_bgU+VRk+r z!^W)eL7jg)84SW41h61L$9)JuI*VgFTSCWn;DYPB^~&vR=NCSyqZet44MO|TkD3yT&P-<;=upFIaeO5nToq%ry7g^+y=ejbgFYsF z5@=9?g^mZ|r;iQM7*k;5{pce5ITib&r&^-cjfL%xJbLJbg&XB}+AvSN!oMx(zsttE z#RRuo9^^ht+UY<7tT1+uwOuC6Zg7M$8efH$2+}c44a#xZ`l*8aM9kCSGiAGnB)OE= z*p(hLH-h4_rWEbLqv2)w1tC6LO{y0>v!qU6k=mN5dhMNF%+wqqR;l1+{4{8C>IZlv zIQ#*N`<3t^p2b~Qf9K2K(Aj(QlMU8icdeD}0~> z+8Vvn1a8p9(F5oZ&9$@wg4IWVnZ-}!(T0ik6B;1sLZHV@thcdn08$ zM5n@dwOvm1-=C=ciO$h1wejT^waB98nUy??iRW4P*3n>*SvD#47Dn)LJnz*KfM1vn zomB0afnX4PB!>A&P;kVP&esKV%n-N^6{E2?Ekyp{ zTSR_DeUX{3j%8*iT7Ml$kcQq)V) z04{Gz);>9c_7KkeWlFt0Wbt%!hrV`>M*obclWa&S=NaYtDq}Fo1zX@RvRAte^7Mw6 z6EID5zYz>RXc$ums27d!Ou5^Rvy(11pc zq6LQsc9{9in2BH)LL6S2c;HyM7RR`ztdI5!on1<=JsT$)<0isz7A(LL{^yY^C5)qp zCat8T{k9CWJ(H6Bo)KW$j{4r&G;(~#K{Uet9{s#iT5LaJ(5_>i(QR?ZW1oZ>IG*_o zeuwnyL@a@a+N{9do1M)3IVR;5I)-WE2Kl<6*Al7mq=W@n^ug994jUx9`@?pkCwRA6 zY%TI&>4f8E&SN<0-vaA2_@>YW_ZewrQ@VBxu}U|c;V($;ghQ{cHs66IB(=caXAma3 z#H3c5`wVnSSzRqo39IweYLi-RQLAlgUSg*{T4&pF!jN=ntXeusOr|tK6)~;A1c8== z95A$%m61(`O>b|Cd2&` z051suOC-Pv0F;~2D=&e`9C7mqpc z$%%oGs^}xFPE4~-%snSS1(8#6^e;L&QN$FVxD+v8BVy7o31U26Xg&c_P8g0)K?={Y z9L=!{f{s>=mRon90<(fJ>+W~OD@e2Meh#l8@_3F-D#MB5o%8%9$^O>h(U_y%VQIx4 z)qq9WYbwH2by?z3!&sK}A=>^r>KP4#P8RHagfw{)(r+4%Vs1t#KZ-_qf5RowUBgRk z%BKeSfjP-{9>p;j)13o_qaaWISm2?^9P9>8hVn#0p~VMI41}FE(SCI70&+VMk{g8f zU*keMJ}$K9qlH#Z{9WxYaX@G%B7_!q;wZ$nU)gIelK%^&orsj$Gr$oR+4R2L6!9%~ zAXceOF|lKa2JW32>o*B&*VI_=FTW(lIU$i){5g(0kHaxH---R6Wr@e9otP82Iw})V z4QCnx@17t*jUE5cRh_&!oMQRAgJiWj&dHZOgoPOlHLq*M=y`*G2lmL@gsb_PL3$rY zOMsCkv^2P{@h_e0)ka>|{m!pl%}b2f3&YExHF;sS^E1Q(Z2aXOqf9&y5)_L%a8Z>g^8w8QI@ zaXK~ntdL+LVKNi9!hak5-ldpW>(9OEO0U-X+N5@f=D_+_k}mud&wSUdFFX&ZJ`e==D4a5xymXD3lgRj%y-9imfQi4hK+ zq6Cy+oYU?^<0<=0ga58~jtaijqy!D}1gMk{)VBdu3fDb6g#n+x*ZF+u)r;`C6`D8B zr;YgB8lJb&Wai?0=GloYgD*McX z{}IjMM6lOFU{kR8H=V^}I513yASN|sG>eWe#Uc?K!QzRvXv$vg8k}_(P1~HLq9AJ@p1er)BgY8{UxQ zz!Sz$GS_3SBqs&p=qb%`?ytw%;P<)%uhuWh2$`c23(v8aKky#a`I4yfi1oV$g*0CugYQee6AK+Q5yT-o)16`rRV{()`_r!FV(siz8~wKy9Hp z3VktReIZ9I&*WIfg+(qlc|<@G9HDwF-S|tctS9Y^ zDUyc+CQ1RJ_45sbSHSZQ`5ShB&Xsr8^9*z$920-x96q4F6Neb(Qv}KlNcN1@tA@c3 zP~jBlNrR)&8w_Fte+pPq>1fz#hC$jk)P-E_JU1reg~Z0?pueC#YcYMuD&`6(ULgO4 z2+LX|mj|vUpvyu)vJq4Z0BQ{YNSV&AdOG_4y{G)*Xkg7)$1dR`kCDG>RTIm{? zpSdCPGdpB{jIci34BG?K1IsgRc&-W=o_Ml5m%*!q*-3Ej*R9UsF{49Y-HXR$Cf?j1dl}uufAhvDNZfY5iBAEiwMEEPLg|$0}ZEn zk%f*bmnT=~LV8(H|GM?NFALQqp9jL)6cSclNLVR+rwyYmY-5q5c!6O-iAm`;7t5dE zNcQ}=`Q@g;%Sb7UY|44VPP>1n!(SQ1DR??jt(n0nKKNUXwx=&^!8^fT3GuKrGqWCcObcj&v;%bU6rG#;;DOF$rnm z^lcx$10{0!%!DG7Tp36qu%t0CTFMDQ{WT0FITQ9y6gK?+2+ExXX9QJ?;ue*g^z#kj zRuGM$e_bE?S{d%WoC^2tgN3;J%QUOg_mUaEa9=`io0ZmzrI_GBrO)KP;5%JYtt@;7 z3o4At+z?D^$4bQ0^rf!&pgF0N7A8DHC=&ZLE!=4bAP=n&trECWd`LYH@qktNECyRc zpBd#??QSH%Zergwbik?oHu^-L$+@^X;#It1ZR#5OjPD}rQ+yap$0uv_C7ixkDgli6 zaDO*Q8MB7v+Q0Yc?v9i>_6c0i?v0;5!K2ft~ z3=_H=PG9MZPfyd@liza+i&GB+6}ZOvl2ZwuA<6d6rc=GKw0vbas{QG7AcvN)umFm1 z)~jcL#7Fc(^OPOfP)1Q&#Oml8U&eY2o>3s~MC>DYp14Y1_8RX>51dMb6ES|>2Hmys zC@@z1mgb?Q{*JR)WcD_^iKYx50c};@P?8pl{7Ul7?(}yI5s;pty$F1i>=eGv4a)B+ zlkH5QC0qfhcAP?rU;N$`rxy+_=Z@8PHeBDlvHGYti~17$zbB$JI+Z(Cz=rES1c3|3 z3e<)RToxkvWm=`xs)+8fa;cNcrB5nH3%1%qDu=_THPy~PuF-ydP4pEL5A3jzzTpVD+w1&Zo=w z;{J#d45V5L!J|>`s?V~^WxR^c0u(vB8nVGYYUP zQRKW3-X;U~3-G&vMu%Y1lc0*&T->$4$NGY2v|BSOCk>GkH%PFwTseP(Z2F}k5Wo1C zaz0HqLW)RN&S&_tmGfC!+|I)<;d-4p)))3GgBk84TdtR5mGiM%7TkMyIzWwwLcmDO z+Wa>Ec=s`B<}jYvu*Ij4)WjW!x1OWv>7u}C(H)znjqUVR__tX!_xqR}hj}UY-)GUD zM@ophrs-qAU{h=h(l-`gZCkKH`@b*2u3^K;y1N}R#bO6-p3!PYTjcz@1RE7A0I7e$ zGhyqj73Kw7XBHJ(tX|qci<(tOY@Nx|$G6SIv1**Dz+wPxn`uwt0M+=$S!jK!Lc3{< zyq`spXWgwYYm6<(l%ioPn;hEDeh+>IDsh7Knm(ggC2uo94VGH^mg-xX#&(dajQ|Ww z;>U2XoSX3tKhB)vgBH4$VR~o<0C#3c*f(r4@B{c#U#!I_-(aB?0C~E9wM82uBxZlB zMXMq*`?O;?l{kS3y2*n!p$%K^#&=Krh+YSXy`us$9r+zepT1E^7hCA~*ye61X(^vU z0}-9hdh56JCI*z*ZW>Vf)`0FVn2Uh*%p>~#v%oK%#xO#ADp5Nr)c+>!p_Dx68I9EX zh5@p2h2)@OhwG&>OQrSKX5%ZJ=3pk}Oh%v=NRBR$_PGTD7ouvgK6{B0<$4`^P{jI@ zY=QYTKV-1J)b;rAg-$~xT~X|YN_~q;{d%m_uRo_$i2rEn7F>e35dYByoS$1DfUzq= z!U>;S;5T}K%7+RqhaHhjN4ms1G2e{&tq(Vq*9hlmYX?NSdb728l|&FjmU?0;$8L%IOll zZJfFVmn2RHpE(Zh`~u+b;QUjF_k=G1{#*#W9*b=CZ+wm}C{e(lqYdRzz!%jAI-hy2 z$0$$3oD5r^#z3;p_7$SI#bB(AY=-C!!cbA17LVu7>bfuKNOo@p)qcec+B0 zcV~n(yxiR_pQ;XAt&{NxVKQQ&z*4CiKbMj#30e2!!#fDs!7+3njiJjC=m_A8pqmSH z`1Y?G-|a`?8>|jEbn;GPJ(nBlJN_?(5U0j0L-WUE{7Wj0$@do!lPI}ptmHPmT*T?|tJW*zXr#sLaF{DqugPBp+j~7Z%*|#)8jnnsHPR(gl^W3jgbE1AGn|NNL^L#zk42{5XfaUmNpYAIef-5fWKbV?-0(AnC-*2iY z$2SJ)+RIb`tU^)V;=TMcew5=g0CDWUSNwjD;vFGG#P`oc67j&LyW=DxN-otKzc>-IqKJ4E z`*&YP5>F8Pmym?`DuSGm`51Ur9LB+!gEIs8yrCN>KzP|GW^v>lyk8xdr#F-j_d6Ul z0;2Nh+(1W>f`u0!-{CHbLt>aa z5ZHTh#ST^b`yo*+#QSBcMSK0vs?F1@h5WxvwP?`)S+%eKRd9<2`ZCp`#lJwcxTH|J zvb5Y^W8(Lj-3P)a68UR5v-988Yx?p{v``XqJaDAm%+13`=k8bDy?|?r+qcpMm?mjP zu+>7BVFr_af<=Z1F9ow093ZVo>-BFv*c~+HD?3w}bd5hRJ#<&4Gy^B&H{;6yy3jH( zO}wtfYejIgJy@QI>t?ih|BeMOtc^wAvPl;alydqgM$70PF=i`uW+v{gz_tc1lrmc% z#jOOmYf6gc_d9S$!2Kzj0Y{Ot+RXB7y1=f@9xP4dZOPipKgT-FEA;j&ykQl$3)=;u zi+IJ7qH?=o^D1E7pH*Zdthn^0TXOKclq~a3y5?<3fmyPE|IPxerV#tM93?Oh=kYI| zpQ16)615^(!uy?vy9ZwqP%<4&laDK7%$pvZ~B-3@%{n!56HjajEHP zN-!%IvNs!>va4~k*lc)xI1d`5+V(5~{NNre?N;FAODdMe=$7hRK^Yc-BqES5tG0#V z?ar>yT~nh?bQ@W|Nv$#WS; z8CMPjjA~6PF4A*&z;EZmpb_Y?jB}Kg7B;J$7 zJGKQGt@(!x;w9krDbFCv@X3PTxl?;7&Y1&3hyIS_zM*+mqP1W&&kL2pkoWiSa3IN zz7qQb{w=QMJT5Y)7u%ly4S5JWMJPM*hRWy-fKon>cK0mUD8q5$h5wAYaCe0nhl+S! za$jCz-dwCUK8ke%Wv7WggzVL}fb766;s!un%&K(_8}53Qeo3{94$lzx`-tl?*a96kUkMtm-})3Q%b`-x6>-1OMOXzCX~;O9k}pCf zN(shR2*&1x$jnViB|MaaQDhHvfe(bJm@FXw*1utyQCcL16&nj}qpqf43WQHHNDz93bl1RAh=lYM`GandaSkNe zth@72#fz&zEAA6mg@&qk&ywe%sidTO4wZA4#K=}00av{xeC zr?RWRTG`joQnWR@dpjvnSQHmg^4yfweikiLJjHlpZRd}8I8zhtfT08bTaB)2yt=P_c z#IaE6WitEL7mUh?LyA>K+}K&}i3$7#DcItc%J97}F6^jBhIIKI?zeW#LM}Eks6aPt zSC{+&sjC4!BL%q*XiK6W^Xi6n(*G4H4(%K*T7q_*rZ^|#NGeV!{2%8zz|mkG>8|kJ zK^NpXK1qAvlmm@3ep;kFVvH1LJNz9VL-t;+23o0)j2$0fjQ4kZh~HkVKq#xdffx*( z8lfs*h04L$^y8tY!p>EP{uWDk5b^K!`~|23GyHx!Py*L{nxe%(U~6%5Vn3wl7d3es zo*_2BcamxqkXk&k+d&C*d_Sn&UJC^mf$ z{9&JnVI#8pyeS8}|4nhYw>tXJrZ2O;VDsmCW8`z<#6$d^g8~qvP~`3&_Qr4^A;XtNM-N;Rj~*=0j~*mXee{4X zMIw(oyea0ML4R9Ejycma_%}3zXk7YL0^KmB_0R1ZKDeNt?_0<)1$OuQrt|K~M{%pM zDW&HI`oj+$EHF5(5V$x=XoFHWBK}T9X~oM$A7=mdx9}r^__G}|I(npO!v~)>p~gU6 zx&8^>2apMuN1ZaRGd+oS=aBxPAw6+;0CC)e1(|LqIL}!p?kc0d>kgcc8)zfOFCkoK1K1=B6{YP`}%eMK_j z@Eo%2%cLY{m-U5%d~f%AwuHTh2G9K4?EUp;{*691j%*3KRd{bbpN{jIIAtS$qI?vi z?69$NTmg$49bT9jEVR|DluHM5fEY(uY)t-;G<13tBDyqMN@%*_u6lJA`t9%l4sp=d zkXiY3+U8hgZ$-eU?9I?KsZXOvD}y+KVyNerBNc~s5Je^K)4q=|We(3G#NSWaVWSJK z@ka)546Mn}G(8YYzA;_+qP0Vx;owHH^uVc9SjMM2pMpV}v73G;wbSpbw$ty-t@Qgg z3BT(fPI^*2W;`k$SG9^q>_+ie*dQJ^)Z+2PcVi#JgL~N14~wVi=|}LyIh?1Tpm@hg z`1*aZ^e6BPIM4nRWj_5dVtujg_zgF*t1ou9$PJkrwPOH9o}wmJJC5Tum~09eqguizCWy1i+`*(%0E3EYc!c`>tK}R9KcNe^ zk>HvlywlC{r*YX@Zi*StA>K0#{|5UNz4SC53gqLRE-_k#O&q`+8a#CD&_{;`686hy zhtKdKK+*07oS5McjfZ?QvEpUfV)oIsM&`}aiqeoV7gpJM3~y$A^A{1yHN zc0*84b@+ZkWuXRR68acH>V%_{N$rJ0T7l9{EXK9_B(w|2}y5f~JInTD%C_!?YuuBnBml+P|mHU4GHZ(74wd>eld z;@h~HeTeRXA3^`e)mGY@XaV|zO8C1f*}L-Tu+ac&m0xS$5oA&do!f~dVQq+nazVl^ z+6qC!+0Z&G2q$g>`)Mf2+R(P?q zZL&%&*4@Q;386ip%}3VY9HfltZTN-88*^GeW|+qAx%(5kD+j*`oMWl+;nZ5BhRZ}g zaZ(lT6FMv{EGLo%jdfTHI_w*P9MM4&(N9Eoo}z=|j2g-%j&)EQI%qsPsAaRE2wVC1 zHabFQ+s|jWCAFV-w8dHf{oorP^>AF(-~R5^Z)iPqz&fmT;}jD71mxtEs?9 z4_^4*i6tWN{}h|(J>vdTfWLPU{1xS;SWFT&Ye!-}aXCCN{5CF*A;%RPDa3SgLYJOr zAJ0ohURZ2)DnBMRTS#mJ5U3ppg-{O#4jmPC?HKGD>>%tK{$c~l*~i3|7!sQ;B(`EX zK4i>r3@$9edh1`iuw~PYtA{b1?c#ft_jYw_@zTxypQMmR*IRet8;@N%Hu~kDU-%Ma zS57wl^3t!n=~t^?Z3l3Hd=S>@W{6ZXN!EZ7-4D42|1w*Fd`@}KDkY+OWS>U{UTjG5OU70~w*EW^Fyj z>=(&~QA9!{@LcV8(er8UWQVcn0b0{=jtP?$MoYvD?hje)0<*JU8^Jzp8E>#-H9Od9 z3$`X|w}Vkkx~c>W*id6=(#U$sfX2+P3*MI;yw4uIFI7tl0b=RA3`d&zN6>!!wF+9< z3?34Hc#D68FEhF^;J%D$kI3DR{9y1y9AssvC0egOL8?L}8&k|HOK7H| z{fZ`28GqzQ+OA&C5!$>7ag_Exz*VHz!Li7-11+YhhIzptMyq0cI%^i z`QDJ1qodHvW0SDpR%1UtYQp8G))(%Ja~{T3lV&?sHRs~WD_kP)KJS}`RxuuRf99Kx zn}bu`M|@i3HQFJH1iq#V4XOA$Y5G|96a>b+$|X>FmlWjcTV<*KeXmN{6H4kze{jV ze`zfQj=5;WAgLD^6KceZ-a2JXtcf)YsBoaLY)i++t3o5sBz;;8UBNXMqtK^ku=5Lj zvT<+fO72ZrsU?C*3^&9UcoKD#J!K$m#`??e~Er^h2Af6e`(fmr6YP4UTW|Xc!9_cxd@?-;q0pA z!ew}1n~7+EV~me3S6Z@4%yO*gDm|qoziq|17)S`c0EvZeCdOUR_gczIysIm#D%YR~ z1P|&~Jh<>IY=bUL8V6A`!@V8iN%6~)JAEk#lpf9>h{(SmWPAsqofCxq(@b}iVZycj z;cyCL4+bG)=7nRZEfrBsl%T*e8^ZV zORch$Ten`mr&RJaHs6EPT;qzC4eK`MY!rWQzCe%V`ReM}3kD!t+S1(CvaznBvAMQo z3;u3+L|W+vKsDbX*VotimNnP6;ID_rR`?pFx^NjbE4HGswr**|I^U|6LV2Uqc*i!W zjxE%o@)|eRv6vXtv0`1Dmwmpv zW@%M}uWnuKvRcMok142I*D6S6cT)KfIHlsRoRd^a!%}&}RMy-eaMyaaZm4UO8e5t{ zh*XEVJJ?d7lmc}Ooa{eMr5o$&TG;_1A-#!TGp+J% zn-cv$8%yLm-!^ZZubwogc>@{}tU@$@AQ^@u-imiZEKV2Hi_ncW>R^8-6z*I zZ`j7Rj>E2M+*FrS+a$M1n;>U)oZ8gWyt&cW(o6~E>wJyt)Xr8KR9(}MRwVF%qZZk>0YEtd zS2)hta?i>l&kE<_8*4Xi#IUGj?D-tQ*>`xskDA#H$eh3948PH)9iEQem+=kpA~bKZEr5k$x58Hy~bt z_#f|K>`jpv=D^yn`=3i>?Nr2!jZ8 zH$*eievDv4xCNmRhuAW58T&rqS5^ZT%FjeR#sPW|x)5H*qTzXjV+dCiFm^M-YJ`dD zKg_{~=N-830XStm=K$9y9zA>toPUpSE#fcYxgFu35sv5K@0la)!@CQ46yC;rBc7>9 zkH>Qv;(PGC2k|HHT!H7G(YBu=SaHux3PKh_5yA$9tq6XEe?oWx;Z=lp5zZkb`~zbS zgiM6x25VR}tPtIERq%7-Lr>I1%y@)*!SZbRhgA!m|kb5RM}J1;O|@ z_(u3Tf(Ky@LMuWC!apKBi?9#jD8gS5jQ@z9jBo?Otq7F}62e0W|A6o;!Yc^xA^Z(t z_751l9w8TDJ%WPpU4)+^{1)L5!k-a_5iC!Dc7&S|mLt?4v>`l*@B@Tr5qc2bLI@xP z5fX7T!F34P2&)k45w;-s5q^m93xqC&!w4TDoJWZN5o`&_+x=mcbUW#mvcEER)^DZe~kZ z7Q2PH*{!&(;CA*6md$e59c(GfWgeEt@>u~}#_nXx*$P(3idZr8vJ#BrrEC=|W96)Z zt;QdFyNj)1YgrYmW;N_?wvMf58(1x?WA*GF%uO0G1-O@OWSdwsYhmR}iwnJrGBR$= zU9p1IY~IkaskLUE)Uv5@L(RI{+M32iQzb5*D$zAn;*u#6eN#dDCP6k&RXZh4s+|%i z;iSZgIBOd>Pv%G@PQ)n^C*l-|Q{kM%5kXGkh!W*V0@YKes$ZVOlny(Qf=%+q$y|xV ziC9JAM6N{QR5&MbMUa!YYVl33oYE%NO=%OWrnHGQw>3<`jYyn`Q6x@8DH12+oPx-< zhAF5NiIZ_oNvCg$)}-?CB;NJZsnE)k`IpyE7HAtKPU4>uCn2T8N&F*mQfm^U=dD;QF`Gd?SRdexuyhFctyXwcDE4k=bg*4CG?z5u(8qV5~?p9NejjQ2K-- zZPGf-YHI4>%7qC5qEPC@sw0x8M$^`~sdZ!BB$7krB66dP-y5#`o;s;U67$5GW_eRM zbtBE8CJAg4qzySvXq0ej-93%X;qsxh2p(H}wROI_+M4x|VBy3m;5N3jv_{GZWo0o7 zj8N@}v@zX^NOOg$iAWpMtnsvQwT?)e0!|(q$j0I1De9G{s8=4tM+%6!Y+F=|jU`5^ z5$0;tB%#)63p3LuX3o)a45g76Y4okF!=$ifTMd>g?u|-lM#gw5HGN3s1r)_Mt=l?Q zA)%r)DpjXr7E#dDiq(d;u|knlh6_dLR5)o1)Ly5D&>)8C6y-HG*R-zlt=qV&Y#tcXQG2lU=ouVejp2WGA$Uu2m0u9phtNb`(|9;L_Dfho+{=bkw4CX?Z zpQ8C`xq5X-4aRGZ#mq&lWwh_avlIEd@O%=_-{H9j&)?&Da8fxsE`quJ6zMqFp(`97 z<39#*CfPPg$@Fx`Mba}alAe8$bT6g<3Tpx56|;84cgKz=n174)iHPz`!01TKcz(vq zjQ!nsl--R#E&qgZJmCqW3z2fnMY{;hlbdZ~E&6T@ceDtGSrf z>Q9n4{h07CqFRymDH068EHNKuf6bT$=Ha;!Gs0zv)ngXO*bxDffq7^KW}x)E1HZ9` zfmy8q^UoH{7h5rxY-Za)%{s*D1nxp$+5o&Q3?m9~Nz5UjeSmI3`Z}aE;tfkdn0q>a zD_nOjFtmxXjes48Vwl-Z#Q7fr>(_xf4gVaFMJq}-1JaAwN+#o-Fz8gR$DDh-o^n9? zP*a!+h8cGT=H40NH}Sg|DOsVEMZmWn_((p)%X;v83!bH@X%T9wLpuH3g89Ee$WIdZ zo5AVE2+5R#)?z^))kgK@LY6B;*>7RqZ@_yUT7pWEbX!pmwGPeDvG~sZ1$9oA!^LEK zBcL5vDcFdAjtD$$B1Up18EnSyT2MkicL@56L$IV3L`k@9D5lHuQhZcneZv5`Q0wE5 zaiT4y2nk%Q9m~OG8=$E^lBL8J*5uG%u!4kK((N|T6sfWF%>#W%G1X5ZR$O$sI?!KzLJB@`un_dmNB^nCZ_*sB ziK1r0s&o8BOHHhE5z70ZAF^l}(su_!3w}3?v>L=308t0HT2SUddk{CWpwfX-^rq`{ z9dfCEQm>$XLz*!i72bmPX3;0>B5J8)TLDd&+e8WK%?<(S5Z1%Twg}p4kqRde|61`j zUf(#*btq4DQwps}Z56fN`lV}KkNP%X6)RjXaXVGbR0mlnlF3vx--z4>$fX&$ZV*IEZCC2pz4tq2=XBf$`sO(;beNplE_+L2mQuQ$3zg1ZMT zL-|ze*Q2;;LwVw5V~B@lyln$ET^bvJn{1I@E48*m$e%2n-U}kJw+Z|=M&TdVo~bZy z0UqMO0c?{sS=TS(`5pwH!0w8|9!*~)HeDh#*3}5PP>-nrCoPa8rrn59f1{p2{dv9M zQP&j8Cpq2pC2AtgBkAb9kR;Q{NCS1fAZtPzL$*Z*Md4NqQ$w{y>)1rTNN0(oNXy^= z_7=fGGuEStpBD5Zf{MgD?-E?-{hw&pOO9)3SO(WbmEJ7cTt=PLGNhSQl4@Rs5w#4~ zlV~7r^Du_3z?k3>lAQB7SjhU3{Uf@`t08&Z@Hu6|HIv@xbTtZTPwc-_=@8IkC11Di zdY_(b7s$#;_(!dJ59-kQrPz3FMCXzyJX2eti_7h+P#-OsiJCIrpCWreSR-`3r_q9X zhHe4FdBn|^`N>2Zhet_WieVY)7DM-mbZZjsX_0nh++LBLB+VwhYJ-lE$3nWLzY$%T zQBu~aCvSzkM<4hgi#1gpB;PH7^M%F*vXx=qS?`nNE08~}dp%TFw9bF=x)#FcnGbC9 zh5p`wK1m+A56{REXtFIIw_2oKWG9Fwk|o&*-9I3YoyG=|45gAEtlMY_{M8A#XzQTc z;?yX)h5O888pt~)8?5`CR0GvD6~;99zm4FmUQiLHFS0L993ROB>i92(cRBFt9#2>w z$-e2fM)!{NnM(~gCmD>}a$OGLej42$bPG3*kvOCgi##jhIMVKgX&m>xNE@=?3F|g4 zES)c-Pg9TH6Qw;~quy#?rWbx`SWNU+7_e8nD1A}JBD2flvbhpnc2}~?;Yx9(y3$=4 zE|+VG>sD8`E7w)vTH*4#R=HNY*1GO?)w&v78(pm~$+gwB-PP{e?do(r?0UrYsOvG; z6Rsy+KXED)8u2)?LU2nPuT*qA}T_3nK*D2SK>#S?UHHwW= zQ>Ho7l4;9K%(Q1FXF4)dGE+0tGcz(>nM*Qn&CJfs%`C`Vk?GA`mAN`|ZRXvXwV4f> z8#7xorOd6F|4%#D85KpgtviuKG6<3+3rINCv8ubPn;?oP85u|k~*R&f?!U7fTEzlt!8v&=FVOBt@YlU``%j9{iD}8)ph!?&$qw* z?cKYHpvBPQY00z{+FRN?nhkv&J)K@fe@q{yLkxF@KO>HDl+nZxf)~RpU^jRx91a)4 zZ{bl`3QO`L2ID(P%sn?B}3`Z9;ghu z2Hk_Oe@zSb!|M=lM35=RT+S?KHZupA0xTA*h1JIrWQ(#dvZc^k^ak3?PyVr#$pCwK z1EioJax=}6A&tyO*oXsi2YHQnGox80_1- zqeaqA(VA#?Xpd>abSb(5olaj%525GKkJ3x&mGoMA3;hj!c&5U9mVxDJqGqqXgSeIDs ztVgUd))$sETOK>7fPINbv0~JG;phl<@ z8h}P25?Pt7L8g#bkR8aL!^pu_jqcY;|@XyOe#7J;D}1MNvz14Z0pJK+m9+=mT^B zv!Ff4le3A_%<1OzbGTdw?ka8rcZiFHTii*^gbM)~3<7b?Izcl?r;*Lb>EylS`4lzE zGKvFbHKiVFHXox*QjDoTV0;luEvN3M71OTM`sf!JoeX8z3qA;Qk!0j7(u|lh-I%q^ zPs~ZCG3y|!nbpC1!(y?`*vafRb~pPe`xSeVEr?2>a;Pf06fH)_QDu%EhsHrU794xd z4i1k~$8F-aa&L3HxV_wG+_&6O?gSSXgTtZ(Rx<#?Kmy2v1z;hd05&iMOMyLb!8|4a zgn~q{3uJ)3;1s9;YoVVZh-^bHB1cf-DS4Diia7N#{RLf)q0TVC@Hq)fAclx3vJ`1W zASTK@$LwHsF{hZyEHxIJWx~Qf?C;0l7Wmr&e_P=Hum$YovCR<(IKY$V3X13_S|)xJ z!wV4#dGY|8G9cjbkSGul6j&rqBq$2tz(&D2iv;l`JdZ)ZlL}qHDnOYvBLTFDcwC`c zk!p-G*6PN8+G1j#{}lp1x#SCe4*v<%XRS$+W%P`v4oVr;Q8I?*(iHmNCH^p!U&xb& z0FUGjc*GTjL;{{bm}68T_0Vp5ZGKDLx4Tua9r;6xfSw?6B}r69!yIcx3H14KW3Za8 zhn^aQAPhBYACEx4AV2S5HFLi}eG>C=iT&j3f}}PYTHhIe2+)_4D=owy`-f|6*gBK>gQ^DSqFWxu2((nxoH; zzSyd2cIKvlht~jNznvoO-CFYUPRfD^Nm~U}px7C82wsK>QD^`XPe)r{6St*Dl(o?JV-kW8JCr?i;v^;ul3qC3D zbM;w|Xx{kR!r1tPw6c+^tV12}QM&~Bg-JF&U<`-8ZyHBqFC`9aL5>+w$103U=R|JE z*yf$LFGwu0bfj@q?Sidzsz-~#eX_;;!5XVfOQ53~DeyQNCf}2)}1m8s5;ku+pjsy&z_(QQ1Aoe4W!OW?mO_~el2nu7E z77!335}W0VYtNdka~y#N*dgg9v)Nw!s`Jrw7^rgZp0qfM^;VxvQgJ>CIP{$&Xg z33H>wS+0XY1CI+YIUQxCGtz$1Cb($T!eIT7^2EuK6M6a*p@E}8C)0b8G<4sli}2Rl z$)%c;k6zvN5y?odo$ANcP)9#Tj7v%z3B1wE-fgy7H=q(u?-LTc?z*w9HpX-M}Cmh~1>Qb8M|g zdYMZNa?d?wWxOKg18ZL)Z*Gy>u5yFQgGX9Q9;lta4CW`O$%^S;ba-#tw+=kX)b&ZK z_kTQktfW20EHG3Y^g4nqK6~+;p0S?BiBx_qchi?Q${1*iEZ@H%y?EGvIc-(Pw!A@J8X5FPbD(IQj zCh%xb22baCwlvQ1zA{go-L6to`_U|Q@0~BO;?oP`Pu~8ro_M+Nm%Aa>YnPlDSoiMs zW1lsOL9fe|Q%P-liwiwh8>{Yf^}SZ2fbhH;k6kPYNuK{YX|JqKd9+UG;X5!A|D;@} zQ(=73tJ~M-xj3nh>`hHd)SG(0%;5R1Pb6++TU&N!qF4a&@y)5ZX0+*hRotF5i#d^F z_m-bp^DZ<{B}_ANC#_N0^{gFn`O>XI$5tlq6O1_;d&yyU)lE5Pg41RKhKdB=>oG?bikXR1Dw-q(FfZoM-F`9O?H7TV7EX+?DPZ}H9r1V)8!!R< zZ43yB245Ep3k&mw8E5li7rp7xi>VSpZ1O zJ|8y`_;jj`@q+2U&t6TuI-uhE`_897z0~y&>Ky2A2p=4Frn}-y` zZ4lgI6sR<;{$Q(?WlXG`NyLHHVA#qQW1oDCeG-0UAIVLkIkt5;?GmYOiv_E8{8;n{ zll}FvXGZJLG4i1U2rC3K_|$`7!~cNR;s4MJYoNt`N%vpWIu9AXpG%v~tO698+bubc zbrU7B)du7mXW1aFq6Iz;gF|h|sD0ExtSY z-g46S76gd9>Dwx7a3>esj$v38@yu3qDKNxQS-=M+=73~KL}`P3qLFG2i0FEohW zv}Z?AtGnP^fwDwO<)^GQ@uu;s60&^D78qEz`sJDTZF(84leYO+zTx3@F=p2KGsY4A z|Dkpy1x3E59CCQRgu%^{JAN;1xO*>9OO_|5U(9=bl4WY%bQ8?~?FLx_X|C!V?2E?` zEDJHmnf_i0{gaHErJS*dKSNMi)>2SIgk6nP+QIcgc<~f}i`1bYr&_LvfZ=qNy<>v% z0FqI8$XT>E*Q2RnJVC9MRenJ9}Sx zGg9AcWaqV(g*n+X?*=YDt2u@dR535|Wp4d5RW(xK@?(Z4cKlw1})@Si_ znb*Y(UFpy%YrB%rz52VC_MLF{Aw0{9vQFrZ4j2l-b=R10`RsQx;N7BI5t;2-^7#j^ zR*!#->RI1!2vqZQ3`4okmt?1%?%K)dY8@KwSaape#=a5H^!+cdNRJ=76#wP!u66;m z79VQ2koYOSa$aJp`z2RB19r!e$$c&~72A1raF^Q&M*5qf#~C(4Pa6-C>l$*c9m3(kG$V;6AWE@91AQF&PH*oZjJ^sX%XnQ0!kbFjBFuE*AZ z#(H6DiZ8~^6&<;|OsU;0HN0%pFx6GB|59pnhFoZc`)ApO#eUKrX1c4GKe2Y1JgvOi zn)!qB66ek7Et%HN0=OHWfQg08qxs3TA0*%PC_d6vt*{>n>(hBsBN8k9P?dSp0^*Uj zV~iDom90Q*(tj{zBg~nVNPaJ$6~-RsN2jl4HW4B;cUJL?gjJ@#7uQ4~aWMO;9L5^I z-AID4R6mHJB-OiCBw{ovP0uv9Vxw)DvNTvcYl*p-YNHk^#wcJtD*QeIevikuu2oO| zcl!si%;Bqo|6MvT8(LTiiNwR>R#g_HdwhO1E>mh0prqeR7<=mPuhVfZ?s-Vw&;^T3 z<%Ec!BE6}YRKeb(jZ2iLMx0y}PB->lKD}#$yRhRTslL;8W3Gm;8Tatn-m3}rP0#$~ z>f4qrCTHefthfV#>-7hMcNDABj^(~#?>Ce+t-RRo@UF-4>HV8-Q{BV$M=LDor&@BX z6iqHbP9NOX3`^X85igw3&=xT|@5FFllxF@h`9m!qAB7v;cFZt6NNhHikn3@EZ%lAd zspjbHzj*)Cisu>lVU4Z6z;-ZwNuscUiR6M3|LpL`k&zjYlX;tIUEIPO6LXToBn+SC zX^8$D9`lQRt1v|s9j-8Pzn7OQiXP+<762YW>H8T7LOjA;Y)beq2iqS5AO^PYVOi*F zt+vn=D16^65fc4vAcV(&_8XK0Ac>iB0+|f>^-GBA@=riZ4w0+2z5e3JUX1ZM|nQCXUrdT1lx+ zy=;;1TalmET&{WeYTBmhtTy<7`0{>nvkDi%7uA7N4t7lqV-h8WLw@6Xrw4DgDr!m} zPHdXfbtKL=ZfzZJi*0ky*iu=iWv++u4R%YNy7ZJX&C18t@QPaYY!i6VTB>iE@7DR? zmr9%Q4=te${qw6o7B8H8H$%MSqk9YKz^bh=+CNUcJAZdLcsMw|-9Pav@ztxSI}WRn z^qWnz3k~yXB93%6or(PM##r}pXWi(5!RNKEF$`*S&lGX^jOpEHF>bf6iE?uda#B3x U8-mXDDc*oL0fL~Q5OR@7NMh2>MG(PG zMv85Z%&6a|Gmal;K4-?6;~8{D1=P_FU?5xsf({@vikF$`*rE}X1aI}fYghFpoq*0c z=l`GQf1VTAy{mSuz1H4qt$ka2)vlu3w+co<5KIWFDhN9f)1QO?UjC;8kNb^$xu5Vt z^5Ls?8a#)uDp_9DV6UsMy{o=-rM;}Qrl!_wUshqS_tn^|YV6M0^Xw~Y%PYpGr>A7< zs7FkkV!VCcyy8fZ-n>{`jC<+L!^KMw&&v+-`1W~oi-+>`Z;BW2cz^LC9=Gc8n>?Od zRkoaPU8>~8E z$6C69Gw=7W81Te_8=ff|MKAPZ%EK>T5QK-)1>x0a1z|EJb_l|L5%C$Ivmo9t2*p<- z77W5s{O0^h5Qfq15B=LF2pK5vrT)fyE7o}Nu+5JjDiGD3lpyZUE(lA<*O!-iOHtOV z@L(IlD1^-jaeoe|%Xke;DDQ&@RA8e0dxW?@had#U*J*&fj%VeM5a2 z5;;%68(zkj;-LV<;VP>H8rp@Rcr&x; zk=>OWl-QfD+*X+#l@*_$+WyzWg5YFlnu5MTavNF+B-$|x2m~8nSEV(Zo9AkL84 zLDhBxPbdP(Y+SX^hBnG7!yx;clPZ-Y*}t1V zIxDjys_m1XP|hRmeF;OLiMmHr2sHyYGUNaPJ1#3u;)BbA+G>^eSt!k}+J24f>?8=; zzQEwzask;bVWaetLACuGkqFGUyV+q>z#%@iPqjUUG=G;td^E_Ju?&jc z81&vGv-uWJpvdZEdk7lDK;s@>#Q6d}aIw9y2Mh6_-G!_k=0btInR)b+qZJWZW&fLM zZriT*Z%HU`sJ>sS$H#^gh!}0iv3-Ed;>Yh*nE<8ZmVj07o2f5 zUht+sT`a2YpAXTk%5MeLb`rOEkSFIJ4t>)=!mN;`CDNVJ9n#_@cP_eP&mrwk24lD! ztP5oSCpl2yU0;CLGW$xk9RiMBA7dnz*~!pp3^^Xw0@ccG^|1Z>oS9kt5%DxM_Z!Nx zm|CVcQ>`Q5+c_MYhia9lIP@XbsUQMyks8hkT&9i@M7e^EJEC zXR5XZAg-4Y3HsHcL%G37$qyYud$w?F>{Q5+D+o=eH;j-2y#1GC=J~&N$l|PHC}^Go zh*^pvn@}?Qq9_6n+5?J&UZGn@gC6GnXm8`X-^spmvd_^rUYD79Z8M786!cEcJuN>t zdmmxQ`dd;D4Dlu=d{ecm~_T;vqeyZ(p+{x@cxk>f4vGiH55X2y) z0T1sZynWe1lYgm6;9PKSX?HbU@MW-5O3@DLLCmg+XTw8f=CC`rWQ7Mbo%W?N^A|zX zIVjFPsob$+o3ThXVP@<)U%tWSaYCoczv76%(r*V|aPb6EUUzO@xewRxDR&%n zD);>p{ZuDzKSO_1Or4~H+km+Om&zR~zuV`cJ_7NQwuP1f9+#hmZd-zu0dQX9u^XrC#n2)6GN|eUNgkGvaRNXg24!_#cmN^# zQ3VpfD6{OpD^HL&?WLiox8`$*w;yUcOW9X4JJrmxHs4kzUX{pFdNf{foB{<{$M zf-d4IIwDV|gQd&6P{9)Pc>(&tL%GG7S&T}qLnS?|FoVsrL$j=*0#Ik^g8`1>Vnl*= zgFu^Vn@ikap3H@s;`z(zc5!AM^n7Wg1s*zt(q)Bc-WEF?204mUF$ZQcs@2`&A~H zpdJ3MByW{!dlgwdai| zx2WyNEo6U|+s5ALydW8a;n9FX8;pZ;Dnhsn0Q<5vkj{5=+dA(tN%;fs>*ov<8(iY{ zfl^>tQg|RbX3@!xQi9XiCIuEJVN@ba;`YCY+uwB>PZ-~e&{i_S{rE!#O%i2Mpz~ao z)zn74G?cC9Lz!J#tn*4AE2}eOf+gi*>G!{g-hs9AW^&Gd5i`X@oHe;k-B`1Ov!1Y@qzbuM zyTrQKId)2JI*X}kV0nfour!0E=e_`5zD})!GxAehsJ4&&U;$~@d&CQ9my_LQauvKM zHol1jC$qYm&bq`|pB21|)&XhOxtiLVZUmU549isR5R{B|3m)7zv`M`m zBOHL+zr@q*^H8yt&Q8g=FWkRL-SBtZ?#b2?I^WA}lRCe2vLHG@qsxflMPflGJ0f+S zhq4{UES~T<3)=2WQkxa@WsRBWFrX8y68NZK65cEYW*Bg@+qg$@p$dAD#OSfeCC^$+g9-IeU|L=R3Z$^yda(LNr5!<{#sTggVUr6Md>Md0ZA3N?=$X^ z6jNq6Q!7a(5u}Ojh?aOX0!i$1iG`f(11D<_)sCh9x7aST zHCdQ{N^FM7!xmVJFv3p909fZ_hq180@R=pCx6#kqLyw^sm)UG9?}=J{BKk{@`1}&9 z_-J!ut8YLNCOPSDW_+1+%Z-lSDzieMrkbO@FNIoJTMBawvN98?#1!)UfY?0uI08kWv7JEz(< zL1>ueyRoKa3$x_1Jeevs5UP$PtfbDhW5oxxnwdirjzO%Ci>1+Yke#5VW#~vc77WDR zaKXm)Bl84SXy>=Sr0iy;4~DHA!F#2X&BP?OnUJs(PMUp({x|Z;>~Lu0HJEE+WzH88 z)sevq{qRE8%%u_Oi7}_S#8{=(=hN+aeV)Jn`|EQxisGR9Tp_bQMUe{e#d7G0evum8 zj2g)(Wnq?9C8M0(Eb~e^P$|r0vb0J$*a^O*2;GUSRH+$P|IkWB=aP1oJ`OcN2k5KP_t5W;X~$*hj{|+xcJ4j`>x$O; z4z88#pv(s9wH}H2V@?rRGgU6@i;1)Y^F&7$lQSiQ=cp+>PG+za9MoAb0>BOewrRi{ zQwSK?bKHQo^e7PKN_t=A&E)H2yUfhUPKcj zh>o)fV|)t6_#BM!IbjP;0?^T5P2+mD+h~6giK^|Jb*Ko9_8;SxWbe#hi+SWZ6>6#pu6+Dhn*-Ax4%vH zJ1T+)(<`H_qC65Y;vrzcGu;)jV55 z7Z+>Kd|igV)FH@vh0u41KcSlNY8|tPO;|*sLe685frM$s{%koj-*epLtIrMQ7v^kO zAqUpUfx09|-c7zf&iv^XZ@L9SHu5_BUg2@HY|tyABZk?(S_CZJAv5-$^VtfH_FLu zNxvl}ye{=WFd%=}A*H?}z8vn0^^SLh|DZiQ*vX#dv+)bN?cOvb-`^L{Eto;G7x>Kl z!XAe=6KiTKl9QdR)5-oR`H!gKT&zj3jL8mmUT_974Sd}#Mqyy=`DeHv7C8jctbugC zE2#&>#$(_&E_TrZ$GbT6@TVmC5bv-59ZA>*z=%=jRH`#`Tj9{&T%+8v-h+$ku ze_@Z^S0D${+z0`xU+DR>T8p^TNgE20N>LrD?~j$>Ma*EsH^L(0&Xk+qPYSKo^IiQt z`M%|oM2wRAJORvl-E2{wo2@|HAiLRzQHx_-Km3Drsfb-HO4Oy7o(B8Nu6zCW@w$Wo zRo5j?ye=VG(77gK{S}GoVf!it7`Hx(L9q zh_RD^nsp#q*Qn1(Ch7t2@?Fmm&!>D6)2LP?=o;lA;TP!|Maw4a$I#xx&8b|aUZ>7q z`45ts@=IEhk_LE`UvHyJC{~g2AGmuQcj0??QDW%raD<56BDLKunnyNz$kN`T4})i>BObbTXLBb~#z zopyK|l0y=e31j0DeeX!Cazx+a%G9MRT-sqQ-GorGp6{CP%ePphQvPs->%LaE^Nx#* zIi9i)VDWNo3C#?6%abu7P;KehX3AA17zrJDlh6B7orXn|yw|p;U^Hiim?)gbi25xG z>uNmf>sL^HKFw!QR!nZENnZZCNxoZY9r4!d*PfH!|$ zj`)*JAS4H7%I<=JC9z&@awawCT0aIk-5{6cHSu+L*#|X(k zd5hpPP7Lmm{Fz&zl4%Z!Ik&7=pu>$@Hi8F|B0Oh^_4zz+YZ2`^o7^6@Tk^m90D);p zJQ#GYDrAGUNQzZbAL37Zqojhl>wTicrrIUNIJL#uKhF?`fvu5tK7ijC9_`X^T#8XL z&RtWe00Wz`MhXnFNXnxeF0K&Wb&XHZto|vbPhqdtU8XPeJnYo{a075=V*269G)dTr z2#eA#2T|Nfjy%{VV7IM@ZFWsAb~M?s@Hkh&(FPb)+r$ZS^9Oc0bvN7J+-%C-F9oKm zqxVb31KwoTe15Bp3G+pXJ+cv~3XXeGk-{}FVzb>HlK4EMRNwCk4to1Y*)uc4DX8vn ztd3!4QpD#B$`#?Hi9u>nc3S6T(K?6B9@dE2BeGXhotZ)AYU|?4~KVYz8d6dTMmHxT|RA13+rB}(xPK3uf3y%K_Rr1rs2gWl88JC0JRhY(fHmqm+ z`P>Do$9ZcCQX2X>3zFmjfMl_7H?z3delkC2w|2NtdqN;K-3ueVixp<-Ou}<9bj%6XHK|$kgrB67mu*Eq{XHP$6J~S=DA2gV1ZuZ2M$C5i^`Ul0OeFEs|4F9XG zq(GYH&G0|1-Jxub0WwR&`Zr}JYdk=MpZoGU?DoI9o4_%dKg#YzSkpbh>SBmbTliq=v60^|#GtrUONa(QW)0mCmi`*w_|+3yq$s z3_1|i=H7Mrv0wbFx-7FNsDS@jeRi`)_$&bmjY*%Mii*A<363otZpf9M`Tnm=YVFRR znWL$-Y;eQUD3e~x->cYEPxOs3y+(`O{`21S+5)}S+UtLhUZXnOs5($=7-V5VfiVYL z)q=Z>5yxQU==>b>XMF|*HGhQH9;z;SG*!fVcP*kQlh zRfAHWmdietVeo_f54TDcMhF9XyJ9%aD3Tpl3uWatt0HCMa;a01GMtKgm;%eeg`m}Y zx3FK@#ft+~C=#`g`IMig?foPzp=7gokv9LOvWRsw2ZpZHLo^qKtZp#M{(PckjHCY9j&<{ z@|rI`6RmmiWoj<7S$1WiEGx2u*ZtSaF_UL^f@Gxb#hc;2v(SpVXT{ZBj?~=|nmF(K z>W=*_x3b9MR#sTuN<&6ue(TWpwVbe2a@8#Riga1u)p99iN7)H%VPbB@H$GavRaHEr zCX1c$!0;hpU1z69848VYl8x|iQ`?3co$!mn_B4DT*1OmnU?BDm-$M9nVZdZ{DoOjM zeuD{^piIRs?CvxdEQacvz7OG}hCbXkj<#@zq3>Hc!V@t0$^9+6S%L-6?GL8W_;?-) zu?QpIO@?qu!Dsi)lwf&u1?FH>fU(ZGQXoRut0bBj3l4b#PXBtzcsTo8Z0<}AnEFfD zgxu%gC6E+{iO@>MgKp^5`z_8PH^CK=wr|Fv&2G2`R%cJ3aJ}ST^NrxegmorHWXvj@ z$;Fh-jVZK@3HTY(xaFj7b-HDHDb&uN;m%H1?rAXLO(%nR&cOP66FcT) zfAIwPaGd=%9GnXN=2EQUlR-({qp@NyxY7Ye4R9Kd;j+tF@ZS0ptQpo;r4X|w+IVd? zws0;fh3mc7V-Em`v%o4j@CXgk{(HeJOlGm~l{A%jMN%eSxgos|;(4_mwpnc}Kw}v9 z+KY|Hz3D7>kp;_SuwWaA$?R3Gj!;1C$3g=m`?Tw@$SUGoL;B8;z&-aGGoL{onuvb{ z?fvF%@fGdb!{*Z1R}Q%7I7saLIxW%mV&V0(g?) z&fW)YzOZ4wbMyMa)5Eh0zP!)n3CvYJ>>X&bdjMu4dqDF&qDw0_xHKS~a2x-U{V6*< z10r%O{i!q{Y2geu9(QLS@%`Pkd40xoNC-Q2*JB%K!?l`lXh@R%_jYNj3>GH2As(6&c-0VE7hv|6DBE(CH?P_LO0}w%Og;;bw=xh9e$!&ci}r zUjcTBs5g3K84)W8*~@^rAQe9y>_E^V4mCfhFh6>22302F`hz)gS!qNykcog z#e9xWOWfMFLbGgqgL4nbRQzsCBqEn#BI)>LFAFey%eYg(cad#gsas>MkSP3_-tFc=LM{G~Tl}r2xVuveNI9;{<0vS0J zZ42n0T@OzzTp%^TR~p%+mMIp(>+?uP5z0_@bZ`R)wNu!rtENqP+h4tlQv z?IobC+yle7fhJS|^GGf+gS=0&q6T<046csw378HHL0@`@EIvOQE*-lY+k9{W6HbNO2+Uid)qNo7Jv4=iIurNGi}Xrh=Wa~&mI(GsKqlhwt9gFGoM2~FCjYkv zu@Rp5;9Fgm%%<_W)&*udLOCZ?^m}~se*(BOp`3aPqol0Blw}cSx@NJGr(ljHZC;ck zDTP^*vS=J0=7o(O2Jd1GS%30{xl{9n@tXc*2>0p_Gabaiwdpwq@g?k6&dv&(cN%!H zV)Ms@$s_HN!@rcJ-}@7)qT^0f0;0uoQ1?`@K-eLd8Od=jr?e-M=od~Jn#a;7ay(sk z5HtAfcxe>Xt+f5mC!c69n03y~Pzvq-by-kew4V*S8Ln_#)C_k!mBzm=kMFC^%p><6 z?2}U>I}&={1jA|hNM5kKB~eMn@2Ro$rvp^0yLo9&%KkN0WL=Zx8!QKAXN69Gtzz$H zi5+`(P~e%E!!5!@ywHj&lP~6)E_J4b&9ro$l83g*qmRPeWreF7I~ckVq{&mSXQ!j_ zay+P#_eVDTP#1I6B%Z>{K(=#vz^~FfNb(m5UQ=!`oMMnH5kYn1F_+5+4^a)C0UE*q z*Kmj3zs6+PU{v9k9}lj}@sAvSjYc*%NN!U`30@R2P%t~{cfS|ffp$3tzV}yQa7JGW z(d1~p_svn?dqFWzhkAEwF%i9)3VKvmxJ4NCLc*Txurr6LmrAkp?|zELXAUvYZ53xX z>-}A%J%54p+|z^){pX(+X_Zc5841nx5HtSxN1`~y^5gPtFI?hd>7QX&#P z&#BPsSdfAV$xWxl$IO)|U-ycNFPY~cF-k0&@4@(d*Y}ohNY8vS8w?dvZBLZfI8WG_vi8!nU$9-aOY@Nm_(>o!aY%+qlf0SKNG?=(L^<8iE^p*-hAt2q;35#^!& zp+&+Q10=r)~LOJWHRn^k|9L@>hJ0@Ru6!#h%C|590i{QPAm)V&NHtiLRSe(>T2x_9*1 zs1UrgFtU-(u=M^Y9$p)Q9`F)gejL_)OYQ7)mVWX6x(l;!X%aPcvDrG!3?wu-S$loNX7NOUT59fsmZ(S2bm<5WtA zX=bA17-?{4iPd(k9ZzUN6G50xw!WgvPH1GSTxN`TraCrPTOinjq4O{~gwvf{us}P( z-V6!pRE_vuBP=iB#zVVCQQgtr^@{qh$MfdZAA>jIjwo}QIdkf7jWK6?59a(bfjKo% z<^(*+IUyhVB7LGq+@b!Z8+YF3+VS7Yol2#eOi~9!Z(~^-?&lPD=jYG$wQ2)*Pqf~F= z40-`m7pM=d?@4`b!*b#K)aSDNS>K3hXpBEJEl_Q_-1Mlmtv~kQ&$i3(=P>6_?xAk{ znS@TWJAa^3|IPe?xxAS(=n*Wx!|B`rLJWGEFKWK0ef4I`LWiA0ozEg{`-@}iLSh!y zuUZGBDN#ReqtuubQ6h;g*VY6YkCvkUal(|3IYw>7n5wIg^b;#&tkC#(vZTc`|=^7j$0i@70v3_9F2}%=(L_L?!6<6O>5If@eOxNke@zDZ7Tf|k0H9>Jv5aLVPb6&h{K-hF%TsQ!?1M~qxr*o@LXO>RKfjLN0 zWsFctB@xK;-59p;t0eC@#64-97yp4t4Txdl17hbu47U+tnACB??${1Wxl24QhQ+Z3uMlZNqWn0IPH^M)~=z|?WhfUKUEM5`c<-;HWpfHHj| zngOh~ChQxL0ez|+iS%6D0?#MxAU%!Wa4s;|dtfm8jAGV-NM>~S(ab;KugQn; z8_aChm?`XulnMB*h{JaqY>!$I(BcWpZIRP+?-bsLp-nk5#!bA z7_X>ikW~V+oG9AWC|V9N>l`r)664$g()4f84p3AJaSL|nsdglC0C5Wq`eM`X@Eg7n zI7aov0S$vr6T^7^f5hhp$L;~4IF{);(Sv7^f^nX4M4V^PoSr<3z;d3&!!EQyzv6hd z6Dy*~#2LEg+~Usiux4G=Zi1HSsx}Un+=MiR+LhS&IkHWm6KKRn8po#4CcoGS;~p+y z$MDufG|@Z0VE2Zhm*}y6Kgnx%VHxsR zFg(CHA!&~@8R4p=JuHcw8Wh|Zk|Hfdr*#J~P+vJ8G0~cem}uRIm}p&#m}rfN(&{UN z*x0Zck#|&)Ms1)6)I6Z(0X5ndpiO1a^Tg;uuRK_a#kw$OOt12BsjY={#rlS;5Lc|j z{E{oyQ~Z)j(-2dv+*YX|xB>4(&V{-!RNeV0MWSmzjP{nI?2~jv$W*(W4~M$%kU2bo zV24AqG+34-cb=4owi2{wbSq^DQwEq(k)`n^k#tt<%kq&?D>;Du{9<64NS*&$ue zmg%%^*J({dOnR1&nDlHMVv_90n4VQa&#n)f5qYyJb+x{-lJvTg6uXi%TilUUNxF@r zUyu;fHa-rBJLY8Ro!Io4vQ6ffsIS;);+I^_-ioQ&(@`~B15duFrcHpcbi*)Dz^ge+Z!CvX4UX1iNJf1QPjnCjSVdZ!fTV)&`XVmEM{4MCprZx#J zw-Rr0Q^!G>ZJvMxYO-1>s@<+A_)?R>86M&L?0~(zGbX61xV{(L?xIGGm z@x^V&2|JZ|_ohKyU8O?#*3;;mth`rh9YOV0d$ngX!MfH5jeAb0FT_8NCtR z+*@PU;CW+@!x`7ubsHV_i)PX^nqI`au$%8*-8hYmIFa2eJML)rD&8KdoB86_v)pjW z-tm8B@MVR*9EU7{DL3cV3(th33YUEk}OF9)8@eC|6e4mW*Lj4l+X zpR9p1yPS*Hw3{4g(L^2|>FLX$P0~*4Usc-%(C7B@dEDH~j)s;JB#JUsJJ5xUz@Zn= z@+ob6WqyWlEZk!4O|9BaNhXK#UxZWVtliit$#kG_3_B&mQPK#({&57;^$JJG(KMA% z~A_BsdiCAXNLUIRgd`{VI1aHS#7 zC$8vBcrgz7+63e<>G3iV^0xt}BVQIpE=Q5y5=H)3Dme>qM&}+16^*6aCo`84%}skr zAkm{;;@T{|457a$#!hYeiiA>6i{0Yfvz7T{y*6=2YUooW;*E988E~{(ezq@+A20Sq zv3;^{DzL+j8<;#(4y^tzj6I(3WPi(d;*Nfy9Xy-wY^8F2bmyDehPJQVy=_E&EU7%P z_aj`nXYpn|e7s&q@dXT@W4%Kw{Wp)Ja`g+{su94Hxf74Z`~EJmzsc-V;BwHt_eya` zkr1MHT2cBG+4vb!R|>v%9$~rdzfTw^Ha$Sh4iv#PxFpjNngM81hgtw-`Krhkj7_;x z2x1r%2hJfFg2$`26O!(@0MP64P}Cl(w%70g1}1Z0LlWMI4cPib9{gH+a3%W=eUrK1 zJJI#7GNrl>wvyqiR)Hoc$>iBlOzerhs}Pxy>urqK6M2UkZalVqPzioA&orRVy#UI6 z9h-CEjLh4GgEnZPAiPG_%KRK(YCbleF_GA848NnfbE7BedG1anZBC-YA}`@gS>m<= z>OtUQe{2^`$@qKyI3LZyTScn417OV|qyG#X-1g>03tj2Yzs|#Os!g-cEIn@sC%Y!L zA}!lTj&WFb>=2|^$VOQy73`^>TIuh~Up+au71JOo`}n4dPdxF&;ML=NX8%{_)nfuC zh4KW_rcySZp$}zPbqtFT+k*tD^lSvv#f zW7G%1SBUmM1JhLa{@Vkz5Pb_`O zO1-YME>Ug6rcnL5&{)OBPZR3;F2Bdo8`{gwzJ^_SNC}O7FkXqiBgb_W>oMMc@3P#A}{ z^rciRu0AxJfZ&OOD8cx>`HR3YNyl*#GZey+t>YM$h~tq<;(FTE2=BOEV9am-1?vHwR= zc4%XM98WX#a_q+zDDh*oUX`>&B>otZ#JZfR)%ek<_>VxcHDAl98c;v96F9v z9Y$j;`z7B;rRyLE|q6n1P_#6FVOpV)QvL>;}9kC_XQo#Lf{c!C!MWS zNb#RcL^3djBoRj);n?v`Xb|Dp5yP=C5yz36qMS*@F-|YXQEW|ezKo7kXFwtrC5EME z8~mtR{FI-cj^@qDf0`D{f()haKEXD>jhJj>(pgmpZ>O~f;z7d-qd z&TPiKzc3mg{}Zb1N^enOL3>#KD;5mOwqY#tX^21vx|hs(s>$~26Ief z2-6|#CXS`1btT92L~oel@X*<$gvTbPCo{Z+g0=egeH~8md4sPbJQ~G23ZMVbY9Mv8 zp?HR45{Cl$%Sgq!D!m~`>+J>qP~dm6WV~hZL?=)MaiLN9IBW-%yNODFP+>+qSBxOB zfRi{isTWT4f`6EXpTEb^iL)$X1ln=fO&~p)2t3zG1aL@XC#Udb6;)z&Zxnj1gSq1> zO=PbkW2g+st|F2BfuqUk9Zhe%Fn3JQ@OTN&P~e$Bcq%!bP;M_3?wzORj${qbIKp%M zf~qDHo)H|+wjYk?3X;8%9U!h9KSN?M`aTN}2iJ}-2jY8ym>oGj8mRZ+UbVS;L*0u^ zy5a4L$GeX3j?(Z_kymiMXD9Yj_3y(QipM*e@E-V*mp2=D2XefRT^=vIE_fs8>+6fT zBw8h2rb<6`7cgxECYd+O1GrUfp5733lMR{8sA2ZSsa9y2KsT79+d}9j5IWvA*Ku^; zPPlA+W91@7Vh02-OybR!edMrhfPkoVP9(gia4@%r4drjX@YXquqkpP5^l|za!#^DO zJuDe-i^xyNoxl~urA8)1%kK1pl^|0OGBW&q2?Ps0u=fQdtF{~eRXTKJ29El`86k;u z%7{*iMu*-7#o^CH$HVEonbQlqdaX~N4jC<##5jNu?mCZx^QLO#h?;ss6w|X9Uw{WK zmGB&>0G@jY4{xfk;8wLw`4{k@r4pV82+vr;!<%XY$Mfa&y;Q8X@?>y507niG>(Er8 z2}a-9FkYET&mzo6_&HcdWZqb>;K(2E4S9mjM)W@ce^)&I{pG-48^KSF_9dji&-g!& zKNOFDIpG&0_^I*U%JH8Z-wSh4es1T;5y!%|hSn=)eNLm;7~Yf7Tl4Vi;J*u7;4Xo; zQej{%#wp3EzB7C{_^J%l{tahS!P6xd5V@fD52UHK<)EiIC&4c%&iDTZ(p%h<-WW({ z3(=dv=~=VSi;F)6O{yb(Hbk|3aovB3=50M`(vWur(fl(`?t+6!q>f3PUgLj_-km+^ zQ5}D?4D^aPJ*wlKkvjea>8j28gJ{BI1cL1A8>?$Ni4w+o{=2Xl=6e2uG076E{#4&z zxiGII!f$=1s_-Pr1q=yuFemzpalJCOyDTq9b8&Apsj|CDL31gmY0W+dfr2gx^xu$< z_j&%SbZ_g8E(uj4x*;5Y1rL}=U9aObw`czs>w0HzG^wtKmx893)1*NnG#|BE^nr4XQr?)$vY zkC==HlO-toYuW!?8{4if2{O|lEc8~mxhu%J5q2-Z@F%#MAQjPtIjM&{ZO^I!wj?HT!LN|_U{4uAo zC?~&Q!%EF8t<_~I)ulBH1;}4#^?nha3hMNj;1IM5)~Orac(iC zC2CMiR@&YScg3B+Ut)na6`Ws%jk+pqSd?dG3HY(&!#^`sxG|VL0rMc(r!awOe&2*w z-Hq6@rE{HWdnHT7i*YU}%p2B%ck6d++oe&KMz%n3+&(sj#UDQi=0VU|`*5NoF5x+V zBO?sht8eRU^M8=EajivA=9s+wS|q$Z!Pz$*bPC>WaL@su@k$Y~w8r%IzH5LxQE%5! zB90Bf*%?Pd*P{|dJyi35P@7^s7svQ1yj5wAUXK8Up3IzG;rdcLI&!!z|r1@DhHNeS8Y!px%opA z-eDhBagDws>m5(BTi|fH$`xy-GW^il;^WwYIz1y9%SH<7N9k8 zU=D;FIiVIE@QQALI{paayl`g0lC@zJ{$b--IHTb85~0uHhGjX2e`57 zN?6Q`0}C*R9_*oaK>W>CIuxM;{Q`f{gkDp)9hO6Szvd~F6yJ}@AvXam!1y)?ool)U zSXEm&e&Hy9nKB&#GK(m&b$N-fcXHUgZm^>?*sMg@i5xbq8|;NlqSb}p*nZ9jxRcm7 zZX5y+0VOH;aLgX9nZ>q4;oL22{Yb=skuWB(3Ft>?Bj?8%kRnd6hKmxtI&SR4Q zecs97B${r$%=@6|UuP0%WIh<`OYb_k{Oi(i*b)t=dc|J_P++>M6w0K}m?Eqz#%WlA z^l}(*q@7l-vnRCrMcD8@De2+RKOWbG^ySYn+?Az8Y8Tl<@9AXH{abH=XEQAz0(Xoq z3$e!BJ_iwZ$2ilM5^%I-$b$tvPSLl&Wtq11-O6JdalPpS z6*QVdR{t5X`HVGnw;XtkiXpxnN>Q2`0g)Sw7D=PdIg!GtKStLm1n~gqL(hQsII-;< zJ3yz+;6#Zb?9msAO#Y)y6hV2^AP&7QXjy+&DmWxQbc|FYQhh=OTCWqAoB;<6CC5;j zZ72OZgwI<8+4s`)mnv< zHF2BhgoY5jc8&A(?HaeoqIgtw{Q)wCegkEb)V;FWg4Y3!4Fhu9+CRgX3N4e^U)$e@ z-r+PtXK0w#YbgP~o!T*+EFPU4g8*ZM65i5UjX>7gMd?_vL^$ zb1|IWzQn`8jHJr*zZDzL<8dUtou?a-&MWABPG%a~m`+wIkGhDtIAET&kdRQ|#XTy% zt&djlXyvt<{}lLp6YM<%j>B2)-Sj~xz`wc}$5bZ)N2GcsUhGF35*w2+=@ECJEYeOG zasc4TTrBR`T`6S;;f0aBdP*)Hx9udC4JrF5CNmEng@}F0@ZAs}e1m3CaBK~jUJp#3 zD(>hH_l=|VaNqbUe^o1-jo@%ZM_IIrjlTe7Wxhdd`WY_RNzUp&jo>{JUJF;A18G+i ziZd3QV>n(2gK9UuL3`soUjjztYRD9a%A%$VV&hC2 zoddihL1T8aH$!-RQV;?4r&E5H#j8VV5 zGc%Ek27<;+2b!OZGq@noiM-#JcG5_I?!6rDa5wQblkVUm2;v+Zq}o;6{$c1XyX1iB z7P(;GYPj9Bw~|ueh>Dg+sOaecC6>I)aRN1OXO;eo1>Rw5a0>N(_u-%#G^2gy;g%5 zO&&^iNc4|jEO(j1M`A+lGy-CFWvBJBNL0g{301h!&A!1ra47Gk^;uya?)Zrk4{3Y> zgUw)uC-7t@Ind$QqAVO+grkc->}9=2AI7wDC&+EkPK>%sAvBD-4Kon&QMVYvdR-f5 z!EJ1o({!{FYvG*Gn_8DS6;;(!f9b$==q1uwe5bO7N=BWR-iy;5_V-Am)h7*T>oaq7 zB@Q?}690_mk| z5jEj#B-egfN&mk9V0*ZuN^_UV8JK3SG`3)DR&A$-fG*0DjCtB{lr}sc_`CpzUa7V{ zc&Z)h!U5~g%Ga6g6-<2OP3Jfd6TOasdD>zpv z>@PPrTPr)8(Yqy`-y=7-TH7x|QXHDE z2_esjN2Pf+a_Ao~e0}1t-n;Gz*niMuaN1iZ4l*(0oqZv^iVH!t4W!!A>RYu5xOAfX z%RQ~yp2Pwya=jnd1f3U25C;?5q#2uy-IQCQTU5O+!oj?_)hy8KoO%r#Z zjpM_?`zz1?JGC;4n?=qN0TP^48~OS!r1*vGZ--MP-pW8$YQ}MRlY!FrceLmJF$A=} z1}`nSr(JZYP#bHeQ&`giGq1xdIq=j+XHdj;(^0SI{a+=o!f>*CLD+=foJvUK}{*N_hLvcq6?(tR#z8FGpOd!3eV0Zn8#EZx)Fq%&w_NF9%SBfvCsda51S3vFz z8?jUktpI-$9O3EI982^|r|EBiwfG()35uDYBk{v5%TIkq>s`t}Ga1T-zECm_7g&!^ zReB|v&UoQUM*f!kz)$kLbkG$Jo-o&uyl`#zkZB&@X@G|)#`C2p(P?B0kD?>aHj|Pn z=E+1epx@$sLL{|vahpf+(wHBa1^~cs)!-k+!+qwvk%&2PaG$vxS12D9f0v6elH)it zlfN=u*I_+4I@&^D3z7!2^6t1xkj>j(( zDZUQBn(}C02Gtk7{xScC(JA5!rjE%3gx0v!F=v1@($F+Hxfm8}??Bfi|A$@D1p%Ko zJLVlIF^8q7tk~3f(u2=Qm+kkA#<|gZX0Sn4I#Y_udK*=T?3BmFL0ckzspiTPkgD( zz008g;l-?DNOshZkULNL-|y?~LsKt&r_i{c4r%qDxy6k`OMUs;O<&v?z5OdIE4Oat zhkP_!=q;Zwr~#&I?vHQfPaQSNCE^gqLc!)3*($16N+*cdCMT!dquuc(wZeIRrc1%82(WmKufNU6RK z4?|vRmyk!~ouNaAV)$`nBK1!XJOyRtj4s7qi1)?|%?5Ak7E=lsv)KR!U1(17ij@or zG!AM#*@b44H(g6I@e~uWySd%$o1E{6CLjwE`(I8zFGD_BA9aYnN2#CJn}PFs?QR^Y*6m|DMQkn3jGlnA8r^JdUQu>u z5%y--$5c|cqgWekRsglZyXiimtYPIDAGC7H7K}W2 z#~35aCR~L|FcC-h*N?wmDYL^kR}RTIF;aVBkmEWMx|4bZjFS#F&*Uj9;zJka?ifzp z#uGS?1Rt!Y(F|*uL(t>U5`e2Xc6N`IYO(_a+w&n`ENq^`HM)L#?peHyfb2Rqsm+8}U6M z;+xFgEx4&+zKlH(81!Z1d#vyaaHu|C<66T6`Yw^#S&;3WKo^znkvdtf@mQB61m#l5fDZhmBN*rMrJ<<=OmHh=CuPSV~< z^RA-XF%QqTc#U{*LoSmiV-&ytKeY$2ShPCSEVw; zCY*&ARXl<8-PNj!c|hoPXaF>AR8e-bn;oT;%}Bw5#49pKW^-s{=TU6qz#|@Ou-E}$ z>X>``#m!Rao2+)&lkvVH?4es}auHiEX}r>Y`S-&KQf7wS)=gw24dSD#IB6M$=9wVb zf8o!%T>~DW$2odDO^-|Tc&Q$H_4sFc{3|`)smFWu_$@vDNRQ9yv4vU+{s!ss)p|Th zkBjwqsUFwp@diEKs>i?4<3H;0J9>Ohk5iu4=#0|iYxVd>JucScyY+aL9&gm+t$O^d z9=GW689n|)kGu3Zjm})c-w-{%R*!Gi;}Sit)8hy9_-A_jlpa5)$1QsNjvjv;x&Mknb*jSIgmjNUuW*fgp?LY~-P&+<(} zZYqOTDuNyZSzZOKR|#3To`|>{VXUA%%hjK0v=-^m1aU_krTFyjSTv}_=Y*ATT-S|a z3}Yhvq&WD?<;}cZ)BB}*Y#pTCN8-ryVF~Gx=MRn2^AGNxFY-Ks*L1V?y!w0Kz7OA9 zIU1htgR@TfVQ`QBK)AYz8ouwV$JX2*2KUwvgj+i4hvAcN(BLBS%DY9okH{es7whTH zOFWO{m*;lRADZ1Af8z5&b1wh9M8|h2{KFPpKL56bmw*0jiS~SbsTN!Gc#s}v>T%?G zoqiwTOC)R=cupLQc;3(v{^mP8wfVzD&blKx9ZU2`Q5-LdwKGbp}}A&0d4R<4K6q zl7uuve_`--DZ((rNJDx@>Y3!DeS_vY(^6wjQn7~#!Wj#2BpZZe;51~U2pQ$6LPiPV zNy$RS#6d>~1g&)jY%7?i3c}#4`i>dsO%_DZOC8;3Zc;I=odww0Q6}sjk6=gHWo((rCEWAkW}yk_B5yv0$4tTd)~s2>pU-b*W3W z=d=l<)wwUP^Wdw^fb(#;K6-gL43*LU!AhzJMpFdz3F?A3+385%|Q3sda|oX~J-CsxZ7fMHpU^ zEDQ(i@QH&vt~_cB8V08bgYj%Io(;yc!FV=!F4FOR=)P3WD^r9kOHzd^Cn26Vu%rJ` zF_>PLwp7apc+eS)vJVEW!4r{>(@p_x$YXA5-QeuL!VvGn!jMTn5r!BZ5>jWR&EuBm59QyN&SRj^%)&k zoY8fK^FRa-`hf@O-~o72Kllvi0jJduw9-KR30cR$%D6zenQG0(Kh%qO?Qc3nw(Q1 z=M=~}Sr{}IawZt?I4VzGUX&AZ$$(rk=IZ55P7;zQnsW?SCXuXi45LznQPAisItHB? zaMT*?SC_stEhn{@^q>BC`x$_kuI*`p9d)&%u6FRwUO%j3$eE0zR|E&u8Tuv(eGR|R z;0P8Wu|3^{c62wwb9&tMEP(XCuV{X}4MAULQ1TUj!n_vx)!X0yta~)B{Li|lyLP;7 zDyeRmUg5p9wAzO`xnWvu{mN2rQAI;T>0K2I1mPj$Y@fHz=XF*r^W8PiTVGXk7gDDg zJ+)<})lzkJEhhCdw7Y5b6&1pt4M0{{ThmZmU9q65ro47F46ku%^U45KGu2mFSyAt< zsjS5wiFrYNmA4|2N3fe0RFzj0E-$SwsV(wVd#k3d^;QUzG^lA+)fIvz2{b&V4PIA$ zeJxgBE9icnw_Gl*DaT`Bq`|eO%3EAtTZU=~2RU_LeSJlZw`6&JMQOPkOOF#taz$w! zFS0O)^6TJ~DhPieuFQ*YB4xIPb@t*)58?Cy#( zuW*+M#5qcAVPle`lQItEgXFTv1<1np0B- zL87W)&2i$Pt|4#HHD~s{TvlrvycH|C_%wywgp z2G0kW=2kRB`TT+|$%thBL?!c8%x|cuUr<}W!i^FOpA%iuLCFhL%Y5F72H^P(;U+j| zMP(^8cD~zFT632V4M-4fF-$`%m{wKa!1DomCQq4Fu|`jr#P7M*2oAKQ(sEDLvief+ zo60zZa2M5<`>HF5?yS<4)G9~BQZ-FOS_#L48rAyh%K%i!aYgPy*EM&R%ac2Ce0eoY z2ZNLJHa@i$WaiIv&5b?t2eau}I^~LoN3#5FtX|A{W)~b51ue5r8&1&!wZJW|OwY4jJb<=z` zycIw%>(>fG20bY(t@HZosWb6{!NM3y)3Ul~wyFKSovPV$Ht*ENT{L*u00bfH1=ze_ z6ohAX2*RtN^~_!9yY9wZv_=rp(AM8-5Cm%_+H92|5Dy0-(`Lwc<8r{RfIk9yv!#HU z3flG0o=1lcj7(|_cGu<0=^F53!+DO9QYmwzHb2cH1Pcu_h)dAkLn4Z;NFfh zWT6an9)RZ_*i&#{hx;#Z|19odmJm9SCIIi_z`GuJW#BCVo?_s60eBY!&s(LSE1|4Y zkr#dTHq`G7Jc1sFOH#>5LCCbDZi7%J_<%fw^fhpycpUx~%aOLG5GGo{2bZCo$S>o* z3-D{MLX1Fr>kHkupMg9x!7~qN!D5z}{tQ+?D8kQ!d(dK5q^sB8-!O7jv#!9 z(20=x3S@?G1Huf1B?w*w1>q@#KOwXtyoc~5Lh7r4N4NoD2Eq~qFM@*b6vCen_9Ofa z;S+@9KSNdsKSG#}ums^=gr6b&2f`kNcM!fn81NcKSA<&-<|C{?*o5#H!fz2?ML2@+ zPlT@##McF3G{Q{?GZB^`G$1^P@C$_P2zwDuA#@;^f|zq6T!SzLp$MTAp$_2zg#U%` zJA@qwZy>yl@FBtlgg(uX1;QAFNeD8+tq4^JYY?bqCJ9EtB$$OhLSMlmB*XfaDx?YN zLO&enZ58?p1B8LXAi*YFAzUeB2!r7sG!&cs!-WyTNWl*K)hJ=KkO_O&)xtHfw2g)R zHCq@53)pz!dRS5?!19(WOcHJoZWL}3@`QZY-wK4uIEVRW;TFLGyW>m{+iH^}-PkTtzgr^FuADX|AmN=(FAUbU)cjd)@rPM(;ElPC6uvqy~xvPX?5(bt2a zT550feLX6r!6ueqrLVeYt$1Q0R-TwxE1uXJ&K|WQ$R4$-t?x;k(h_M?S|VvmOQhVe zyqDVW#6*ldF%czC?1{6NLN+Y#rIb9eC(d5WS>KB^DZj5r-L=%-(E57T-?ywMLmMcu zNBt?W2U1GxQGX=%kS5{mAo8ORIRFrJi-*LqJBvkmIn>ACeg7~R{I*3M{iK<^0hUk)NNH^ zm2#={IM!g95Y19UbF>KFg!F_g4c=0$e3n#T4j7j~Pfa8pm)tv=hN_iy)fGL8tmlh+ z+CBS<2<^Knyi2@%ExDw|w=$AiP3x>43|k3qgO3S9iKJHCRaFzoucyV;v9`XvqQ0Vh z$+CE`NMbK=)wQ*C@jOCaAD<(~sdijiRJY>NCPhjUmloBmSXxZ2h{f^t#G(D7s%+x+Y4HP*ED?s?ad=Ta>8|7Kw&vrub4uGR5gsBxyC&UMmlw z!5x-d^sK68NnL4uX?1l)wSHd}S4wITya=&^6KCQJPWREea<+A=XCy_h1HX;qD-{8& z-#8Tft~;-MHQk74w=oc!<^6yC7jZW~e22ZQ@-3X0g#u96NCh!rEg^Of^bGDTDm|t@ zy8oZQ|NnBpV#ShqAl8V#LqObu@X^0xy^c5q>(abuwe{&zT<73=IpU|`U+uv4vxwy@ z1>q#%ixF2Lcz~x4aefB!;o5=t6$CqA_99*|7;DzwV@-qjXG5@#$2G01cMb(zz|(rW zaX13fY2AGaVLh&CZT`~{Sm%N+t4*(b1X*l!K@nm?Q&AxxMG?EAi;74R6bp(9 zimd2ba0NSx9oJp}MO4sL-Z{C!1jYAuzyEvtzW?{Vn{RT?ojdo;%$YOip8W0%NO}By zo~%#iX986+Als%6bc>YF2fBP9^bKUL1L{49EI$pX;b71SX#S#7%9Ok zBpjD?pe#Fb+&zKjLc)F_J~7>%lphRq52QQLhJ!%G4rD%J7Iz>qAs_LSI7h&N;9d!? z0zAq=jKtoFEQ44{l$1vtWwVq=%;G*Iv@ygwdI64sG75`VtX^BJmPwJQXX-~r&1oVJ+m;f zJmQD(QXVnKaw(5EBQ=~XgV^L~DUbNyN-2*R;|(c~_@e%7vOHpo_?Hv0kBBQCkn)Io zwn%xz79AmB8N@HQNqNLPX%W(Tfd)%?#6}CHJmQaUr95Js)^o}7h;MF?@`!CVNO{CH zT>;0$x)66=DdiE{yeH)mKedgL$^j~r@`$slaLIhcW__eQ;-6ckJYuX*q&(uQPJp3G z>H@k$$|J5y2OJgi5%=XoDgqv{)u&P(@!KhUG9NMD^HLr$V*6+^A92`HDUVpM3E;vg z2l3&2DZd*iEaH>curko~kcxJKPXx-3BYk56P{(+(J@`Kkrq2hP1v$Y$k1QmgDHT8! z7Ljtg1FeUI^Q9T+mt>fC1rXk(!2DVY^9=GMfJUT(9q$4^19W5>d9NqXC`hGHJ|3uX zI@AliInV`=DuF)*l$`3^h zaS6~|pvQog0xbu62`CV`1J+}~*|Sda@h@sfF3Oe049r)@n>rk1KJy3p#1HcAe~|Bq z`R~Aw$<>hv=P3%Z4CPNShve?(`~lAan(R8!263$Hl;Zye<{Dj=kwZ6!6CXgvXTrCO z1S1~NOhp zV9Dsb;x_+FWI4f}8pk;K03P%DTDVdWY za&4!7Rx{Rt-U)TmS+qa?MFJ_F_9-V5ACfqKQ(;(4g#8}*5^mMqoYJ93o9Ln%_r zIDS}4X0=RcDfSj?jE98#I3oTN(+={#)o(|MaUchKfO}8A zw`9`3u+O;rgeQ@1-a-10rI8xJeM2*$)oAhXrUiO}J7nNB2Atu1BlGc1HE9j)*HKR+ z{z6S?d8i$77NTatDQJPDUEt0fv>4nm69X-3A4U1vI@;K`{X(0?9?5$KCP;#9dAYj(q!&2aOlT3lkHS1{U5d)cPHUJxKBqm=YCu>+6{RX=iQ&PArKEMBjn|O?-$U^M8gM1 z757V#{lzm`ZP-pu2RWU4p?`1dJ8I@zOOeed`5Dk|5v1LtkHVSpz0IR${_J4^aZ3AB z68Cb+bVPa#GA1IuN&8Hb_aivgGCzryjc2&m3}aHXEs{emTXfJe*?NptFnZ)cKhR@! zRtH)~9F*fpp9|PPGYQp@iZCrU|k(;{?FG%?qowvpcF@#lNgcnfXY9CzW3!a zABfh4egfNs_J)3fj1Rbyc9Z(RT#SQB9~}+-3z3xT=p9I3j636Gv#5Qxe%}U+j?o8` zaVOS*b#*4u7~=vk!$iK2ATDp9s5S5zP>5|xT7 zM3tgTqFPa%=$YuXs6|8(D~r{|T4JWyNKA-1VtcWh*i-B)_7{hVx#D;zekOh`ZV^)olnc}gvFxr@+3zt-!Ou7m&999e+gw z_}-2}qfrP!A3Mb^LsQ*SKd8W7oLoU40wIg!{Jz0c+;ZF$Y<8$dWDvj3Fw6Mn=&$ek>&R4YGtphFMvW$r# ziga&AHw}F!SlYu2pA{C(GzuERWLa5RGAD!w@uK)qq0vmIC?408rAug&g?n|p62*fB zHBpf)Jz@Y}r)y}*u1|`Jie@^*M2AJe;-C41ZXXrGlHjo67|tTtetlF}Y&f-mOgQ|A z`4W|Z5Je4|w--x;=z$WIHM&j-;D^D&i)g4uolwP0B@LxXA;EK_B7@r-)>Y#N4KpD0 z$cFWkHOwh0IE3jHJ}VNWGCiFf2mw`}Q29EJRH_1nE}*Kx=u*4V1XL=eWd5S-(~DiK z3e0!2ZnX}y7!z0VX~5RAF7p~MyFR;?`RknVlLDJJ(SDs!J0`-+a8$_g3kD_K+)9?j z+;u76wNlmd^g!dL+@~rA11>ulehl1nv9F78?brdEs*BC^e;qq4A?ju?UF%FMb*sDO zLz+Xahf&#WUk1C04n9l3E{OB{nsGf6#Pa*F}M=<3n?@`6{XVnohlC9`We8BIvxyO}0zlhO)66tUbN7 zE`&~;ziUrgrO&8s0?+hFh5Z&M78;gM3bozjUS+&^cx1|G#mieSjZLLRrc&}N((ZfF zz&xotl0Fhi9|#Rlr_Mk|ccQDJGT5|&f)brhB;{c)m65cWNZOdFKJ^l}F`T#6VB%uU z0~4~^&Tr@a{q`nMqnw~Dx3Nj@ae37HpjY?p2{mk^29?^zP$1|)2p!B&W%OofR_R=b zrEsV2dvoiQ`{s$xraPR2UK8E$vKoT{(VRobDGLktE*?9m>B2Gh=se%S(L-a3 zQ$H7uUl&iA@cg%zT6e-vtL7!Vr8%AXEv>4>tLo&oa-XQzLC!m!DGeJcH`i#FcH7oh zW!;Tix_gE!YOELWcdxu>m1Ubf`xs~LmGpfEpYK1v9^Pejdij?Jlrrq-IY4W`wPE3c(D7+`};L2 z#oX&_9(o++5o@^iJtF{GD}nuAqC~%;m)< zCEJDP3vV$GA1C@QWooJnJvOP?p>788aE(!T+6nIOZ^eZd5*>N5s^DW5fR723`j`Of z#ZeOfsU|;<6u{5?7iTp(94qiKmTa~;!L~w&!y<-%JtdNo|05npMPfMMR~ZvLJSVj~ zDEbc^)W7sS7mcLps=*fnj6tA1w0#%y}I%VY_ z99L|-_6Mimqa&>kUtJBLAJ4sdJ!Zl**PZn5+jOroIxxqh~>1I!l zJX@$`B?vhsK2{i$-uFe?M$JLRO9sW}U*lM%JS-kmqt$Bs{K~oBev|c@Hm*oZ9rC4l zjLDPbEeyLw)zur;q^iuL|9M!4vs}6^dVgcwo~f^6c{*_hi!v-uX-_}k zNgp?Qu9Db0JzFtRl(c8Edu`J7kH;M=Sig9yY^w1Z)024lSeTwLB2)F~ zyo2YOYaT6oX2j*!)IT`6u;Go5xnH8-rTPsX{Y6jrS9eu17dm@%4~Y33nWJ>~g0Y{L zidB*S=UZ)zU9=swAG3Cpm7kbB*_t);kxAtFHxq_xH|fSMOx<@T?fU+q^}DN7D;{lI z^6cWX6y9WkR^-sit?Li=(>)Qj_I9A?#JD+o&ehwld3eCAa6z2atl5->f-Q9QdqL~R z4061;UjIZ|w@aEkX5Qhmc_Vb&DutI1L>|XqnvCbXK$WQw!9mmeos=VMf%B$jIq2^H&c3Dr4 zNtMacy(~y0MC@8C&yi0qR`S9^ULzH1vPuaxuNlcL!TWkXlFugIUoxI%x$a%XR%IXEu+h~wD`Kaa zEjm1qanNV#Z0(@7!~~m$8pgm0R&miv(@##TO|>+MIj8zU*Q!fG?3XPOkqhcxjas>J z>paz&Lp`(t{n=ZuB)c2yPYZKde$OmL-Sa@}p?)hO8V3HX(Q;n>#!}U0K`ej7ne_|u zs{9pSDHNp+FKJmfHN_#tcj>ywq5&puRZ%%kb+ex>8I(1L^fv;k5qM_9&ODCt|Bq-# zU9pSwCr2+ThAC7df@7EhNX^if=UEyU^4Ezdl zqBwMnguV--XIEk-R@-`w(fuV({Ay(lKm6)`bQ~;FP=ls(|4_pI5;;!ztr_=%G(w2f4rBCIPr4v zbMADPZELPnUAUW7@!V#M4_Offzj+_rVHR7_C-tpLb)|-p_^SA1y*B(6Bb8=>L z&dHFmn~etL_%BnlKC2ND?^bqkPx45QqCnq!#PjD?IuA3NZdoO@YUpJKCk81pHZ*Of zIhieVO+VU3yBX3t_TDXe^x9&D$nI5J?id9mxV`C<(?gF#(@xv1czOf7^s)UJFWd5+ z8TX!rTCQl;-;h&P6gPR|$m=}k0|xKGLG1zuwWd8hQph9U;VFOXn*P4<=sQP%;SmR- zAq#L#ES3fOC=8C^l!d26Qt{sr9t|c2!t)lQCEZA;aBf%#kLm2?!gTR+AIY(B9zJY1 zVc|5)!qLfCj0&ZV%_VOZ>IRy)-W-=d(Y)kpM7^K&!Q}0uZF?x2 zTFh~Ia?&P~7E0Tx75;K;{a}*@o4Bd@*SMR;O-WI|v~O5ThR%~0Lk>Q@xK%Mw%$t1D z`piYU(g#Jp>Jg8HH-0@CV_Dw3^g+@yquTy&n)bdC?6`h|p0}-6$|u{8g%1w1D|2bV zZ=baF8#GVZYgsQ^Q}W>0F@kyG#y#x#GdCi7d+3L344mL<)@HD8=_?VpoPPdREnDHV z@hbbnTWd^GBTCL|uota3vv_YGGxi^$WjaMJ-Yt7R4x5!cYslJ^D}LJzAiZou7_eGZf-JZ#<6)YZjp zk7il8NzmWmJIH(#_H9Dn`!RpAN)rfEF9d+UU}Pb6&6EKYjL=H4(00dUGV{@ z52ZV788zaLZ~ow)N8Tz|oUSQ4pf>(Qmd)~}z)dZo^)+v`jf&W}e`9qy_DMg?b^OPx zeEp|Gvh*pRe2y#bP0H<;~xAjwx5sAXg>SO@?>y8?u2W$+^VTX8c8Rv?O^pQ55B(P$^yHgQ(e8f z*i_S7?S7(EWq1X!1dRFMv0?zWB9hYni$B?DUFCjA%HXryquWG-9 zY@cR*aPE^sbq%3{BRd+5qqn@=U~?_o!tjRA?~%Rvr7LTux-YURtDjNLU!{Kc)X@4@ zLE3Ly4}E&C!#20;S(DeTPV&kA)o8{#fXJ~yzn`Q{&&j`8k)7?&S&iMTyjzt;Xm{`)Sx z+4XCukG!1rNTpOIVt#1IQHSM+v_f-ie8X4nQk{3PDI@<0J40)1UGT?rQFLQ%ba<~ULx<#9TWAjQCIYb%n#feo(W>V&CaE=SW=Ht@O}^?P zs^9qP>7B#ODT-gbiiP=1wZ-~Vs)|*nj9ahf-F7}q>z;vDv1xU#cWvs%Sk`lv1yqzM)*b5oxOXg%I{W^ItJ5|gcOTMy?c=WUyq^G`%AuU4Hy`E~96<3|&RzuUL3=bqNSlXSP_-m6i28YY2_{sEb@`?CN5 literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 5b9563293b..5b0c8dac88 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -138,6 +138,7 @@ echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -152,6 +153,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -168,6 +170,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -182,6 +185,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -198,6 +202,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -214,6 +219,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -394,4 +400,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - \ No newline at end of file + From 0c3cb5066edb5fd5deb66598973501e3f9e6233f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 21 Sep 2013 19:19:18 +0000 Subject: [PATCH 246/267] New installer for 4.0 --- Installer/GetSVNRev.nsi | 11 - Installer/Installer.nsi | 187 ++++++++++++++++ Installer/Installer_win32.nsi | 242 +-------------------- Installer/Installer_x64.nsi | 252 +--------------------- Installer/dxredist/APR2007_xinput_x64.cab | Bin 0 -> 96817 bytes Installer/dxredist/APR2007_xinput_x86.cab | Bin 0 -> 53302 bytes Installer/dxredist/DSETUP.dll | Bin 0 -> 95576 bytes Installer/dxredist/DXSETUP.exe | Bin 0 -> 517976 bytes Installer/dxredist/dsetup32.dll | Bin 0 -> 1566040 bytes Installer/dxredist/dxupdate.cab | Bin 0 -> 97152 bytes 10 files changed, 195 insertions(+), 497 deletions(-) delete mode 100644 Installer/GetSVNRev.nsi create mode 100644 Installer/Installer.nsi create mode 100644 Installer/dxredist/APR2007_xinput_x64.cab create mode 100644 Installer/dxredist/APR2007_xinput_x86.cab create mode 100644 Installer/dxredist/DSETUP.dll create mode 100644 Installer/dxredist/DXSETUP.exe create mode 100644 Installer/dxredist/dsetup32.dll create mode 100644 Installer/dxredist/dxupdate.cab diff --git a/Installer/GetSVNRev.nsi b/Installer/GetSVNRev.nsi deleted file mode 100644 index c9f0c166d7..0000000000 --- a/Installer/GetSVNRev.nsi +++ /dev/null @@ -1,11 +0,0 @@ -OutFile "GetSVNRev.exe" -SilentInstall silent - -Section - ; Create template for SubWCRev - FileOpen $R0 "svnrev_template.txt" w - FileWrite $R0 '!define PRODUCT_VERSION "$$WCREV$$"' - FileClose $R0 - ; Make a file with only rev # in it - Exec "..\Source\Core\Common\SubWCRev.exe ..\ svnrev_template.txt svnrev.txt" -SectionEnd \ No newline at end of file diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi new file mode 100644 index 0000000000..3543d149b5 --- /dev/null +++ b/Installer/Installer.nsi @@ -0,0 +1,187 @@ +!define PRODUCT_VERSION 4.0 + +!define BASE_DIR "..\Binary\${DOLPHIN_ARCH}" + +; HM NIS Edit Wizard helper defines +!define PRODUCT_PUBLISHER "Dolphin Development Team" +!define PRODUCT_WEB_SITE "https://dolphin-emu.org/" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" + +SetCompressor /SOLID lzma + +; MUI 1.67 compatible ------ +!include "MUI.nsh" + +; MUI Settings +!define MUI_ABORTWARNING +!define MUI_ICON "Dolphin.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; Language Selection Dialog Settings +!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" + +; License page +!insertmacro MUI_PAGE_LICENSE "..\License.txt" +; Components page +!insertmacro MUI_PAGE_COMPONENTS +; Directory page +!insertmacro MUI_PAGE_DIRECTORY +; Instfiles page +!insertmacro MUI_PAGE_INSTFILES +; Finish page +!insertmacro MUI_PAGE_FINISH + +; Uninstaller pages +!insertmacro MUI_UNPAGE_INSTFILES + +; Language files +!insertmacro MUI_LANGUAGE "Afrikaans" +!insertmacro MUI_LANGUAGE "Albanian" +!insertmacro MUI_LANGUAGE "Arabic" +!insertmacro MUI_LANGUAGE "Basque" +!insertmacro MUI_LANGUAGE "Belarusian" +!insertmacro MUI_LANGUAGE "Bosnian" +!insertmacro MUI_LANGUAGE "Breton" +!insertmacro MUI_LANGUAGE "Bulgarian" +!insertmacro MUI_LANGUAGE "Catalan" +!insertmacro MUI_LANGUAGE "Croatian" +!insertmacro MUI_LANGUAGE "Czech" +!insertmacro MUI_LANGUAGE "Danish" +!insertmacro MUI_LANGUAGE "Dutch" +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "Estonian" +!insertmacro MUI_LANGUAGE "Farsi" +!insertmacro MUI_LANGUAGE "Finnish" +!insertmacro MUI_LANGUAGE "French" +!insertmacro MUI_LANGUAGE "Galician" +!insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Greek" +!insertmacro MUI_LANGUAGE "Hebrew" +!insertmacro MUI_LANGUAGE "Hungarian" +!insertmacro MUI_LANGUAGE "Icelandic" +!insertmacro MUI_LANGUAGE "Indonesian" +!insertmacro MUI_LANGUAGE "Irish" +!insertmacro MUI_LANGUAGE "Italian" +!insertmacro MUI_LANGUAGE "Japanese" +!insertmacro MUI_LANGUAGE "Korean" +!insertmacro MUI_LANGUAGE "Kurdish" +!insertmacro MUI_LANGUAGE "Latvian" +!insertmacro MUI_LANGUAGE "Lithuanian" +!insertmacro MUI_LANGUAGE "Luxembourgish" +!insertmacro MUI_LANGUAGE "Macedonian" +!insertmacro MUI_LANGUAGE "Malay" +!insertmacro MUI_LANGUAGE "Mongolian" +!insertmacro MUI_LANGUAGE "Norwegian" +!insertmacro MUI_LANGUAGE "NorwegianNynorsk" +!insertmacro MUI_LANGUAGE "Polish" +!insertmacro MUI_LANGUAGE "Portuguese" +!insertmacro MUI_LANGUAGE "PortugueseBR" +!insertmacro MUI_LANGUAGE "Romanian" +!insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Serbian" +!insertmacro MUI_LANGUAGE "SerbianLatin" +!insertmacro MUI_LANGUAGE "SimpChinese" +!insertmacro MUI_LANGUAGE "Slovak" +!insertmacro MUI_LANGUAGE "Slovenian" +!insertmacro MUI_LANGUAGE "Spanish" +!insertmacro MUI_LANGUAGE "SpanishInternational" +!insertmacro MUI_LANGUAGE "Swedish" +!insertmacro MUI_LANGUAGE "Thai" +!insertmacro MUI_LANGUAGE "TradChinese" +!insertmacro MUI_LANGUAGE "Turkish" +!insertmacro MUI_LANGUAGE "Ukrainian" +!insertmacro MUI_LANGUAGE "Uzbek" +!insertmacro MUI_LANGUAGE "Welsh" + +; Reserve files +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + +; MUI end ------ + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +!define UN_NAME "Uninstall $(^Name)" +OutFile "dolphin-${DOLPHIN_ARCH}-${PRODUCT_VERSION}.exe" +InstallDir "${BASE_INSTALL_DIR}\$(^Name)" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +Section "Base" SEC01 + SectionIn RO + SetShellVarContext all + ; Dolphin exe and dlls + ; TODO: Make a nice subsection-ized display + SetOutPath "$INSTDIR" + SetOverwrite ifnewer + File "${BASE_DIR}\Dolphin.exe" + File "${BASE_DIR}\license.txt" + File "${BASE_DIR}\*.dll" + File /r "${BASE_DIR}\Languages" + File /r "${BASE_DIR}\Sys" + + ; This needs to be done after Dolphin.exe is copied + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\Dolphin.exe" + CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\Dolphin.exe" + + SetOutPath "$TEMP" + SetOverwrite on + File /r "dxredist" +SectionEnd + +Section "DirectX Runtime" SEC02 + DetailPrint "Running DirectX runtime setup..." + ExecWait '"$TEMP\dxredist\DXSETUP.exe" /silent' + DetailPrint "Finished DirectX runtime setup" +SectionEnd + +Section -AdditionalIcons + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Dolphin.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Dolphin.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" +SectionEnd + +; Section descriptions +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Installs all files required to run the Dolphin Emulator." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Installs the recommended DirectX runtime libraries that are needed by Dolphin." +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +Section Uninstall + SetShellVarContext all + ; Only uninstall what we put there; all $INSTDIR\User is left as is + Delete "$INSTDIR\uninst.exe" + Delete "$INSTDIR\license.txt" + Delete "$INSTDIR\*.dll" + Delete "$INSTDIR\Dolphin.exe" + + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" + Delete "$DESKTOP\${PRODUCT_NAME}.lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" + + RMDir "$SMPROGRAMS\${PRODUCT_NAME}" + RMDir /r "$INSTDIR\Sys" + RMDir /r "$INSTDIR\Languages" + RMDir "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd diff --git a/Installer/Installer_win32.nsi b/Installer/Installer_win32.nsi index e56436104d..35d5d1f622 100644 --- a/Installer/Installer_win32.nsi +++ b/Installer/Installer_win32.nsi @@ -1,239 +1,5 @@ -!system "GetSVNRev.exe" ; ATTENTION: This MUST be run before this script -!include "svnrev.txt" ; !defines PRODUCT_VERSION -!define BASE_DIR "..\Binary\win32" +!define DOLPHIN_ARCH Win32 +!define BASE_INSTALL_DIR "$PROGRAMFILES32" +!define PRODUCT_NAME "Dolphin x86" -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "Dolphin" -!define PRODUCT_PUBLISHER "Dolphin Team" -!define PRODUCT_WEB_SITE "http://www.dolphin-emu.com" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Dolphin.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" - -SetCompressor lzma - -; MUI 1.67 compatible ------ -!include "MUI.nsh" - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "Dolphin.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" - -; Language Selection Dialog Settings -!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" -!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" - -; License page -!insertmacro MUI_PAGE_LICENSE "Licence.txt" -; Components page -!insertmacro MUI_PAGE_COMPONENTS -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -; We launch the desktop shortcut to set the working dir -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_RUN_TEXT "Start $(^Name)" -!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchDolphin" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "Afrikaans" -!insertmacro MUI_LANGUAGE "Albanian" -!insertmacro MUI_LANGUAGE "Arabic" -!insertmacro MUI_LANGUAGE "Basque" -!insertmacro MUI_LANGUAGE "Belarusian" -!insertmacro MUI_LANGUAGE "Bosnian" -!insertmacro MUI_LANGUAGE "Breton" -!insertmacro MUI_LANGUAGE "Bulgarian" -!insertmacro MUI_LANGUAGE "Catalan" -!insertmacro MUI_LANGUAGE "Croatian" -!insertmacro MUI_LANGUAGE "Czech" -!insertmacro MUI_LANGUAGE "Danish" -!insertmacro MUI_LANGUAGE "Dutch" -!insertmacro MUI_LANGUAGE "English" -!insertmacro MUI_LANGUAGE "Estonian" -!insertmacro MUI_LANGUAGE "Farsi" -!insertmacro MUI_LANGUAGE "Finnish" -!insertmacro MUI_LANGUAGE "French" -!insertmacro MUI_LANGUAGE "Galician" -!insertmacro MUI_LANGUAGE "German" -!insertmacro MUI_LANGUAGE "Greek" -!insertmacro MUI_LANGUAGE "Hebrew" -!insertmacro MUI_LANGUAGE "Hungarian" -!insertmacro MUI_LANGUAGE "Icelandic" -!insertmacro MUI_LANGUAGE "Indonesian" -!insertmacro MUI_LANGUAGE "Irish" -!insertmacro MUI_LANGUAGE "Italian" -!insertmacro MUI_LANGUAGE "Japanese" -!insertmacro MUI_LANGUAGE "Korean" -!insertmacro MUI_LANGUAGE "Kurdish" -!insertmacro MUI_LANGUAGE "Latvian" -!insertmacro MUI_LANGUAGE "Lithuanian" -!insertmacro MUI_LANGUAGE "Luxembourgish" -!insertmacro MUI_LANGUAGE "Macedonian" -!insertmacro MUI_LANGUAGE "Malay" -!insertmacro MUI_LANGUAGE "Mongolian" -!insertmacro MUI_LANGUAGE "Norwegian" -!insertmacro MUI_LANGUAGE "NorwegianNynorsk" -!insertmacro MUI_LANGUAGE "Polish" -!insertmacro MUI_LANGUAGE "Portuguese" -!insertmacro MUI_LANGUAGE "PortugueseBR" -!insertmacro MUI_LANGUAGE "Romanian" -!insertmacro MUI_LANGUAGE "Russian" -!insertmacro MUI_LANGUAGE "Serbian" -!insertmacro MUI_LANGUAGE "SerbianLatin" -!insertmacro MUI_LANGUAGE "SimpChinese" -!insertmacro MUI_LANGUAGE "Slovak" -!insertmacro MUI_LANGUAGE "Slovenian" -!insertmacro MUI_LANGUAGE "Spanish" -!insertmacro MUI_LANGUAGE "SpanishInternational" -!insertmacro MUI_LANGUAGE "Swedish" -!insertmacro MUI_LANGUAGE "Thai" -!insertmacro MUI_LANGUAGE "TradChinese" -!insertmacro MUI_LANGUAGE "Turkish" -!insertmacro MUI_LANGUAGE "Ukrainian" -!insertmacro MUI_LANGUAGE "Uzbek" -!insertmacro MUI_LANGUAGE "Welsh" - -; Reserve files -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - -; MUI end ------ - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -!define UN_NAME "Uninstall $(^Name)" -OutFile "Dolphin_Installer_win32.exe" -InstallDir "$PROGRAMFILES\$(^Name)" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -Function .onInit - !insertmacro MUI_LANGDLL_DISPLAY -FunctionEnd - -Section "Base" SEC01 - SetShellVarContext all - ; Dolphin exe and dlls - ; TODO: Make a nice subsection-ized display - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - File "${BASE_DIR}\Dolphin.exe" - File "..\Externals\WiiUse\Win32\wiiuse.dll" - File "..\Externals\SDL\win32\SDL.dll" - File "..\Externals\OpenAL\win32\OpenAL32.dll" - File "..\Externals\OpenAL\win32\wrap_oal.dll" - ; This needs to be done after Dolphin.exe is copied - CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin.lnk" "$INSTDIR\Dolphin.exe" - CreateShortCut "$DESKTOP\Dolphin.lnk" "$INSTDIR\Dolphin.exe" - - ; Plugins - SetOutPath "$INSTDIR\Plugins" - SetOverwrite ifnewer - File "${BASE_DIR}\Plugins\Plugin_DSP_HLE.dll" - File "${BASE_DIR}\Plugins\Plugin_DSP_LLE.dll" - File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL.dll" - File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL_Test.dll" - File "${BASE_DIR}\Plugins\Plugin_PadSimple.dll" - File "${BASE_DIR}\Plugins\Plugin_VideoDX9.dll" - File "${BASE_DIR}\Plugins\Plugin_VideoOGL.dll" - File "${BASE_DIR}\Plugins\Plugin_Wiimote.dll" - File "${BASE_DIR}\Plugins\Plugin_VideoSW.dll" - - ; GC/Wii static settings - SetOutPath "$INSTDIR\Sys\GC" - SetOverwrite ifnewer - File "..\Data\Sys\GC\font_ansi.bin" - File "..\Data\Sys\GC\font_sjis.bin" - SetOutPath "$INSTDIR\Sys\Wii" - SetOverwrite ifnewer - File "..\Data\Sys\Wii\setting-eur.txt" - File "..\Data\Sys\Wii\setting-jpn.txt" - File "..\Data\Sys\Wii\setting-usa.txt" - - ; GC/Wii User settings - SetOutPath "$INSTDIR\User\GC" - SetOutPath "$INSTDIR\User\Wii\shared2\sys" - SetOverwrite ifnewer - File "..\Data\User\Wii\shared2\sys\readme.txt" - File "..\Data\User\Wii\shared2\sys\SYSCONF" - - ; GameConfigs - SetOutPath "$INSTDIR\User\GameConfig" - SetOverwrite ifnewer - File "..\Data\User\GameConfig\*.*" -SectionEnd - -Section -AdditionalIcons - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Dolphin.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Dolphin.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" -SectionEnd - -; Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "It is recommended that you install all of the included files." -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was uninstalled successfully.$\r$\n\ - ATTENTION: You must manually delete$\r$\n$INSTDIR" -FunctionEnd - -Function un.onInit -!insertmacro MUI_UNGETLANGUAGE - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to remove $(^Name)?" IDYES +2 - Abort -FunctionEnd - -Section Uninstall - SetShellVarContext all - ; Only uninstall what we put there; all $INSTDIR\User is left as is - Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\*.dll" - Delete "$INSTDIR\Plugins\*.dll" - Delete "$INSTDIR\Sys\Wii\setting-usa.txt" - Delete "$INSTDIR\Sys\Wii\setting-jpn.txt" - Delete "$INSTDIR\Sys\Wii\setting-eur.txt" - Delete "$INSTDIR\Sys\GC\font_sjis.bin" - Delete "$INSTDIR\Sys\GC\font_ansi.bin" - Delete "$INSTDIR\Dolphin.exe" - - Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" - Delete "$DESKTOP\Dolphin.lnk" - Delete "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin.lnk" - - RMDir "$SMPROGRAMS\${PRODUCT_NAME}" - RMDir "$INSTDIR\Sys\GC" - RMDir "$INSTDIR\Sys\Wii" - RMDir "$INSTDIR\Sys" - RMDir "$INSTDIR\Plugins" - RMDir "$INSTDIR" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose true -SectionEnd - -Function LaunchDolphin - ExecShell "" "$DESKTOP\Dolphin.lnk" -FunctionEnd +!include Installer.nsi \ No newline at end of file diff --git a/Installer/Installer_x64.nsi b/Installer/Installer_x64.nsi index ff78b5aa5d..3b6ee79f50 100644 --- a/Installer/Installer_x64.nsi +++ b/Installer/Installer_x64.nsi @@ -1,249 +1,5 @@ -!system "GetSVNRev.exe" ; ATTENTION: This MUST be run before this script -!include "svnrev.txt" ; !defines PRODUCT_VERSION -!define BASE_DIR "..\Binary\x64" +!define DOLPHIN_ARCH x64 +!define BASE_INSTALL_DIR "$PROGRAMFILES64" +!define PRODUCT_NAME "Dolphin" -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "Dolphin x64" -!define PRODUCT_PUBLISHER "Dolphin Team" -!define PRODUCT_WEB_SITE "http://www.dolphin-emu.com" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Dolphin.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" - -SetCompressor lzma - -; MUI 1.67 compatible ------ -!include "MUI.nsh" - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "Dolphin.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" - -; Language Selection Dialog Settings -!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" -!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" - -; License page -!insertmacro MUI_PAGE_LICENSE "Licence.txt" -; Components page -!insertmacro MUI_PAGE_COMPONENTS -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -; We launch the desktop shortcut to set the working dir -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_RUN_TEXT "Start $(^Name)" -!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchDolphin" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "Afrikaans" -!insertmacro MUI_LANGUAGE "Albanian" -!insertmacro MUI_LANGUAGE "Arabic" -!insertmacro MUI_LANGUAGE "Basque" -!insertmacro MUI_LANGUAGE "Belarusian" -!insertmacro MUI_LANGUAGE "Bosnian" -!insertmacro MUI_LANGUAGE "Breton" -!insertmacro MUI_LANGUAGE "Bulgarian" -!insertmacro MUI_LANGUAGE "Catalan" -!insertmacro MUI_LANGUAGE "Croatian" -!insertmacro MUI_LANGUAGE "Czech" -!insertmacro MUI_LANGUAGE "Danish" -!insertmacro MUI_LANGUAGE "Dutch" -!insertmacro MUI_LANGUAGE "English" -!insertmacro MUI_LANGUAGE "Estonian" -!insertmacro MUI_LANGUAGE "Farsi" -!insertmacro MUI_LANGUAGE "Finnish" -!insertmacro MUI_LANGUAGE "French" -!insertmacro MUI_LANGUAGE "Galician" -!insertmacro MUI_LANGUAGE "German" -!insertmacro MUI_LANGUAGE "Greek" -!insertmacro MUI_LANGUAGE "Hebrew" -!insertmacro MUI_LANGUAGE "Hungarian" -!insertmacro MUI_LANGUAGE "Icelandic" -!insertmacro MUI_LANGUAGE "Indonesian" -!insertmacro MUI_LANGUAGE "Irish" -!insertmacro MUI_LANGUAGE "Italian" -!insertmacro MUI_LANGUAGE "Japanese" -!insertmacro MUI_LANGUAGE "Korean" -!insertmacro MUI_LANGUAGE "Kurdish" -!insertmacro MUI_LANGUAGE "Latvian" -!insertmacro MUI_LANGUAGE "Lithuanian" -!insertmacro MUI_LANGUAGE "Luxembourgish" -!insertmacro MUI_LANGUAGE "Macedonian" -!insertmacro MUI_LANGUAGE "Malay" -!insertmacro MUI_LANGUAGE "Mongolian" -!insertmacro MUI_LANGUAGE "Norwegian" -!insertmacro MUI_LANGUAGE "NorwegianNynorsk" -!insertmacro MUI_LANGUAGE "Polish" -!insertmacro MUI_LANGUAGE "Portuguese" -!insertmacro MUI_LANGUAGE "PortugueseBR" -!insertmacro MUI_LANGUAGE "Romanian" -!insertmacro MUI_LANGUAGE "Russian" -!insertmacro MUI_LANGUAGE "Serbian" -!insertmacro MUI_LANGUAGE "SerbianLatin" -!insertmacro MUI_LANGUAGE "SimpChinese" -!insertmacro MUI_LANGUAGE "Slovak" -!insertmacro MUI_LANGUAGE "Slovenian" -!insertmacro MUI_LANGUAGE "Spanish" -!insertmacro MUI_LANGUAGE "SpanishInternational" -!insertmacro MUI_LANGUAGE "Swedish" -!insertmacro MUI_LANGUAGE "Thai" -!insertmacro MUI_LANGUAGE "TradChinese" -!insertmacro MUI_LANGUAGE "Turkish" -!insertmacro MUI_LANGUAGE "Ukrainian" -!insertmacro MUI_LANGUAGE "Uzbek" -!insertmacro MUI_LANGUAGE "Welsh" - -; Reserve files -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - -; MUI end ------ - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -!define UN_NAME "Uninstall $(^Name)" -OutFile "Dolphin_Installer_x64.exe" -InstallDir "$PROGRAMFILES64\$(^Name)" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -Function .onInit - !include "x64.nsh" - ; This checks if nsis is running under wow64 (since nsis is only 32bit) - ; hopefully this will be dependable in the future too... - ${If} ${RunningX64} - !insertmacro MUI_LANGDLL_DISPLAY - SetRegView 64 - ${Else} - MessageBox MB_OK|MB_ICONSTOP "You cannot run this version of Dolphin on your OS.$\r$\n\ - Please use a 64-bit OS or download a 32-bit version of Dolphin." - Quit - ${EndIf} -FunctionEnd - -Section "Complete" SEC01 - SetShellVarContext all - ; Dolphin exe and dlls - ; TODO: Make a nice subsection-ized display - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - File "${BASE_DIR}\Dolphin.exe" - File "..\Externals\WiiUse\X64\wiiuse.dll" - File "..\Externals\SDL\x64\SDL.dll" - File "..\Externals\OpenAL\win64\OpenAL32.dll" - File "..\Externals\OpenAL\win64\wrap_oal.dll" - ; This needs to be done after Dolphin.exe is copied - CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin x64.lnk" "$INSTDIR\Dolphin.exe" - CreateShortCut "$DESKTOP\Dolphin x64.lnk" "$INSTDIR\Dolphin.exe" - - ; Plugins - SetOutPath "$INSTDIR\Plugins" - SetOverwrite ifnewer - File "${BASE_DIR}\Plugins\Plugin_DSP_HLE.dll" - File "${BASE_DIR}\Plugins\Plugin_DSP_LLE.dll" - File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL.dll" - File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL_Test.dll" - File "${BASE_DIR}\Plugins\Plugin_PadSimple.dll" - File "${BASE_DIR}\Plugins\Plugin_VideoDX9.dll" - File "${BASE_DIR}\Plugins\Plugin_VideoOGL.dll" - File "${BASE_DIR}\Plugins\Plugin_Wiimote.dll" - File "${BASE_DIR}\Plugins\Plugin_VideoSW.dll" - - ; GC/Wii static settings - SetOutPath "$INSTDIR\Sys\GC" - SetOverwrite ifnewer - File "..\Data\Sys\GC\font_ansi.bin" - File "..\Data\Sys\GC\font_sjis.bin" - SetOutPath "$INSTDIR\Sys\Wii" - SetOverwrite ifnewer - File "..\Data\Sys\Wii\setting-eur.txt" - File "..\Data\Sys\Wii\setting-jpn.txt" - File "..\Data\Sys\Wii\setting-usa.txt" - - ; GC/Wii User settings - SetOutPath "$INSTDIR\User\GC" - SetOutPath "$INSTDIR\User\Wii\shared2\sys" - SetOverwrite ifnewer - File "..\Data\User\Wii\shared2\sys\readme.txt" - File "..\Data\User\Wii\shared2\sys\SYSCONF" - - ; GameConfigs - SetOutPath "$INSTDIR\User\GameConfig" - SetOverwrite ifnewer - File "..\Data\User\GameConfig\*.*" -SectionEnd - -Section -AdditionalIcons - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Dolphin.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Dolphin.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" -SectionEnd - -; Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "It is recommended that you install all of the included files." -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was uninstalled successfully.$\r$\n\ - ATTENTION: You must manually delete$\r$\n$INSTDIR" -FunctionEnd - -Function un.onInit -!insertmacro MUI_UNGETLANGUAGE - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to remove $(^Name)?" IDYES +2 - Abort -FunctionEnd - -Section Uninstall - SetShellVarContext all - ; Only uninstall what we put there; all $INSTDIR\User is left as is - Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\*.dll" - Delete "$INSTDIR\Plugins\*.dll" - Delete "$INSTDIR\Sys\Wii\setting-usa.txt" - Delete "$INSTDIR\Sys\Wii\setting-jpn.txt" - Delete "$INSTDIR\Sys\Wii\setting-eur.txt" - Delete "$INSTDIR\Sys\GC\font_sjis.bin" - Delete "$INSTDIR\Sys\GC\font_ansi.bin" - Delete "$INSTDIR\Dolphin.exe" - - Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" - Delete "$DESKTOP\Dolphin x64.lnk" - Delete "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin x64.lnk" - - RMDir "$SMPROGRAMS\${PRODUCT_NAME}" - RMDir "$INSTDIR\Sys\GC" - RMDir "$INSTDIR\Sys\Wii" - RMDir "$INSTDIR\Sys" - RMDir "$INSTDIR\Plugins" - RMDir "$INSTDIR" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose true -SectionEnd - -Function LaunchDolphin - ExecShell "" "$DESKTOP\Dolphin x64.lnk" -FunctionEnd +!include Installer.nsi \ No newline at end of file diff --git a/Installer/dxredist/APR2007_xinput_x64.cab b/Installer/dxredist/APR2007_xinput_x64.cab new file mode 100644 index 0000000000000000000000000000000000000000..732f8a8f368bae8655ec4f44a436a513719cb0fe GIT binary patch literal 96817 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


w3&q+F5LJBlR$}BDFaSe|5uF?Rb&2JR;RVua6x3 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 z

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 literal 0 HcmV?d00001 diff --git a/Installer/dxredist/APR2007_xinput_x86.cab b/Installer/dxredist/APR2007_xinput_x86.cab new file mode 100644 index 0000000000000000000000000000000000000000..f414d5557126ac0e2d03198571b9a16c489444e7 GIT binary patch literal 53302 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 literal 0 HcmV?d00001 diff --git a/Installer/dxredist/DSETUP.dll b/Installer/dxredist/DSETUP.dll new file mode 100644 index 0000000000000000000000000000000000000000..691025af7e6b0c37f524e8af87889da2de71be01 GIT binary patch literal 95576 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 T=4w(5Tc>{Q?0rJ|`IP?xPiNq> literal 0 HcmV?d00001 diff --git a/Installer/dxredist/DXSETUP.exe b/Installer/dxredist/DXSETUP.exe new file mode 100644 index 0000000000000000000000000000000000000000..5d062aa978756af7065028329ac3eced119e9400 GIT binary patch literal 517976 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

AVm~6dqQL1N>0hLKR&6xG_hW%~ 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

    &N*uHHZz4UhxIZXd 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,ZjPq#NfuSOu8go4dg&i6_HzHEpOWIX9 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 mvQ1Uikix5^-{$|JRLnUhqieF4 literal 0 HcmV?d00001 diff --git a/Installer/dxredist/dsetup32.dll b/Installer/dxredist/dsetup32.dll new file mode 100644 index 0000000000000000000000000000000000000000..1781afa4b0eed11faf749d6a0907a78c04c821a9 GIT binary patch literal 1566040 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

    pXK$Ihsd4O6;M))Xm&e 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 z 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 KdGAsLwvYgEDd?yG literal 0 HcmV?d00001 diff --git a/Installer/dxredist/dxupdate.cab b/Installer/dxredist/dxupdate.cab new file mode 100644 index 0000000000000000000000000000000000000000..ed3b5b89f5b7553615f82409b5ed04608453f9cf GIT binary patch literal 97152 zcmYg%V~j357wy>g8QZp>v2n(>ZQHhO+qQAWwrzXvd%xTtw@tf}wUsn!)9l^KDhZ1L z{nt2+f&VW6iTrN{0s;jF1_A{F15!i)0z&&Ahx9)k3C#be@E>ITH=uz2vug(Vf21!z z5E&4VvAc`Cv4OJ*y|J}55F_({vi~WV^X--Xe?kjeQy?aAU?9em|7-2b5B&dI8d;bE zDUaa|1X2L`3rk;V`b3kCsnl)a?(yJW3M7~i9W|5GHDR`j^YQU*^U)A@0InlmX}X+V zLaaGoXP%~;?Ml7QZq^Zbz-Zp$DE-mFjcMaSBvg$HkZ4iBQ8UI-C_$jL$R&_b#=(L? zA`783Ks2C`ed{{CO3hqfT-EL_==D5|g4XG3`W*(S0wjVJaGwqBD4Tm2qZJKyF%KLl!3y;4u3?7C z57l-)cd8IiSbaYc`y74&-R~=6z`H-0E%z9Hzn3v_d+#?oe)abde!fPBeQ%HQ9J&LK zDQX0p?pc7mnY>x+FFrqC(%+rE*_`}siq6MIJD%toz0T>}zSmU>mt6yC#ILuKs%XBJ zVfFNs@0qDItgg^Bv$V5EY`?L~xJEeNV4X>=zA&2mxO;6wM7;xo)itz-u`~M!zSxb` z{zJElyJxb}-4=lkJGzFfTgV@I=9fh`te{U{C)?_N5j}3azQhl4s@&Zx1``kkJ%-r> zsAxWobN7m{*R+*~-af=x`&7oaUfqbK_87Mv$fpoNpQ}ZRJN(+=A3~7Ar@t#4t%0X? zx&17&2Cl!qpMbA(NNH=ldPpeXSrC5b_?Rhq{iE{=!!4bDgnUqU>^qHqSpPI2J;-iw zcbq$)em~Hg2m#1FkQX4PJ+6K`;9iI~t$qOL4siWE$|qGn%$^zWrauKR)1F2Dqdx

    +T-v;yx{YKJ{3G7z%^Xw4%sM75Rd}q2d8amsF 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 Date: Sat, 21 Sep 2013 07:29:41 +0200 Subject: [PATCH 247/267] Dolphin 4.0 release --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1e1fa5537..96685e68d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ if (APPLE) endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -set(DOLPHIN_IS_STABLE FALSE) +set(DOLPHIN_IS_STABLE TRUE) # Set up paths if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) @@ -104,8 +104,8 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION) endif() # version number -set(DOLPHIN_VERSION_MAJOR "3") -set(DOLPHIN_VERSION_MINOR "5") +set(DOLPHIN_VERSION_MAJOR "4") +set(DOLPHIN_VERSION_MINOR "0") if(DOLPHIN_IS_STABLE) set(DOLPHIN_VERSION_PATCH "0") else() From 91619e28b85d513d0676accf3c785e10c31cb1b8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 22 Sep 2013 09:10:47 -0500 Subject: [PATCH 248/267] Pull in the glRenderbufferStorageMultisample function pointer at run time. --- Externals/GLES3/GLES3/gl3.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp | 1 + Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp | 4 ++++ Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h | 7 ++++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Externals/GLES3/GLES3/gl3.h b/Externals/GLES3/GLES3/gl3.h index e5bf8f5bfc..01cbeaacf7 100644 --- a/Externals/GLES3/GLES3/gl3.h +++ b/Externals/GLES3/GLES3/gl3.h @@ -965,7 +965,7 @@ GL_APICALL void GL_APIENTRY glUniformMatrix2x4fv (GLint location, GLsi GL_APICALL void GL_APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); GL_APICALL void GL_APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); GL_APICALL void GL_APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +//GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); GL_APICALL void GL_APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); GL_APICALL void GL_APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length); GL_APICALL GLboolean GL_APIENTRY glIsVertexArray (GLuint array); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 9eac9f603b..a9ea7fbb4e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -6,6 +6,7 @@ #include "FramebufferManager.h" #include "VertexShaderGen.h" #include "OnScreenDisplay.h" +#include "GLFunctions.h" #include "TextureConverter.h" #include "Render.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp index 8360f9631e..073e5cc513 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp @@ -32,6 +32,8 @@ PFNGLPROGRAMPARAMETERIPROC glProgramParameteri; PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; +PFNGLRENDERBUFFERSTORAGEMULTISAMPLE glRenderbufferStorageMultisample; + PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex; PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding; @@ -98,6 +100,8 @@ namespace GLFunc LoadFunction("glDrawRangeElements", (void**)&glDrawRangeElements); + LoadFunction("glRenderbufferStorageMultisample", (void**)&glRenderbufferStorageMultisample); + LoadFunction("glGetUniformBlockIndex", (void**)&glGetUniformBlockIndex); LoadFunction("glUniformBlockBinding", (void**)&glUniformBlockBinding); dlclose(self); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h index 74fed7e227..cbfde1276c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h @@ -30,7 +30,7 @@ typedef void (*PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler); typedef void (*PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint * samplers); typedef void (*PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers); -//Program binar +//Program binary typedef void (*PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum *binaryFormat, GLvoid*binary); typedef void (*PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void* binary, GLsizei length); typedef void (*PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value); @@ -48,6 +48,9 @@ typedef void (*PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids); // glDraw* typedef void (*PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices); +// Multisample buffer +typedef void (*PFNGLRENDERBUFFERSTORAGEMULTISAMPLE) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); + // ptrs extern PFNGLBEGINQUERYPROC glBeginQuery; extern PFNGLENDQUERYPROC glEndQuery; @@ -75,6 +78,8 @@ extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri; extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; +extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLE glRenderbufferStorageMultisample; + //Sampler extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf; extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri; From 81effb80993c3f64e368f4e9fdd551e60ce2f8c0 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 22 Sep 2013 09:25:38 -0500 Subject: [PATCH 249/267] [Android] Add in FSAA option. --- Source/Android/res/values/arrays.xml | 14 +++++++++++++- Source/Android/res/values/strings.xml | 2 ++ Source/Android/res/xml/video_prefs.xml | 7 +++++++ .../dolphinemu/settings/UserPreferences.java | 5 +++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Source/Android/res/values/arrays.xml b/Source/Android/res/values/arrays.xml index 2144440a33..8e75554384 100644 --- a/Source/Android/res/values/arrays.xml +++ b/Source/Android/res/values/arrays.xml @@ -108,7 +108,19 @@ 6 7 - + + + + 1x + 2x + 4x + + + 0 + 1 + 2 + + 1x diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index 5c8a1269af..8c99835d1f 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -86,6 +86,8 @@ Enhancements Internal Resolution Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games. + Fullscreen antialiasing + Reduces the amount of aliasing caused by rasterizing 3D graphics. This makes the rendered picture look less blocky. Heavily decreases emulation speed and sometimes causes issues. Anisotropic Filtering Enhances visual quality of textures that are at oblique viewing angles. Might cause issues in a small number of games. Scaled EFB Copy diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml index 311c6ce8a9..72a50c4f3a 100644 --- a/Source/Android/res/xml/video_prefs.xml +++ b/Source/Android/res/xml/video_prefs.xml @@ -14,6 +14,13 @@ android:summary="@string/internal_resolution_descrip" android:title="@string/internal_resolution"/> + + Date: Sun, 22 Sep 2013 16:28:09 +0200 Subject: [PATCH 250/267] We're not stable anymore :( --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96685e68d9..966cd44efc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ if (APPLE) endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -set(DOLPHIN_IS_STABLE TRUE) +set(DOLPHIN_IS_STABLE FALSE) # Set up paths if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) From bdae5d1027080603d5589c459d6d91823f42f301 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 22 Sep 2013 11:59:10 -0500 Subject: [PATCH 251/267] [Android] Fix typo, FSAA stands for full scene antialiasing. --- Source/Android/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index 8c99835d1f..e61264d5a5 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -86,7 +86,7 @@ Enhancements Internal Resolution Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games. - Fullscreen antialiasing + Full Scene Antialiasing Reduces the amount of aliasing caused by rasterizing 3D graphics. This makes the rendered picture look less blocky. Heavily decreases emulation speed and sometimes causes issues. Anisotropic Filtering Enhances visual quality of textures that are at oblique viewing angles. Might cause issues in a small number of games. From 9a6f28fce486f351c19a304f5ede5662ea802357 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 22 Sep 2013 14:29:35 -0400 Subject: [PATCH 252/267] Revert "Fix stack misalignment issues." This reverts commit d334a9bc23a7641143937042658f64fc9c1b7a92. This breaks single core. --- Source/Core/Common/Src/x64ABI.cpp | 275 +++++++++++-------- Source/Core/Common/Src/x64Emitter.h | 11 +- Source/Core/Common/Src/x64Thunk.cpp | 20 +- Source/Core/VideoCommon/Src/VertexLoader.cpp | 5 +- Source/Core/VideoCommon/Src/x64DLCache.cpp | 5 +- 5 files changed, 182 insertions(+), 134 deletions(-) diff --git a/Source/Core/Common/Src/x64ABI.cpp b/Source/Core/Common/Src/x64ABI.cpp index b5726947fc..c47ea02fb4 100644 --- a/Source/Core/Common/Src/x64ABI.cpp +++ b/Source/Core/Common/Src/x64ABI.cpp @@ -10,51 +10,38 @@ using namespace Gen; // Shared code between Win64 and Unix64 -unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog) { - // On platforms other than Windows 32-bit: At the beginning of a function, - // the stack pointer is 4/8 bytes less than a multiple of 16; however, the - // function prolog immediately subtracts an appropriate amount to align - // it, so no alignment is required around a call. - // In the functions generated by ThunkManager::ProtectFunction, we add the - // necessary subtraction (and 0x20 bytes shadow space for Win64) into this - // rather than having a separate prolog. - // On Windows 32-bit, the required alignment is only 4 bytes, so we just - // ensure that the frame size isn't misaligned. -#ifdef _M_X64 - // expect frameSize == 0 - frameSize = noProlog ? 0x28 : 0; -#elif defined(_WIN32) - frameSize = (frameSize + 3) & -4; -#else - unsigned int existingAlignment = noProlog ? 0xc : 0; - frameSize -= existingAlignment; - frameSize = (frameSize + 15) & -16; - frameSize += existingAlignment; +// Sets up a __cdecl function. +void XEmitter::ABI_EmitPrologue(int maxCallParams) +{ +#ifdef _M_IX86 + // Don't really need to do anything +#elif defined(_M_X64) +#if _WIN32 + int stacksize = ((maxCallParams + 1) & ~1) * 8 + 8; + // Set up a stack frame so that we can call functions + // TODO: use maxCallParams + SUB(64, R(RSP), Imm8(stacksize)); +#endif +#else +#error Arch not supported #endif - return frameSize; } -void XEmitter::ABI_AlignStack(unsigned int frameSize, bool noProlog) { - unsigned int fillSize = - ABI_GetAlignedFrameSize(frameSize, noProlog) - frameSize; - if (fillSize != 0) { -#ifdef _M_X64 - SUB(64, R(RSP), Imm8(fillSize)); -#else - SUB(32, R(ESP), Imm8(fillSize)); +void XEmitter::ABI_EmitEpilogue(int maxCallParams) +{ +#ifdef _M_IX86 + RET(); +#elif defined(_M_X64) +#ifdef _WIN32 + int stacksize = ((maxCallParams+1)&~1)*8 + 8; + ADD(64, R(RSP), Imm8(stacksize)); #endif - } -} + RET(); +#else +#error Arch not supported + -void XEmitter::ABI_RestoreStack(unsigned int frameSize, bool noProlog) { - unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize, noProlog); - if (alignedSize != 0) { -#ifdef _M_X64 - ADD(64, R(RSP), Imm8(alignedSize)); -#else - ADD(32, R(ESP), Imm8(alignedSize)); #endif - } } #ifdef _M_IX86 // All32 @@ -78,7 +65,7 @@ void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { PUSH(16, Imm16(param2)); PUSH(32, Imm32(param1)); CALL(func); - ABI_AlignStack(1 * 2 + 1 * 4); + ABI_RestoreStack(1 * 2 + 1 * 4); } void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { @@ -169,27 +156,60 @@ void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) } void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { + // Note: 4 * 4 = 16 bytes, so alignment is preserved. PUSH(EBP); - MOV(32, R(EBP), R(ESP)); PUSH(EBX); PUSH(ESI); PUSH(EDI); - SUB(32, R(ESP), Imm8(0xc)); } void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { - ADD(32, R(ESP), Imm8(0xc)); POP(EDI); POP(ESI); POP(EBX); POP(EBP); } +unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { + frameSize += 4; // reserve space for return address + unsigned int alignedSize = +#ifdef __GNUC__ + (frameSize + 15) & -16; +#else + (frameSize + 3) & -4; +#endif + return alignedSize; +} + + +void XEmitter::ABI_AlignStack(unsigned int frameSize) { +// Mac OS X requires the stack to be 16-byte aligned before every call. +// Linux requires the stack to be 16-byte aligned before calls that put SSE +// vectors on the stack, but since we do not keep track of which calls do that, +// it is effectively every call as well. +// Windows binaries compiled with MSVC do not have such a restriction*, but I +// expect that GCC on Windows acts the same as GCC on Linux in this respect. +// It would be nice if someone could verify this. +// *However, the MSVC optimizing compiler assumes a 4-byte-aligned stack at times. + unsigned int fillSize = + ABI_GetAlignedFrameSize(frameSize) - (frameSize + 4); + if (fillSize != 0) { + SUB(32, R(ESP), Imm8(fillSize)); + } +} + +void XEmitter::ABI_RestoreStack(unsigned int frameSize) { + unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize); + alignedSize -= 4; // return address is POPped at end of call + if (alignedSize != 0) { + ADD(32, R(ESP), Imm8(alignedSize)); + } +} + #else //64bit // Common functions void XEmitter::ABI_CallFunction(void *func) { - ABI_AlignStack(0); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL && distance < 0xFFFFFFFF80000000ULL) { @@ -199,11 +219,9 @@ void XEmitter::ABI_CallFunction(void *func) { } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) { - ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32((u32)param1)); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL @@ -214,11 +232,9 @@ void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) { } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { - ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32((u32)param2)); u64 distance = u64(func) - (u64(code) + 5); @@ -230,11 +246,9 @@ void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { - ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL @@ -245,11 +259,9 @@ void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) { - ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); u64 distance = u64(func) - (u64(code) + 5); @@ -261,11 +273,9 @@ void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) { } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3) { - ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -278,11 +288,9 @@ void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3) { - ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(64, R(ABI_PARAM3), Imm64((u64)param3)); @@ -295,11 +303,9 @@ void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *par } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 param3, void *param4) { - ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -313,11 +319,9 @@ void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 para } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 param3) { - ABI_AlignStack(0); MOV(64, R(ABI_PARAM1), Imm64((u64)param1)); MOV(64, R(ABI_PARAM2), Imm64((u64)param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -330,12 +334,10 @@ void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 p } else { CALL(func); } - ABI_RestoreStack(0); } // Pass a register as a parameter. void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) { - ABI_AlignStack(0); if (reg1 != ABI_PARAM1) MOV(32, R(ABI_PARAM1), R(reg1)); u64 distance = u64(func) - (u64(code) + 5); @@ -347,12 +349,10 @@ void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) { } else { CALL(func); } - ABI_RestoreStack(0); } // Pass two registers as parameters. void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2) { - ABI_AlignStack(0); if (reg2 != ABI_PARAM1) { if (reg1 != ABI_PARAM1) MOV(64, R(ABI_PARAM1), R(reg1)); @@ -373,12 +373,10 @@ void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2) { } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2) { - ABI_AlignStack(0); if (!arg1.IsSimpleReg(ABI_PARAM1)) MOV(32, R(ABI_PARAM1), arg1); MOV(32, R(ABI_PARAM2), Imm32(param2)); @@ -391,12 +389,10 @@ void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2 } else { CALL(func); } - ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) { - ABI_AlignStack(0); if (!arg1.IsSimpleReg(ABI_PARAM1)) MOV(32, R(ABI_PARAM1), arg1); u64 distance = u64(func) - (u64(code) + 5); @@ -408,7 +404,95 @@ void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) } else { CALL(func); } +} + +unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { + return frameSize; +} + +#ifdef _WIN32 + +// Win64 Specific Code +void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { + //we only want to do this once + PUSH(RBX); + PUSH(RSI); + PUSH(RDI); + PUSH(RBP); + PUSH(R12); + PUSH(R13); + PUSH(R14); + PUSH(R15); + //TODO: Also preserve XMM0-3? + ABI_AlignStack(0); +} + +void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { ABI_RestoreStack(0); + POP(R15); + POP(R14); + POP(R13); + POP(R12); + POP(RBP); + POP(RDI); + POP(RSI); + POP(RBX); +} + +// Win64 Specific Code +void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { + PUSH(RCX); + PUSH(RDX); + PUSH(RSI); + PUSH(RDI); + PUSH(R8); + PUSH(R9); + PUSH(R10); + PUSH(R11); + //TODO: Also preserve XMM0-15? + ABI_AlignStack(0); +} + +void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { + ABI_RestoreStack(0); + POP(R11); + POP(R10); + POP(R9); + POP(R8); + POP(RDI); + POP(RSI); + POP(RDX); + POP(RCX); +} + +void XEmitter::ABI_AlignStack(unsigned int /*frameSize*/) { + SUB(64, R(RSP), Imm8(0x28)); +} + +void XEmitter::ABI_RestoreStack(unsigned int /*frameSize*/) { + ADD(64, R(RSP), Imm8(0x28)); +} + +#else +// Unix64 Specific Code +void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { + PUSH(RBX); + PUSH(RBP); + PUSH(R12); + PUSH(R13); + PUSH(R14); + PUSH(R15); + PUSH(R15); //just to align stack. duped push/pop doesn't hurt. +} + +void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { + POP(R15); + POP(R15); + POP(R14); + POP(R13); + POP(R12); + POP(RBP); + POP(RBX); } void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { @@ -435,59 +519,12 @@ void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { POP(RCX); } - -#ifdef _WIN32 -// Win64 Specific Code - -void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - //we only want to do this once - PUSH(RBP); - MOV(64, R(RBP), R(RSP)); - PUSH(RBX); - PUSH(RSI); - PUSH(RDI); - PUSH(R12); - PUSH(R13); - PUSH(R14); - PUSH(R15); - SUB(64, R(RSP), Imm8(0x28)); - //TODO: Also preserve XMM0-3? +void XEmitter::ABI_AlignStack(unsigned int /*frameSize*/) { + SUB(64, R(RSP), Imm8(0x08)); } -void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { - ADD(64, R(RSP), Imm8(0x28)); - POP(R15); - POP(R14); - POP(R13); - POP(R12); - POP(RDI); - POP(RSI); - POP(RBX); - POP(RBP); -} - -#else -// Unix64 Specific Code - -void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - PUSH(RBP); - MOV(64, R(RBP), R(RSP)); - PUSH(RBX); - PUSH(R12); - PUSH(R13); - PUSH(R14); - PUSH(R15); - SUB(64, R(RSP), Imm8(8)); -} - -void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { - ADD(64, R(RSP), Imm8(8)); - POP(R15); - POP(R14); - POP(R13); - POP(R12); - POP(RBX); - POP(RBP); +void XEmitter::ABI_RestoreStack(unsigned int /*frameSize*/) { + ADD(64, R(RSP), Imm8(0x08)); } #endif // WIN32 diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index c42c955ec4..b068579a3a 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -652,9 +652,14 @@ public: void ABI_PushAllCallerSavedRegsAndAdjustStack(); void ABI_PopAllCallerSavedRegsAndAdjustStack(); - unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog = false); - void ABI_AlignStack(unsigned int frameSize, bool noProlog = false); - void ABI_RestoreStack(unsigned int frameSize, bool noProlog = false); + unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize); + void ABI_AlignStack(unsigned int frameSize); + void ABI_RestoreStack(unsigned int frameSize); + + // Sets up a __cdecl function. + // Only x64 really needs the parameter count. + void ABI_EmitPrologue(int maxCallParams); + void ABI_EmitEpilogue(int maxCallParams); #ifdef _M_IX86 inline int ABI_GetNumXMMRegs() { return 8; } diff --git a/Source/Core/Common/Src/x64Thunk.cpp b/Source/Core/Common/Src/x64Thunk.cpp index a9c19060de..efb876ce81 100644 --- a/Source/Core/Common/Src/x64Thunk.cpp +++ b/Source/Core/Common/Src/x64Thunk.cpp @@ -91,27 +91,35 @@ void *ThunkManager::ProtectFunction(void *function, int num_params) PanicAlert("Trying to protect functions before the emu is started. Bad bad bad."); const u8 *call_point = GetCodePtr(); -#ifdef _M_X64 // Make sure to align stack. - ABI_AlignStack(0, true); +#ifdef _M_X64 +#ifdef _WIN32 + SUB(64, R(ESP), Imm8(0x28)); +#else + SUB(64, R(ESP), Imm8(0x8)); +#endif CALL((void*)save_regs); CALL((void*)function); CALL((void*)load_regs); - ABI_RestoreStack(0, true); +#ifdef _WIN32 + ADD(64, R(ESP), Imm8(0x28)); +#else + ADD(64, R(ESP), Imm8(0x8)); +#endif RET(); #else CALL((void*)save_regs); // Since parameters are in the previous stack frame, not in registers, this takes some // trickery : we simply re-push the parameters. might not be optimal, but that doesn't really // matter. - ABI_AlignStack(num_params * 4, true); + ABI_AlignStack(num_params * 4); unsigned int alignedSize = ABI_GetAlignedFrameSize(num_params * 4); for (int i = 0; i < num_params; i++) { // ESP is changing, so we do not need i - PUSH(32, MDisp(ESP, alignedSize)); + PUSH(32, MDisp(ESP, alignedSize - 4)); } CALL(function); - ABI_RestoreStack(num_params * 4, true); + ABI_RestoreStack(num_params * 4); CALL((void*)load_regs); RET(); #endif diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index 825e9c6558..babaff83a5 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -217,7 +217,7 @@ void VertexLoader::CompileVertexTranslator() PanicAlert("Trying to recompile a vertex translator"); m_compiledCode = GetCodePtr(); - ABI_PushAllCalleeSavedRegsAndAdjustStack(); + ABI_EmitPrologue(4); // Start loop here const u8 *loop_start = GetCodePtr(); @@ -499,8 +499,7 @@ void VertexLoader::CompileVertexTranslator() #endif J_CC(CC_NZ, loop_start, true); - ABI_PopAllCalleeSavedRegsAndAdjustStack(); - RET(); + ABI_EmitEpilogue(4); #endif m_NativeFmt->Initialize(vtx_decl); } diff --git a/Source/Core/VideoCommon/Src/x64DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp index b412c2e274..ae32ea5ea9 100644 --- a/Source/Core/VideoCommon/Src/x64DLCache.cpp +++ b/Source/Core/VideoCommon/Src/x64DLCache.cpp @@ -409,7 +409,7 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) emitter.AlignCode4(); dl->compiled_code = emitter.GetCodePtr(); - emitter.ABI_PushAllCalleeSavedRegsAndAdjustStack(); + emitter.ABI_EmitPrologue(4); while (g_pVideoData < end) { @@ -572,8 +572,7 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) break; } } - emitter.ABI_PopAllCalleeSavedRegsAndAdjustStack(); - emitter.RET(); + emitter.ABI_EmitEpilogue(4); INCSTAT(stats.numDListsCalled); INCSTAT(stats.thisFrame.numDListsCalled); Statistics::SwapDL(); From 6209067daa5121e383d173f7272bbf20bc108047 Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 22 Sep 2013 15:48:27 -0400 Subject: [PATCH 253/267] Fix stack misalignment fix. --- Source/Core/Common/Src/x64ABI.cpp | 247 ++++++++---------- Source/Core/Common/Src/x64Emitter.h | 13 +- Source/Core/Common/Src/x64Thunk.cpp | 20 +- .../Src/PowerPC/JitCommon/JitAsmCommon.cpp | 26 +- .../Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 8 +- .../Core/Src/PowerPC/JitCommon/Jit_Util.h | 2 +- Source/Core/VideoCommon/Src/VertexLoader.cpp | 5 +- Source/Core/VideoCommon/Src/x64DLCache.cpp | 5 +- 8 files changed, 139 insertions(+), 187 deletions(-) diff --git a/Source/Core/Common/Src/x64ABI.cpp b/Source/Core/Common/Src/x64ABI.cpp index c47ea02fb4..1b4fa0b5ff 100644 --- a/Source/Core/Common/Src/x64ABI.cpp +++ b/Source/Core/Common/Src/x64ABI.cpp @@ -10,38 +10,51 @@ using namespace Gen; // Shared code between Win64 and Unix64 -// Sets up a __cdecl function. -void XEmitter::ABI_EmitPrologue(int maxCallParams) -{ -#ifdef _M_IX86 - // Don't really need to do anything -#elif defined(_M_X64) -#if _WIN32 - int stacksize = ((maxCallParams + 1) & ~1) * 8 + 8; - // Set up a stack frame so that we can call functions - // TODO: use maxCallParams - SUB(64, R(RSP), Imm8(stacksize)); -#endif +unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog) { + // On platforms other than Windows 32-bit: At the beginning of a function, + // the stack pointer is 4/8 bytes less than a multiple of 16; however, the + // function prolog immediately subtracts an appropriate amount to align + // it, so no alignment is required around a call. + // In the functions generated by ThunkManager::ProtectFunction and some + // others, we add the necessary subtraction (and 0x20 bytes shadow space + // for Win64) into this rather than having a separate prolog. + // On Windows 32-bit, the required alignment is only 4 bytes, so we just + // ensure that the frame size isn't misaligned. +#ifdef _M_X64 + // expect frameSize == 0 + frameSize = noProlog ? 0x28 : 0; +#elif defined(_WIN32) + frameSize = (frameSize + 3) & -4; #else -#error Arch not supported + unsigned int existingAlignment = noProlog ? 0xc : 0; + frameSize -= existingAlignment; + frameSize = (frameSize + 15) & -16; + frameSize += existingAlignment; #endif + return frameSize; } -void XEmitter::ABI_EmitEpilogue(int maxCallParams) -{ -#ifdef _M_IX86 - RET(); -#elif defined(_M_X64) -#ifdef _WIN32 - int stacksize = ((maxCallParams+1)&~1)*8 + 8; - ADD(64, R(RSP), Imm8(stacksize)); -#endif - RET(); +void XEmitter::ABI_AlignStack(unsigned int frameSize, bool noProlog) { + unsigned int fillSize = + ABI_GetAlignedFrameSize(frameSize, noProlog) - frameSize; + if (fillSize != 0) { +#ifdef _M_X64 + SUB(64, R(RSP), Imm8(fillSize)); #else -#error Arch not supported - - + SUB(32, R(ESP), Imm8(fillSize)); #endif + } +} + +void XEmitter::ABI_RestoreStack(unsigned int frameSize, bool noProlog) { + unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize, noProlog); + if (alignedSize != 0) { +#ifdef _M_X64 + ADD(64, R(RSP), Imm8(alignedSize)); +#else + ADD(32, R(ESP), Imm8(alignedSize)); +#endif + } } #ifdef _M_IX86 // All32 @@ -65,7 +78,7 @@ void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { PUSH(16, Imm16(param2)); PUSH(32, Imm32(param1)); CALL(func); - ABI_RestoreStack(1 * 2 + 1 * 4); + ABI_AlignStack(1 * 2 + 1 * 4); } void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { @@ -129,13 +142,13 @@ void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) { } // Pass two registers as parameters. -void XEmitter::ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2) +void XEmitter::ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2, bool noProlog) { - ABI_AlignStack(2 * 4); + ABI_AlignStack(2 * 4, noProlog); PUSH(32, R(reg2)); PUSH(32, R(reg1)); CALL(func); - ABI_RestoreStack(2 * 4); + ABI_RestoreStack(2 * 4, noProlog); } void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2) @@ -156,60 +169,27 @@ void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) } void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - // Note: 4 * 4 = 16 bytes, so alignment is preserved. PUSH(EBP); + MOV(32, R(EBP), R(ESP)); PUSH(EBX); PUSH(ESI); PUSH(EDI); + SUB(32, R(ESP), Imm8(0xc)); } void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { + ADD(32, R(ESP), Imm8(0xc)); POP(EDI); POP(ESI); POP(EBX); POP(EBP); } -unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { - frameSize += 4; // reserve space for return address - unsigned int alignedSize = -#ifdef __GNUC__ - (frameSize + 15) & -16; -#else - (frameSize + 3) & -4; -#endif - return alignedSize; -} - - -void XEmitter::ABI_AlignStack(unsigned int frameSize) { -// Mac OS X requires the stack to be 16-byte aligned before every call. -// Linux requires the stack to be 16-byte aligned before calls that put SSE -// vectors on the stack, but since we do not keep track of which calls do that, -// it is effectively every call as well. -// Windows binaries compiled with MSVC do not have such a restriction*, but I -// expect that GCC on Windows acts the same as GCC on Linux in this respect. -// It would be nice if someone could verify this. -// *However, the MSVC optimizing compiler assumes a 4-byte-aligned stack at times. - unsigned int fillSize = - ABI_GetAlignedFrameSize(frameSize) - (frameSize + 4); - if (fillSize != 0) { - SUB(32, R(ESP), Imm8(fillSize)); - } -} - -void XEmitter::ABI_RestoreStack(unsigned int frameSize) { - unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize); - alignedSize -= 4; // return address is POPped at end of call - if (alignedSize != 0) { - ADD(32, R(ESP), Imm8(alignedSize)); - } -} - #else //64bit // Common functions void XEmitter::ABI_CallFunction(void *func) { + ABI_AlignStack(0); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL && distance < 0xFFFFFFFF80000000ULL) { @@ -219,9 +199,11 @@ void XEmitter::ABI_CallFunction(void *func) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32((u32)param1)); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL @@ -232,9 +214,11 @@ void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32((u32)param2)); u64 distance = u64(func) - (u64(code) + 5); @@ -246,9 +230,11 @@ void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); u64 distance = u64(func) - (u64(code) + 5); if (distance >= 0x0000000080000000ULL @@ -259,9 +245,11 @@ void XEmitter::ABI_CallFunctionC(void *func, u32 param1) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); u64 distance = u64(func) - (u64(code) + 5); @@ -273,9 +261,11 @@ void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) { } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -288,9 +278,11 @@ void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(64, R(ABI_PARAM3), Imm64((u64)param3)); @@ -303,9 +295,11 @@ void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *par } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 param3, void *param4) { + ABI_AlignStack(0); MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -319,9 +313,11 @@ void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 para } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 param3) { + ABI_AlignStack(0); MOV(64, R(ABI_PARAM1), Imm64((u64)param1)); MOV(64, R(ABI_PARAM2), Imm64((u64)param2)); MOV(32, R(ABI_PARAM3), Imm32(param3)); @@ -334,10 +330,12 @@ void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 p } else { CALL(func); } + ABI_RestoreStack(0); } // Pass a register as a parameter. void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) { + ABI_AlignStack(0); if (reg1 != ABI_PARAM1) MOV(32, R(ABI_PARAM1), R(reg1)); u64 distance = u64(func) - (u64(code) + 5); @@ -349,10 +347,12 @@ void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) { } else { CALL(func); } + ABI_RestoreStack(0); } // Pass two registers as parameters. -void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2) { +void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2, bool noProlog) { + ABI_AlignStack(0, noProlog); if (reg2 != ABI_PARAM1) { if (reg1 != ABI_PARAM1) MOV(64, R(ABI_PARAM1), R(reg1)); @@ -373,10 +373,12 @@ void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2) { } else { CALL(func); } + ABI_RestoreStack(0, noProlog); } void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2) { + ABI_AlignStack(0); if (!arg1.IsSimpleReg(ABI_PARAM1)) MOV(32, R(ABI_PARAM1), arg1); MOV(32, R(ABI_PARAM2), Imm32(param2)); @@ -389,10 +391,12 @@ void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2 } else { CALL(func); } + ABI_RestoreStack(0); } void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) { + ABI_AlignStack(0); if (!arg1.IsSimpleReg(ABI_PARAM1)) MOV(32, R(ABI_PARAM1), arg1); u64 distance = u64(func) - (u64(code) + 5); @@ -404,42 +408,9 @@ void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) } else { CALL(func); } -} - -unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { - return frameSize; -} - -#ifdef _WIN32 - -// Win64 Specific Code -void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - //we only want to do this once - PUSH(RBX); - PUSH(RSI); - PUSH(RDI); - PUSH(RBP); - PUSH(R12); - PUSH(R13); - PUSH(R14); - PUSH(R15); - //TODO: Also preserve XMM0-3? - ABI_AlignStack(0); -} - -void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { ABI_RestoreStack(0); - POP(R15); - POP(R14); - POP(R13); - POP(R12); - POP(RBP); - POP(RDI); - POP(RSI); - POP(RBX); } -// Win64 Specific Code void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { PUSH(RCX); PUSH(RDX); @@ -449,12 +420,11 @@ void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { PUSH(R9); PUSH(R10); PUSH(R11); - //TODO: Also preserve XMM0-15? - ABI_AlignStack(0); + PUSH(R11); } void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { - ABI_RestoreStack(0); + POP(R11); POP(R11); POP(R10); POP(R9); @@ -465,66 +435,59 @@ void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { POP(RCX); } -void XEmitter::ABI_AlignStack(unsigned int /*frameSize*/) { + +#ifdef _WIN32 +// Win64 Specific Code + +void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { + //we only want to do this once + PUSH(RBP); + MOV(64, R(RBP), R(RSP)); + PUSH(RBX); + PUSH(RSI); + PUSH(RDI); + PUSH(R12); + PUSH(R13); + PUSH(R14); + PUSH(R15); SUB(64, R(RSP), Imm8(0x28)); + //TODO: Also preserve XMM0-3? } -void XEmitter::ABI_RestoreStack(unsigned int /*frameSize*/) { +void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { ADD(64, R(RSP), Imm8(0x28)); + POP(R15); + POP(R14); + POP(R13); + POP(R12); + POP(RDI); + POP(RSI); + POP(RBX); + POP(RBP); } #else // Unix64 Specific Code + void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() { - PUSH(RBX); PUSH(RBP); + MOV(64, R(RBP), R(RSP)); + PUSH(RBX); PUSH(R12); PUSH(R13); PUSH(R14); PUSH(R15); - PUSH(R15); //just to align stack. duped push/pop doesn't hurt. + SUB(64, R(RSP), Imm8(8)); } void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() { - POP(R15); + ADD(64, R(RSP), Imm8(8)); POP(R15); POP(R14); POP(R13); POP(R12); - POP(RBP); POP(RBX); -} - -void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() { - PUSH(RCX); - PUSH(RDX); - PUSH(RSI); - PUSH(RDI); - PUSH(R8); - PUSH(R9); - PUSH(R10); - PUSH(R11); - PUSH(R11); -} - -void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() { - POP(R11); - POP(R11); - POP(R10); - POP(R9); - POP(R8); - POP(RDI); - POP(RSI); - POP(RDX); - POP(RCX); -} - -void XEmitter::ABI_AlignStack(unsigned int /*frameSize*/) { - SUB(64, R(RSP), Imm8(0x08)); -} - -void XEmitter::ABI_RestoreStack(unsigned int /*frameSize*/) { - ADD(64, R(RSP), Imm8(0x08)); + POP(RBP); } #endif // WIN32 diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index b068579a3a..27a735ab90 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -639,7 +639,7 @@ public: // Pass a register as a parameter. void ABI_CallFunctionR(void *func, Gen::X64Reg reg1); - void ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2); + void ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2, bool noProlog = false); // A function that doesn't have any control over what it will do to regs, // such as the dispatcher, should be surrounded by these. @@ -652,14 +652,9 @@ public: void ABI_PushAllCallerSavedRegsAndAdjustStack(); void ABI_PopAllCallerSavedRegsAndAdjustStack(); - unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize); - void ABI_AlignStack(unsigned int frameSize); - void ABI_RestoreStack(unsigned int frameSize); - - // Sets up a __cdecl function. - // Only x64 really needs the parameter count. - void ABI_EmitPrologue(int maxCallParams); - void ABI_EmitEpilogue(int maxCallParams); + unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog = false); + void ABI_AlignStack(unsigned int frameSize, bool noProlog = false); + void ABI_RestoreStack(unsigned int frameSize, bool noProlog = false); #ifdef _M_IX86 inline int ABI_GetNumXMMRegs() { return 8; } diff --git a/Source/Core/Common/Src/x64Thunk.cpp b/Source/Core/Common/Src/x64Thunk.cpp index efb876ce81..a9c19060de 100644 --- a/Source/Core/Common/Src/x64Thunk.cpp +++ b/Source/Core/Common/Src/x64Thunk.cpp @@ -91,35 +91,27 @@ void *ThunkManager::ProtectFunction(void *function, int num_params) PanicAlert("Trying to protect functions before the emu is started. Bad bad bad."); const u8 *call_point = GetCodePtr(); - // Make sure to align stack. #ifdef _M_X64 -#ifdef _WIN32 - SUB(64, R(ESP), Imm8(0x28)); -#else - SUB(64, R(ESP), Imm8(0x8)); -#endif + // Make sure to align stack. + ABI_AlignStack(0, true); CALL((void*)save_regs); CALL((void*)function); CALL((void*)load_regs); -#ifdef _WIN32 - ADD(64, R(ESP), Imm8(0x28)); -#else - ADD(64, R(ESP), Imm8(0x8)); -#endif + ABI_RestoreStack(0, true); RET(); #else CALL((void*)save_regs); // Since parameters are in the previous stack frame, not in registers, this takes some // trickery : we simply re-push the parameters. might not be optimal, but that doesn't really // matter. - ABI_AlignStack(num_params * 4); + ABI_AlignStack(num_params * 4, true); unsigned int alignedSize = ABI_GetAlignedFrameSize(num_params * 4); for (int i = 0; i < num_params; i++) { // ESP is changing, so we do not need i - PUSH(32, MDisp(ESP, alignedSize - 4)); + PUSH(32, MDisp(ESP, alignedSize)); } CALL(function); - ABI_RestoreStack(num_params * 4); + ABI_RestoreStack(num_params * 4, true); CALL((void*)load_regs); RET(); #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp index 5187ef1478..d80b0bb3f8 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp @@ -167,7 +167,7 @@ void CommonAsmRoutines::GenQuantizedStores() { MOV(64, MComplex(RBX, RCX, SCALE_1, 0), R(RAX)); FixupBranch skip_complex = J(); SetJumpTarget(too_complex); - ABI_CallFunctionRR(thunks.ProtectFunction((void *)&WriteDual32, 2), RAX, RCX); + ABI_CallFunctionRR(thunks.ProtectFunction((void *)&WriteDual32, 2), RAX, RCX, /* noProlog = */ true); SetJumpTarget(skip_complex); RET(); #else @@ -184,10 +184,10 @@ void CommonAsmRoutines::GenQuantizedStores() { FixupBranch arg2 = J(); SetJumpTarget(argh); MOV(32, R(EAX), M(((char*)&psTemp))); - ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U32, 2), EAX, ECX); + ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U32, 2), EAX, ECX, /* noProlog = */ true); MOV(32, R(EAX), M(((char*)&psTemp)+4)); ADD(32, R(ECX), Imm32(4)); - ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U32, 2), EAX, ECX); + ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U32, 2), EAX, ECX, /* noProlog = */ true); SetJumpTarget(arg2); RET(); #endif @@ -206,7 +206,7 @@ void CommonAsmRoutines::GenQuantizedStores() { PACKSSDW(XMM0, R(XMM0)); PACKUSWB(XMM0, R(XMM0)); MOVD_xmm(R(EAX), XMM0); - SafeWriteRegToReg(AX, ECX, 16, 0, false); + SafeWriteRegToReg(AX, ECX, 16, 0, false, true); RET(); @@ -225,7 +225,7 @@ void CommonAsmRoutines::GenQuantizedStores() { PACKSSWB(XMM0, R(XMM0)); MOVD_xmm(R(EAX), XMM0); - SafeWriteRegToReg(AX, ECX, 16, 0, false); + SafeWriteRegToReg(AX, ECX, 16, 0, false, true); RET(); @@ -251,7 +251,7 @@ void CommonAsmRoutines::GenQuantizedStores() { MOV(16, R(AX), M((char*)psTemp + 4)); BSWAP(32, EAX); - SafeWriteRegToReg(EAX, ECX, 32, 0, false); + SafeWriteRegToReg(EAX, ECX, 32, 0, false, true); RET(); @@ -271,7 +271,7 @@ void CommonAsmRoutines::GenQuantizedStores() { MOVD_xmm(R(EAX), XMM0); BSWAP(32, EAX); ROL(32, R(EAX), Imm8(16)); - SafeWriteRegToReg(EAX, ECX, 32, 0, false); + SafeWriteRegToReg(EAX, ECX, 32, 0, false, true); RET(); @@ -303,11 +303,11 @@ void CommonAsmRoutines::GenQuantizedSingleStores() { // TODO: SafeWriteFloat MOVSS(M(&psTemp[0]), XMM0); MOV(32, R(EAX), M(&psTemp[0])); - SafeWriteRegToReg(EAX, ECX, 32, 0, false); + SafeWriteRegToReg(EAX, ECX, 32, 0, false, true); } else { MOVSS(M(&psTemp[0]), XMM0); MOV(32, R(EAX), M(&psTemp[0])); - SafeWriteRegToReg(EAX, ECX, 32, 0, true); + SafeWriteRegToReg(EAX, ECX, 32, 0, true, true); }*/ const u8* storeSingleU8 = AlignCode4(); // Used by MKWii @@ -318,7 +318,7 @@ void CommonAsmRoutines::GenQuantizedSingleStores() { MAXSS(XMM0, R(XMM1)); MINSS(XMM0, M((void *)&m_255)); CVTTSS2SI(EAX, R(XMM0)); - SafeWriteRegToReg(AL, ECX, 8, 0, true); + SafeWriteRegToReg(AL, ECX, 8, 0, true, true); RET(); const u8* storeSingleS8 = AlignCode4(); @@ -328,7 +328,7 @@ void CommonAsmRoutines::GenQuantizedSingleStores() { MAXSS(XMM0, M((void *)&m_m128)); MINSS(XMM0, M((void *)&m_127)); CVTTSS2SI(EAX, R(XMM0)); - SafeWriteRegToReg(AL, ECX, 8, 0, true); + SafeWriteRegToReg(AL, ECX, 8, 0, true, true); RET(); const u8* storeSingleU16 = AlignCode4(); // Used by MKWii @@ -339,7 +339,7 @@ void CommonAsmRoutines::GenQuantizedSingleStores() { MAXSS(XMM0, R(XMM1)); MINSS(XMM0, M((void *)&m_65535)); CVTTSS2SI(EAX, R(XMM0)); - SafeWriteRegToReg(EAX, ECX, 16, 0, true); + SafeWriteRegToReg(EAX, ECX, 16, 0, true, true); RET(); const u8* storeSingleS16 = AlignCode4(); @@ -349,7 +349,7 @@ void CommonAsmRoutines::GenQuantizedSingleStores() { MAXSS(XMM0, M((void *)&m_m32768)); MINSS(XMM0, M((void *)&m_32767)); CVTTSS2SI(EAX, R(XMM0)); - SafeWriteRegToReg(EAX, ECX, 16, 0, true); + SafeWriteRegToReg(EAX, ECX, 16, 0, true, true); RET(); singleStoreQuantized = reinterpret_cast(const_cast(AlignCode16())); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 18c8044385..637dff171b 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -223,7 +223,7 @@ void EmuCodeBlock::UnsafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int ac } // Destroys both arg registers -void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int accessSize, s32 offset, bool swap) +void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int accessSize, s32 offset, bool swap, bool noProlog) { if (offset) ADD(32, R(reg_addr), Imm32((u32)offset)); @@ -247,9 +247,9 @@ void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acce MOV(32, M(&PC), Imm32(jit->js.compilerPC)); // Helps external systems know which instruction triggered the write switch (accessSize) { - case 32: ABI_CallFunctionRR(thunks.ProtectFunction(swap ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), 2), reg_value, reg_addr); break; - case 16: ABI_CallFunctionRR(thunks.ProtectFunction(swap ? ((void *)&Memory::Write_U16) : ((void *)&Memory::Write_U16_Swap), 2), reg_value, reg_addr); break; - case 8: ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U8, 2), reg_value, reg_addr); break; + case 32: ABI_CallFunctionRR(thunks.ProtectFunction(swap ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), 2), reg_value, reg_addr, noProlog); break; + case 16: ABI_CallFunctionRR(thunks.ProtectFunction(swap ? ((void *)&Memory::Write_U16) : ((void *)&Memory::Write_U16_Swap), 2), reg_value, reg_addr, noProlog); break; + case 8: ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U8, 2), reg_value, reg_addr, noProlog); break; } FixupBranch exit = J(); SetJumpTarget(fast); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h index 7708ab8598..57dce19790 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h @@ -16,7 +16,7 @@ public: void UnsafeWriteRegToReg(Gen::X64Reg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset = 0, bool swap = true); void UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend); void SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend); - void SafeWriteRegToReg(Gen::X64Reg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset, bool swap = true); + void SafeWriteRegToReg(Gen::X64Reg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset, bool swap = true, bool noProlog = false); // Trashes both inputs and EAX. void SafeWriteFloatToReg(Gen::X64Reg xmm_value, Gen::X64Reg reg_addr); diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index babaff83a5..825e9c6558 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -217,7 +217,7 @@ void VertexLoader::CompileVertexTranslator() PanicAlert("Trying to recompile a vertex translator"); m_compiledCode = GetCodePtr(); - ABI_EmitPrologue(4); + ABI_PushAllCalleeSavedRegsAndAdjustStack(); // Start loop here const u8 *loop_start = GetCodePtr(); @@ -499,7 +499,8 @@ void VertexLoader::CompileVertexTranslator() #endif J_CC(CC_NZ, loop_start, true); - ABI_EmitEpilogue(4); + ABI_PopAllCalleeSavedRegsAndAdjustStack(); + RET(); #endif m_NativeFmt->Initialize(vtx_decl); } diff --git a/Source/Core/VideoCommon/Src/x64DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp index ae32ea5ea9..b412c2e274 100644 --- a/Source/Core/VideoCommon/Src/x64DLCache.cpp +++ b/Source/Core/VideoCommon/Src/x64DLCache.cpp @@ -409,7 +409,7 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) emitter.AlignCode4(); dl->compiled_code = emitter.GetCodePtr(); - emitter.ABI_EmitPrologue(4); + emitter.ABI_PushAllCalleeSavedRegsAndAdjustStack(); while (g_pVideoData < end) { @@ -572,7 +572,8 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) break; } } - emitter.ABI_EmitEpilogue(4); + emitter.ABI_PopAllCalleeSavedRegsAndAdjustStack(); + emitter.RET(); INCSTAT(stats.numDListsCalled); INCSTAT(stats.thisFrame.numDListsCalled); Statistics::SwapDL(); From 7fe440340f73dbfd95ad9a32de88e2dd70a26fa4 Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 22 Sep 2013 16:07:45 -0400 Subject: [PATCH 254/267] Improve Atomic.h: - For GCC, use intrinsics that will work on ARM. - Add AtomicExchangeAcquire. - Make Atomic{Load,LoadAcquire,Store,StoreRelease} work for any suitable type. --- Source/Core/Common/Src/Atomic_GCC.h | 68 +++++++++++++++++---------- Source/Core/Common/Src/Atomic_Win32.h | 43 ++++++++++------- 2 files changed, 70 insertions(+), 41 deletions(-) diff --git a/Source/Core/Common/Src/Atomic_GCC.h b/Source/Core/Common/Src/Atomic_GCC.h index f923ba8b5e..d255c72bc1 100644 --- a/Source/Core/Common/Src/Atomic_GCC.h +++ b/Source/Core/Common/Src/Atomic_GCC.h @@ -40,27 +40,45 @@ inline void AtomicIncrement(volatile u32& target) { __sync_add_and_fetch(&target, 1); } -inline u32 AtomicLoad(volatile u32& src) { - return src; // 32-bit reads are always atomic. -} -inline u32 AtomicLoadAcquire(volatile u32& src) { - //keep the compiler from caching any memory references - u32 result = src; // 32-bit reads are always atomic. - //__sync_synchronize(); // TODO: May not be necessary. - // Compiler instruction only. x86 loads always have acquire semantics. - __asm__ __volatile__ ( "":::"memory" ); - return result; -} - inline void AtomicOr(volatile u32& target, u32 value) { __sync_or_and_fetch(&target, value); } -inline void AtomicStore(volatile u32& dest, u32 value) { - dest = value; // 32-bit writes are always atomic. +#ifdef __clang__ +template +_Atomic(T)* ToC11Atomic(volatile T* loc) +{ + return (_Atomic(T)*) loc; } -inline void AtomicStoreRelease(volatile u32& dest, u32 value) { - __sync_lock_test_and_set(&dest, value); // TODO: Wrong! This function is has acquire semantics. + +#define __atomic_load_n(p, m) __c11_atomic_load(ToC11Atomic(p), m) +#define __atomic_store_n(p, v, m) __c11_atomic_store(ToC11Atomic(p), v, m) +#define __atomic_exchange_n(p, v, m) __c11_atomic_exchange(ToC11Atomic(p), v, m) +#endif + +template +inline T AtomicLoad(volatile T& src) { + return __atomic_load_n(&src, __ATOMIC_RELAXED); +} + +template +inline T AtomicLoadAcquire(volatile T& src) { + return __atomic_load_n(&src, __ATOMIC_ACQUIRE); +} + +template +inline void AtomicStore(volatile T& dest, U value) { + __atomic_store_n(&dest, value, __ATOMIC_RELAXED); +} + +template +inline void AtomicStoreRelease(volatile T& dest, U value) { + __atomic_store_n(&dest, value, __ATOMIC_RELEASE); +} + +template +inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) { + return __atomic_exchange_n(&loc, newval, __ATOMIC_ACQ_REL); } } @@ -74,9 +92,9 @@ LONG SyncInterlockedIncrement(LONG *Dest) #else register int result; __asm__ __volatile__("lock; xadd %0,%1" - : "=r" (result), "=m" (*Dest) - : "0" (1), "m" (*Dest) - : "memory"); + : "=r" (result), "=m" (*Dest) + : "0" (1), "m" (*Dest) + : "memory"); return result; #endif } @@ -88,9 +106,9 @@ LONG SyncInterlockedExchangeAdd(LONG *Dest, LONG Val) #else register int result; __asm__ __volatile__("lock; xadd %0,%1" - : "=r" (result), "=m" (*Dest) - : "0" (Val), "m" (*Dest) - : "memory"); + : "=r" (result), "=m" (*Dest) + : "0" (Val), "m" (*Dest) + : "memory"); return result; #endif } @@ -102,9 +120,9 @@ LONG SyncInterlockedExchange(LONG *Dest, LONG Val) #else register int result; __asm__ __volatile__("lock; xchg %0,%1" - : "=r" (result), "=m" (*Dest) - : "0" (Val), "m" (*Dest) - : "memory"); + : "=r" (result), "=m" (*Dest) + : "0" (Val), "m" (*Dest) + : "memory"); return result; #endif } diff --git a/Source/Core/Common/Src/Atomic_Win32.h b/Source/Core/Common/Src/Atomic_Win32.h index 1b05f8e777..7ce1381938 100644 --- a/Source/Core/Common/Src/Atomic_Win32.h +++ b/Source/Core/Common/Src/Atomic_Win32.h @@ -31,7 +31,7 @@ namespace Common { inline void AtomicAdd(volatile u32& target, u32 value) { - InterlockedExchangeAdd((volatile LONG*)&target, (LONG)value); + _InterlockedExchangeAdd((volatile LONG*)&target, (LONG)value); } inline void AtomicAnd(volatile u32& target, u32 value) { @@ -39,32 +39,43 @@ inline void AtomicAnd(volatile u32& target, u32 value) { } inline void AtomicIncrement(volatile u32& target) { - InterlockedIncrement((volatile LONG*)&target); + _InterlockedIncrement((volatile LONG*)&target); } inline void AtomicDecrement(volatile u32& target) { - InterlockedDecrement((volatile LONG*)&target); -} - -inline u32 AtomicLoad(volatile u32& src) { - return src; // 32-bit reads are always atomic. -} -inline u32 AtomicLoadAcquire(volatile u32& src) { - u32 result = src; // 32-bit reads are always atomic. - _ReadBarrier(); // Compiler instruction only. x86 loads always have acquire semantics. - return result; + _InterlockedDecrement((volatile LONG*)&target); } inline void AtomicOr(volatile u32& target, u32 value) { _InterlockedOr((volatile LONG*)&target, (LONG)value); } -inline void AtomicStore(volatile u32& dest, u32 value) { - dest = value; // 32-bit writes are always atomic. +template +inline T AtomicLoad(volatile T& src) { + return src; // 32-bit reads are always atomic. } -inline void AtomicStoreRelease(volatile u32& dest, u32 value) { + +template +inline T AtomicLoadAcquire(volatile T& src) { + T result = src; // 32-bit reads are always atomic. + _ReadBarrier(); // Compiler instruction only. x86 loads always have acquire semantics. + return result; +} + +template +inline void AtomicStore(volatile T& dest, U value) { + dest = (T) value; // 32-bit writes are always atomic. +} + +template +inline void AtomicStoreRelease(volatile T& dest, U value) { _WriteBarrier(); // Compiler instruction only. x86 stores always have release semantics. - dest = value; // 32-bit writes are always atomic. + dest = (T) value; // 32-bit writes are always atomic. +} + +template +inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) { + return (T*) _InterlockedExchangePointer_acq((void* volatile*) &loc, (void*) newval); } } From c3b9f3556f0ee638d35c2f72582263d409106407 Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 19 Aug 2013 15:16:01 -0400 Subject: [PATCH 255/267] Make CoreTiming's threadsafe events lock-free. Not sure if this actually helps in practice, but might help in pathological cases, and almost certainly can't hurt. --- Source/Core/Common/Src/FifoQueue.h | 74 +++++++++++---- Source/Core/Core/Src/CoreTiming.cpp | 136 ++++++---------------------- 2 files changed, 83 insertions(+), 127 deletions(-) diff --git a/Source/Core/Common/Src/FifoQueue.h b/Source/Core/Common/Src/FifoQueue.h index 01f0e4dd3c..3239eb3dea 100644 --- a/Source/Core/Common/Src/FifoQueue.h +++ b/Source/Core/Common/Src/FifoQueue.h @@ -10,7 +10,7 @@ namespace Common { -template +template class FifoQueue { public: @@ -27,37 +27,39 @@ public: u32 Size() const { + static_assert(NeedSize, "using Size() on FifoQueue without NeedSize"); return m_size; } bool Empty() const { - //return (m_read_ptr == m_write_ptr); - return (0 == m_size); + return !m_read_ptr->next; } T& Front() const { - return *m_read_ptr->current; + return m_read_ptr->current; } template void Push(Arg&& t) { // create the element, add it to the queue - m_write_ptr->current = new T(std::forward(t)); + m_write_ptr->current = std::move(t); // set the next pointer to a new element ptr // then advance the write pointer m_write_ptr = m_write_ptr->next = new ElementPtr(); - Common::AtomicIncrement(m_size); + if (NeedSize) + Common::AtomicIncrement(m_size); } void Pop() { - Common::AtomicDecrement(m_size); - ElementPtr *const tmpptr = m_read_ptr; + if (NeedSize) + Common::AtomicDecrement(m_size); + ElementPtr *tmpptr = m_read_ptr; // advance the read pointer - m_read_ptr = m_read_ptr->next; + m_read_ptr = tmpptr->next; // set the next element to NULL to stop the recursive deletion tmpptr->next = NULL; delete tmpptr; // this also deletes the element @@ -82,31 +84,63 @@ public: m_write_ptr = m_read_ptr = new ElementPtr(); } +private: + class ElementPtr; + +public: + class iterator + { + public: + iterator() {} + bool operator==(iterator other) { return other.m_pp == m_pp; } + bool operator!=(iterator other) { return !(*this == other); } + T *operator->() { return &**this; } + T& operator*() { return (*m_pp)->current; } + void operator++() { m_pp = &(*m_pp)->next; } + protected: + iterator(ElementPtr *volatile *pp) : m_pp(pp) {} + ElementPtr *volatile *m_pp; + friend class FifoQueue; + }; + + iterator begin() + { + return iterator(&m_read_ptr); + } + + iterator end() + { + return iterator(&m_write_ptr->next); + } + + iterator erase(iterator itr) + { + ElementPtr *elp = *itr.m_pp; + *itr.m_pp = elp->next; + delete elp; + return itr; + } + private: // stores a pointer to element // and a pointer to the next ElementPtr class ElementPtr { public: - ElementPtr() : current(NULL), next(NULL) {} + ElementPtr() : next(NULL) {} ~ElementPtr() { - if (current) - { - delete current; - // recusion ftw - if (next) - delete next; - } + if (next) + delete next; } - T *volatile current; + T current; ElementPtr *volatile next; }; - ElementPtr *volatile m_write_ptr; - ElementPtr *volatile m_read_ptr; + ElementPtr *m_write_ptr; + ElementPtr *m_read_ptr; volatile u32 m_size; }; diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp index 06770aa375..377ae33a1c 100644 --- a/Source/Core/Core/Src/CoreTiming.cpp +++ b/Source/Core/Core/Src/CoreTiming.cpp @@ -10,6 +10,7 @@ #include "Core.h" #include "StringUtil.h" #include "VideoBackendBase.h" +#include "FifoQueue.h" #define MAX_SLICE_LENGTH 20000 @@ -29,20 +30,17 @@ struct BaseEvent s64 time; u64 userdata; int type; -// Event *next; }; typedef LinkedListItem Event; // STATE_TO_SAVE -Event *first; -Event *tsFirst; -Event *tsLast; +static Event *first; +static std::mutex tsWriteLock; +Common::FifoQueue tsQueue; // event pools Event *eventPool = 0; -Event *eventTsPool = 0; -int allocatedTsEvents = 0; int downcount, slicelength; int maxSliceLength = MAX_SLICE_LENGTH; @@ -57,7 +55,6 @@ u64 fakeTBStartTicks; int ev_lost; -static std::recursive_mutex externalEventSection; void (*advanceCallback)(int cyclesExecuted) = NULL; @@ -71,31 +68,12 @@ Event* GetNewEvent() return ev; } -Event* GetNewTsEvent() -{ - allocatedTsEvents++; - - if(!eventTsPool) - return new Event; - - Event* ev = eventTsPool; - eventTsPool = ev->next; - return ev; -} - void FreeEvent(Event* ev) { ev->next = eventPool; eventPool = ev; } -void FreeTsEvent(Event* ev) -{ - ev->next = eventTsPool; - eventTsPool = ev; - allocatedTsEvents--; -} - static void EmptyTimedCallback(u64 userdata, int cyclesLate) {} int RegisterEvent(const char *name, TimedCallback callback) @@ -141,6 +119,7 @@ void Init() void Shutdown() { + std::lock_guard lk(tsWriteLock); MoveEvents(); ClearPendingEvents(); UnregisterAllEvents(); @@ -151,14 +130,6 @@ void Shutdown() eventPool = ev->next; delete ev; } - - std::lock_guard lk(externalEventSection); - while(eventTsPool) - { - Event *ev = eventTsPool; - eventTsPool = ev->next; - delete ev; - } } void EventDoState(PointerWrap &p, BaseEvent* ev) @@ -197,7 +168,7 @@ void EventDoState(PointerWrap &p, BaseEvent* ev) void DoState(PointerWrap &p) { - std::lock_guard lk(externalEventSection); + std::lock_guard lk(tsWriteLock); p.Do(downcount); p.Do(slicelength); p.Do(globalTimer); @@ -208,11 +179,10 @@ void DoState(PointerWrap &p) p.Do(fakeTBStartTicks); p.DoMarker("CoreTimingData"); + MoveEvents(); + p.DoLinkedList(first); p.DoMarker("CoreTimingEvents"); - - p.DoLinkedList(tsFirst, &tsLast); - p.DoMarker("CoreTimingTsEvents"); } u64 GetTicks() @@ -229,17 +199,12 @@ u64 GetIdleTicks() // schedule things to be executed on the main thread. void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata) { - std::lock_guard lk(externalEventSection); - Event *ne = GetNewTsEvent(); - ne->time = globalTimer + cyclesIntoFuture; - ne->type = event_type; - ne->next = 0; - ne->userdata = userdata; - if(!tsFirst) - tsFirst = ne; - if(tsLast) - tsLast->next = ne; - tsLast = ne; + std::lock_guard lk(tsWriteLock); + Event ne; + ne.time = globalTimer + cyclesIntoFuture; + ne.type = event_type; + ne.userdata = userdata; + tsQueue.Push(ne); } // Same as ScheduleEvent_Threadsafe(0, ...) EXCEPT if we are already on the CPU thread @@ -248,7 +213,6 @@ void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata) { if(Core::IsCPUThread()) { - std::lock_guard lk(externalEventSection); event_types[event_type].callback(userdata, 0); } else @@ -357,51 +321,18 @@ void RemoveEvent(int event_type) void RemoveThreadsafeEvent(int event_type) { - std::lock_guard lk(externalEventSection); - if (!tsFirst) + std::lock_guard lk(tsWriteLock); + for (Common::FifoQueue::iterator itr = tsQueue.begin(); itr != tsQueue.end(); ++itr) { - return; - } - - while(tsFirst) - { - if (tsFirst->type == event_type) + if (itr->type == event_type) { - Event *next = tsFirst->next; - FreeTsEvent(tsFirst); - tsFirst = next; - } - else - { - break; - } - } - - if (!tsFirst) - { - return; - } - - Event *prev = tsFirst; - Event *ptr = prev->next; - while (ptr) - { - if (ptr->type == event_type) - { - prev->next = ptr->next; - FreeTsEvent(ptr); - ptr = prev->next; - } - else - { - prev = ptr; - ptr = ptr->next; + itr = tsQueue.erase(itr); } } } void RemoveAllEvents(int event_type) -{ +{ RemoveThreadsafeEvent(event_type); RemoveEvent(event_type); } @@ -447,34 +378,24 @@ void ProcessFifoWaitEvents() { break; } - } + } } void MoveEvents() { - std::lock_guard lk(externalEventSection); - // Move events from async queue into main queue - while (tsFirst) + BaseEvent sevt; + while (tsQueue.Pop(sevt)) { - Event *next = tsFirst->next; - AddEventToQueue(tsFirst); - tsFirst = next; - } - tsLast = NULL; - - // Move free events to threadsafe pool - while(allocatedTsEvents > 0 && eventPool) - { - Event *ev = eventPool; - eventPool = ev->next; - ev->next = eventTsPool; - eventTsPool = ev; - allocatedTsEvents--; + Event *evt = GetNewEvent(); + evt->time = sevt.time; + evt->userdata = sevt.userdata; + evt->type = sevt.type; + AddEventToQueue(evt); } } void Advance() -{ +{ MoveEvents(); int cyclesExecuted = slicelength - downcount; @@ -606,3 +527,4 @@ void SetFakeTBStartTicks(u64 val) } } // namespace + From 17e753faf3b44b98b6721a629056636aa4c3fe91 Mon Sep 17 00:00:00 2001 From: comex Date: Thu, 29 Aug 2013 19:19:44 -0400 Subject: [PATCH 256/267] Fix FifoQueue's atomicity on ARM. Theoretically. --- Source/Core/Common/Src/FifoQueue.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/FifoQueue.h b/Source/Core/Common/Src/FifoQueue.h index 3239eb3dea..f5713c85f9 100644 --- a/Source/Core/Common/Src/FifoQueue.h +++ b/Source/Core/Common/Src/FifoQueue.h @@ -33,11 +33,12 @@ public: bool Empty() const { - return !m_read_ptr->next; + return !AtomicLoad(m_read_ptr->next); } T& Front() const { + AtomicLoadAcquire(m_read_ptr->next); return m_read_ptr->current; } @@ -48,7 +49,9 @@ public: m_write_ptr->current = std::move(t); // set the next pointer to a new element ptr // then advance the write pointer - m_write_ptr = m_write_ptr->next = new ElementPtr(); + ElementPtr* new_ptr = new ElementPtr(); + AtomicStoreRelease(m_write_ptr->next, new_ptr); + m_write_ptr = new_ptr; if (NeedSize) Common::AtomicIncrement(m_size); } @@ -59,7 +62,7 @@ public: Common::AtomicDecrement(m_size); ElementPtr *tmpptr = m_read_ptr; // advance the read pointer - m_read_ptr = tmpptr->next; + m_read_ptr = AtomicLoad(tmpptr->next); // set the next element to NULL to stop the recursive deletion tmpptr->next = NULL; delete tmpptr; // this also deletes the element @@ -70,9 +73,14 @@ public: if (Empty()) return false; - t = std::move(Front()); - Pop(); + if (NeedSize) + Common::AtomicDecrement(m_size); + ElementPtr *tmpptr = m_read_ptr; + m_read_ptr = AtomicLoadAcquire(tmpptr->next); + t = std::move(tmpptr->current); + tmpptr->next = NULL; + delete tmpptr; return true; } @@ -94,7 +102,7 @@ public: iterator() {} bool operator==(iterator other) { return other.m_pp == m_pp; } bool operator!=(iterator other) { return !(*this == other); } - T *operator->() { return &**this; } + T* operator->() { return &**this; } T& operator*() { return (*m_pp)->current; } void operator++() { m_pp = &(*m_pp)->next; } protected: @@ -116,7 +124,7 @@ public: iterator erase(iterator itr) { ElementPtr *elp = *itr.m_pp; - *itr.m_pp = elp->next; + *itr.m_pp = AtomicLoadAcquire(elp->next); delete elp; return itr; } From cf4d015b2aa63a472e262d736245224df4613627 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 18 Sep 2013 22:08:21 -0400 Subject: [PATCH 257/267] Don't disable SO_REUSEADDR on non-Windows, where it is safe. --- Externals/SFML/src/SFML/Network/SocketTCP.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Externals/SFML/src/SFML/Network/SocketTCP.cpp b/Externals/SFML/src/SFML/Network/SocketTCP.cpp index 8e9aa33f81..6cbd158aa8 100644 --- a/Externals/SFML/src/SFML/Network/SocketTCP.cpp +++ b/Externals/SFML/src/SFML/Network/SocketTCP.cpp @@ -488,18 +488,22 @@ void SocketTCP::Create(SocketHelper::SocketType Descriptor) // Setup default options if (IsValid()) { - /* We must disable this in order to detect if ports are being used by other apps, or - other instances of dolphin. This is also disabled in SFML 2.0, see - http://www.sfml-dev.org/forum/viewtopic.php?t=3388 + int Yes = 1; +#ifndef SFML_SYSTEM_WINDOWS + /* We must disable this in order to detect if ports are being used by other apps, or + other instances of dolphin. This is also disabled in SFML 2.0, see +http://www.sfml-dev.org/forum/viewtopic.php?t=3388 + ...In fact, SO_REUSEADDR is only unsafe on Windows. See: + http://stackoverflow.com/questions/14388706 + */ // To avoid the "Address already in use" error message when trying to bind to the same port if (setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast(&Yes), sizeof(Yes)) == -1) { std::cerr << "Failed to set socket option \"SO_REUSEADDR\" ; " << "binding to a same port may fail if too fast" << std::endl; } - */ +#endif - int Yes = 1; // Disable the Nagle algorithm (ie. removes buffering of TCP packets) if (setsockopt(mySocket, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast(&Yes), sizeof(Yes)) == -1) { From 229b35bb6d6741fb64488eebadcb31d4b0219d3f Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 18 Sep 2013 22:14:04 -0400 Subject: [PATCH 258/267] When hosting, don't try to connect if listening failed. If another instance of the server is running on the same computer, this would cause Dolphin to confusingly connect to it. --- Source/Core/DolphinWX/Src/NetWindow.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 7f48455ef7..1ad5d57f1f 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -254,9 +254,12 @@ void NetPlaySetupDiag::OnHost(wxCommandEvent&) if(m_upnp_chk->GetValue()) netplay_server->TryPortmapping(port); #endif + MakeNetPlayDiag(port, game, true); + } + else + { + PanicAlertT("Failed to listen. Is another instance of the NetPlay server running?"); } - - MakeNetPlayDiag(port, game, true); } void NetPlaySetupDiag::OnJoin(wxCommandEvent&) From 80b14e80b55c2c2832ef5f38796719efebd9e7d0 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 18 Sep 2013 23:21:30 -0400 Subject: [PATCH 259/267] Fix crash when a player leaves in NetPlay. The player ID was being written as int and read as PlayerId (u8). --- Source/Core/Core/Src/NetPlayServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index f78bfe43ef..8ae560c212 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -241,7 +241,7 @@ unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket) SendToClients(spac); } - int pid = m_players[socket].pid; + PlayerId pid = m_players[socket].pid; sf::Packet spac; spac << (MessageId)NP_MSG_PLAYER_LEAVE; From 12e7c22006552e6f93392504f19808a7030f7f7e Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 22 Sep 2013 17:32:11 -0400 Subject: [PATCH 260/267] Fix recording netplay with wiimote. --- Source/Core/Core/Src/NetPlayClient.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index d20c726a17..4e741ede1e 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -491,6 +491,8 @@ bool NetPlayClient::StartGame(const std::string &path) { if (m_pad_map[i] > 0) controllers_mask |= (1 << i); + if (m_wiimote_map[i] > 0) + controllers_mask |= (1 << i + 4); } Movie::BeginRecordingInput(controllers_mask); } From 573dbfd494e56f5333d18db8f708b894be55b884 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 3 Sep 2013 20:56:24 +0200 Subject: [PATCH 261/267] ogl: drop glsl120 support --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 4 +-- .../Src/TextureConversionShader.cpp | 2 +- .../Src/FramebufferManager.cpp | 25 +++------------ .../Src/ProgramShaderCache.cpp | 31 +++++-------------- .../Plugin_VideoOGL/Src/RasterFont.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 14 +++------ Source/Plugins/Plugin_VideoOGL/Src/Render.h | 1 - .../Plugin_VideoOGL/Src/TextureCache.cpp | 4 +-- .../Plugin_VideoOGL/Src/TextureConverter.cpp | 4 +-- 9 files changed, 23 insertions(+), 64 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 459ae0733c..03d1677b2c 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -309,9 +309,9 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T if (ApiType == API_OPENGL) { - out.Write("COLOROUT(ocol0)\n"); + out.Write("out vec4 ocol0;\n"); if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) - out.Write("COLOROUT(ocol1)\n"); + out.Write("out vec4 ocol1;\n"); if (per_pixel_depth) out.Write("#define depth gl_FragDepth\n"); diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp index de5198c9fe..bf2f2737ea 100644 --- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp +++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp @@ -96,7 +96,7 @@ void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType) if (ApiType == API_OPENGL) { - WRITE(p, " COLOROUT(ocol0)\n"); + WRITE(p, " out vec4 ocol0;\n"); WRITE(p, " VARYIN float2 uv0;\n"); WRITE(p, "void main()\n"); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index a9ea7fbb4e..ed36b5dd6d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -200,7 +200,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms char ps_rgba6_to_rgb8[] = "uniform sampler2DRect samp9;\n" - "COLOROUT(ocol0)\n" + "out vec4 ocol0;\n" "void main()\n" "{\n" " ivec4 src6 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 63.f));\n" @@ -214,7 +214,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms char ps_rgb8_to_rgba6[] = "uniform sampler2DRect samp9;\n" - "COLOROUT(ocol0)\n" + "out vec4 ocol0;\n" "void main()\n" "{\n" " ivec4 src8 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 255.f));\n" @@ -226,13 +226,8 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms " ocol0 = float4(dst6) / 63.f;\n" "}"; - if(g_ogl_config.eSupportedGLSLVersion != GLSL_120) - { - // HACK: This shaders aren't glsl120 compatible as glsl120 don't support bit operations - // it could be workaround by floor + frac + tons off additions, but I think it isn't worth - ProgramShaderCache::CompileShader(m_pixel_format_shaders[0], vs, ps_rgb8_to_rgba6); - ProgramShaderCache::CompileShader(m_pixel_format_shaders[1], vs, ps_rgba6_to_rgb8); - } + ProgramShaderCache::CompileShader(m_pixel_format_shaders[0], vs, ps_rgb8_to_rgba6); + ProgramShaderCache::CompileShader(m_pixel_format_shaders[1], vs, ps_rgba6_to_rgb8); } @@ -364,18 +359,6 @@ GLuint FramebufferManager::ResolveAndGetDepthTarget(const EFBRectangle &source_r void FramebufferManager::ReinterpretPixelData(unsigned int convtype) { - if(g_ogl_config.eSupportedGLSLVersion == GLSL_120) { - // This feature isn't supported by glsl120 - - // TODO: move this to InitBackendInfo - // We have to disable both the active and the stored config. Else we would either - // show this line per format change in one frame or once per frame. - OSD::AddMessage("Format Change Emulation isn't supported by your GPU.", 10000); - g_ActiveConfig.bEFBEmulateFormatChanges = false; - g_Config.bEFBEmulateFormatChanges = false; - return; - } - g_renderer->ResetAPIState(); GLuint src_texture = 0; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 5cc9ec36cd..f27f56d701 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -524,10 +524,10 @@ void ProgramShaderCache::CreateHeader ( void ) "%s\n" // early-z "\n"// A few required defines and ones that will make our lives a lot easier - "#define ATTRIN %s\n" - "#define ATTROUT %s\n" - "#define VARYIN %s\n" - "#define VARYOUT %s\n" + "#define ATTRIN in\n" + "#define ATTROUT out\n" + "#define VARYIN %s in\n" + "#define VARYOUT %s out\n" // Silly differences "#define float2 vec2\n" @@ -538,35 +538,18 @@ void ProgramShaderCache::CreateHeader ( void ) "#define frac fract\n" "#define lerp mix\n" - // glsl 120 hack - "%s\n" - "%s\n" - "%s\n" - "%s\n" - "%s\n" - "#define COLOROUT(name) %s\n" - // texture2d hack "%s\n" "%s\n" "%s\n" - , v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : v==GLSL_140 ? "140" : "150" + , v==GLSLES3 ? "300 es" : v==GLSL_130 ? "130" : v==GLSL_140 ? "140" : "150" , v==GLSLES3 ? "precision highp float;" : "" , g_ActiveConfig.backend_info.bSupportsGLSLUBO && v Date: Sun, 22 Sep 2013 19:16:32 -0400 Subject: [PATCH 262/267] [Android] Add a JP version of the string for FSAA. Also correct the English string too. --- Source/Android/res/values-ja/strings.xml | 2 ++ Source/Android/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index 39c6a252bd..b9428c0890 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -86,6 +86,8 @@ 画質向上の設定 内部解像度の変更 内部解像度の計算方式を設定します。高解像度に設定することで大きく 画質が向上します。 しかし、ゲームによっては非常に重くなったり描画バグの原因となります。 【ゲーム解像度の倍数】は【ウィンドウサイズに拡大】より少し重くなり ますが、描画バグは発生しにくくなります。 また一般的に内部解像度が低いほど、動作速度は向上します。 + フルシーンアンチエイリアシング + 3Dグラフィックスをラスタライズによって生じるエイリアシングの量が減少。 レンダリングされた画像はあまりギザギザになります。 抽選でエミュレーション速度を下げます。問題を引き起こす可能性があります。 異方性フィルタリング 異方性フィルタリングを適用します。 奥行きのあるテクスチャをより精細に描画することが出来ます。 特定のゲームでは描画バグの原因になることがあります。 Scaled EFB Copy diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index e61264d5a5..60a50d39cf 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -86,7 +86,7 @@ Enhancements Internal Resolution Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games. - Full Scene Antialiasing + Full-scene Anti-aliasing Reduces the amount of aliasing caused by rasterizing 3D graphics. This makes the rendered picture look less blocky. Heavily decreases emulation speed and sometimes causes issues. Anisotropic Filtering Enhances visual quality of textures that are at oblique viewing angles. Might cause issues in a small number of games. From e82c9e616d71448dac6b2e1368c42398fdc0ae19 Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 22 Sep 2013 20:38:03 -0400 Subject: [PATCH 263/267] operator= is a function too! std::forward is still appropriate. Fix the potentially unsafe use of std::move I added to FifoQueue. --- Source/Core/Common/Src/FifoQueue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/FifoQueue.h b/Source/Core/Common/Src/FifoQueue.h index f5713c85f9..60e23bf0ee 100644 --- a/Source/Core/Common/Src/FifoQueue.h +++ b/Source/Core/Common/Src/FifoQueue.h @@ -46,7 +46,7 @@ public: void Push(Arg&& t) { // create the element, add it to the queue - m_write_ptr->current = std::move(t); + m_write_ptr->current = std::forward(t); // set the next pointer to a new element ptr // then advance the write pointer ElementPtr* new_ptr = new ElementPtr(); From 184390d8d70ce41e39fe20338894c6c27ac82591 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 23 Sep 2013 01:41:44 +0000 Subject: [PATCH 264/267] Fix the icon used for Dolphin on windows --- Installer/Dolphin.ico | Bin 51936 -> 51936 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Installer/Dolphin.ico b/Installer/Dolphin.ico index 5e133fcd9baeceeb502acd9b22b0ae8a03546c78..ead8505da01919547041d9dcd53f08e0d3994203 100644 GIT binary patch delta 398 zcmbu*u?@m75Czb01;wQ|Ae5905Gm8JKw1i0VutL2!~#J=u!h;dU0hf;cjnU2=9=e! z@>#b1)cC2n<)yn?Man@-i$4% zVpmn+r=EwJJ4X+4Kt^FrRIDzpA!i(*Nl)`ev>h#?H0XTr#~#PD delta 398 zcmbu*u?@m75Cza51<6Wv8(>OG28fhtm?DKOF+=u1Vu2tbSi@|P4i}cqow+o$x#szw ze3tDnwP9+n`QfN5wKke{el=;1e=eHUk9$iaxz}Bs2Xhh8S2IpzsG|hGXPX4{L>;)I ztv1U~GY>Ue&kyoIMiD7CqA9**XB=SI!1JU!%ZsQDJ|D8NtOhJKmy%WfE4iT5c8|bq He4ck-z2(|< From 0a093cf1b9ed57312eb3f668898b4ddb3a3ba70d Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 22 Sep 2013 22:01:25 -0400 Subject: [PATCH 265/267] Why do compilers assume i don't know order of opperations? :( --- Source/Core/Core/Src/NetPlayClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 4e741ede1e..ad498ff744 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -492,7 +492,7 @@ bool NetPlayClient::StartGame(const std::string &path) if (m_pad_map[i] > 0) controllers_mask |= (1 << i); if (m_wiimote_map[i] > 0) - controllers_mask |= (1 << i + 4); + controllers_mask |= (1 << (i + 4)); } Movie::BeginRecordingInput(controllers_mask); } From c8c83f7b8a0b36191755dccfad70019e8610c698 Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 22 Sep 2013 22:11:24 -0400 Subject: [PATCH 266/267] Remove FifoQueue iterator and RemoveThreadsafeEvents. No point making a whole iterator class for the sake of a function that doesn't need to exist. --- Source/Core/Common/Src/FifoQueue.h | 37 -------------------- Source/Core/Core/Src/CoreTiming.cpp | 14 +------- Source/Core/Core/Src/CoreTiming.h | 1 - Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 1 - 4 files changed, 1 insertion(+), 52 deletions(-) diff --git a/Source/Core/Common/Src/FifoQueue.h b/Source/Core/Common/Src/FifoQueue.h index 60e23bf0ee..19687e8a4e 100644 --- a/Source/Core/Common/Src/FifoQueue.h +++ b/Source/Core/Common/Src/FifoQueue.h @@ -92,43 +92,6 @@ public: m_write_ptr = m_read_ptr = new ElementPtr(); } -private: - class ElementPtr; - -public: - class iterator - { - public: - iterator() {} - bool operator==(iterator other) { return other.m_pp == m_pp; } - bool operator!=(iterator other) { return !(*this == other); } - T* operator->() { return &**this; } - T& operator*() { return (*m_pp)->current; } - void operator++() { m_pp = &(*m_pp)->next; } - protected: - iterator(ElementPtr *volatile *pp) : m_pp(pp) {} - ElementPtr *volatile *m_pp; - friend class FifoQueue; - }; - - iterator begin() - { - return iterator(&m_read_ptr); - } - - iterator end() - { - return iterator(&m_write_ptr->next); - } - - iterator erase(iterator itr) - { - ElementPtr *elp = *itr.m_pp; - *itr.m_pp = AtomicLoadAcquire(elp->next); - delete elp; - return itr; - } - private: // stores a pointer to element // and a pointer to the next ElementPtr diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp index 377ae33a1c..1609043600 100644 --- a/Source/Core/Core/Src/CoreTiming.cpp +++ b/Source/Core/Core/Src/CoreTiming.cpp @@ -319,21 +319,9 @@ void RemoveEvent(int event_type) } } -void RemoveThreadsafeEvent(int event_type) -{ - std::lock_guard lk(tsWriteLock); - for (Common::FifoQueue::iterator itr = tsQueue.begin(); itr != tsQueue.end(); ++itr) - { - if (itr->type == event_type) - { - itr = tsQueue.erase(itr); - } - } -} - void RemoveAllEvents(int event_type) { - RemoveThreadsafeEvent(event_type); + MoveEvents(); RemoveEvent(event_type); } diff --git a/Source/Core/Core/Src/CoreTiming.h b/Source/Core/Core/Src/CoreTiming.h index bbb35f33b2..cd8321c10c 100644 --- a/Source/Core/Core/Src/CoreTiming.h +++ b/Source/Core/Core/Src/CoreTiming.h @@ -49,7 +49,6 @@ void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata=0); // We only permit one event of each type in the queue at a time. void RemoveEvent(int event_type); -void RemoveThreadsafeEvent(int event_type); void RemoveAllEvents(int event_type); bool IsScheduled(int event_type); void Advance(); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 31baf28abb..22115e4900 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -135,7 +135,6 @@ void Init() void Reset(bool _bHard) { - CoreTiming::RemoveAllEvents(enque_reply); u32 i; From 1da6469c62fa1b4fd669a48cb583e161d5cb2713 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 23 Sep 2013 00:23:10 -0500 Subject: [PATCH 267/267] [Android] Use new 4.0 icon. --- Source/Android/AndroidManifest.xml | 2 +- .../Android/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 2675 bytes Source/Android/res/drawable-hdpi/launcher.png | Bin 14225 -> 0 bytes .../Android/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 1665 bytes Source/Android/res/drawable-mdpi/launcher.png | Bin 8634 -> 0 bytes .../Android/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 3828 bytes Source/Android/res/drawable-xhdpi/launcher.png | Bin 23020 -> 0 bytes .../Android/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 6063 bytes Source/Android/res/drawable-xxhdpi/launcher.png | Bin 82300 -> 0 bytes 9 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Source/Android/res/drawable-hdpi/ic_launcher.png delete mode 100644 Source/Android/res/drawable-hdpi/launcher.png create mode 100644 Source/Android/res/drawable-mdpi/ic_launcher.png delete mode 100644 Source/Android/res/drawable-mdpi/launcher.png create mode 100644 Source/Android/res/drawable-xhdpi/ic_launcher.png delete mode 100644 Source/Android/res/drawable-xhdpi/launcher.png create mode 100644 Source/Android/res/drawable-xxhdpi/ic_launcher.png delete mode 100644 Source/Android/res/drawable-xxhdpi/launcher.png diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml index c80638bb38..d3a0ddaf5a 100644 --- a/Source/Android/AndroidManifest.xml +++ b/Source/Android/AndroidManifest.xml @@ -18,7 +18,7 @@ s48kidPm9?>o9G1`#)cARq`5aD+iQ24Hhlb zU;q2-uX{Mi#VY|$=Hs1!45$Nz$be)({sj?PL9&8m1^GunR*--Egj%!xILX{d7LVATFI5GqQ zuLMKWEdZ)OHF%W*9LIr)G#EP##%hDjY=za}8W1dclk5GDYTycK)EVITG_pB>-hHYG z4v6R%I~cv92fA##EgbTBV86p^KbJO1Q~2TlC1wUf@!)slz=t%D!6CiF&|_F%gb(h8 z?liL;-+5t*g6M)|deDHzsss)G32BIn277X<}Dc2|gd1;=CEh0!=plfb$H zOskE~kK`AJNGaH=P$`G@9z6(sV}FKjJzwccpB~w2t~WucQA15C^i)VOm1+g1o{Qmh z&%z1c0l8vK^ItfgU)wik2sdc*2(OMm3uoQgY^pYF&t4S1_F47k8=&`7yP<(U5)>XX zZ$#WgiZNl&%AZc#ExS@sugfcq#Xl2Xkb>5ys&R)u84=ZI{_wXZLZSA&DLon;2a$sI zZHf)oc^(BKa8JphTI66-3$Qtr;6)LEv`vR{B6?BK7(lT*irS2%4QVXd>FFz}MqM59 zk9>C%nxIA4v#{FNcD~l@SV8X`+8FujfKP_cpVVRSC1Vc>%1%*<-lsatkg_cMY5Mil#ygD~@e@E&k090>is|>+c7Z5=rS(x!kUD%9EXG8B9umk_grsCc2hlo6=BL zh0=>zc2N{o;lQ%JUEz;sK#XyHHs)0hnikW~V@Djc0UFG>^7^ycVmgm5|GYIm6Rcu(fOA`9cb1Ni-9I2HTn(_z-PLJ?eX|04cK zsl=a1y{>V!7|o=ls}7owrASFQXo1Pt=QPqSC>{sOSF3PK1=M!ta5qHn08wF9Af&KBfJ3E~AfPQ&+eo$EG z*;n71#Y;=Y$6})uRZEMeo(xL&GFFe7=Ii9ZHW%g$U?wPN0jh$I7IOEW&QbU2-zq)1YkTru2aB-BeU3hTsN0Sx=&Dd2l8v1iy^8r<<#yEO&Hc$jvy3^*?< z?)r`GlppzYMbhzM)lWcD^O#etpTmKZG`My_yXICN>hG5RK=EZcIsLu2?qW`|XtJ}0 zoL(U~9l;N>awq`nv|#*V9Q3|JjXK6YqC1AaO7<(SWjf7O)st~BA*Z9^Jr_Wd6QrbI zrv;zU(pW{)8`=J?nXtglVL$4tO`bwx!1`a5@O zq2%K5jrReMI>NS6cWdqDCTK5Rx+HwFWX}H$pjJnsQ`ta)!>{RcBF$)Y>-(naY6`-+ zw5?m}D5L%@9X3yO z<>YQ}thm1g$xCl|Ycu>Hn@vmog7IFtvbG@aH#iW#`=tl;-+0Ci`LkA|T|a~l`QA%Z zGW#4(@nc=ad(k__tQZKR2 z0+Q+v-p6Lb$u2**e)-?_FXv2?0l6VCXb=0+tSwvFa3^mPVGd000McNliru-2w>_3pP|1Jgxu$AOJ~3 zK~#9!)xB%9Zf8{{_&oD{*ZRJ__qpffoaE#}!ZknwLBridZ50p;wF`>!f)rkQAm!+R ztv$N!R&3j{dKBGaRqL=?Ez2&fPwV`t=QE$@nZ$X2y2p(e*JZlDa{%ZLX{{|Zmqu}| z05EV6WB>-jb_nCf7O+`>t^y`l@9<3nItSJZuxPM-25dFR4Rvl93!p^I4g%0P0;Pa6gLOpPbg&}~LObQa9GLYL+nYewkEp9X zHa7vZhI$c!(<9pG5GpDiHZN$MAP%UD4vhedVcaBmc7W}y@B-L6QTGyqJN$SWvoYST{w8XYu)B%sExqy!3(;``JD7Q&sdPH-2j0TQ7OVE#S=fCDl? z4v>W9>ozyQ9drjOVFa23Rt*q9kKYG5V1Oi0ghl{WfCF%Xl^_L7?~Q<5fLXi&PVZeH z43Yy7Bm2%rHf z@i0&TBLNVSAXj{Li<=|>sQF+@JW!2VQf>2Q`91~Ct7zMb%V)^6*H9$r2MnI4RTD%X90(-&%7=*4iEr#wl zF4B=7JNm$(hJyl*5QPUCbfkh8w@c{wD9LXEU<3pMgt(cEg(J~HfpAE2pc>&4p;)q@ z;DU@4DJuXC)F{CLl(_410wT$H9WsCY&|oB0p?L5h8shgCk_EyDsKw`Ges;v7MJxpf zE$<{LN`QfI3Wb0v-zR`3vQie$lvKP=D|wemm`HbtMUayc#9n}tMhYOzIISkIEVpe$ z1sB>-NYf2ln7{C6erSB_d*1nNXTSaL{SjCW4Qz)y*(Kwf2z*~`H%TM`Kn-Attw$Qv zIkepX6ioZrYHsB*jJ$4eP zxbq$>R2pNYd#rw|1|J1j7q17#3W8w8;JK{WJa$YmkOp@}m=mEw@Vr2+*cyn16CsU7 zhyzi83Gfm-tH%8TGxUjoxzt26!+dr7&Fi1t@v@zddmx@WFCA`@@E;&ntB4ic0MuBP zh}}vdSK>&zNmc|cK$}rMB9^Q{q+kt{Nj@-EE?pQSf}k%EXh%_ul}I=l>j&&Xb`%GP zHxW*;7$h+6`U1i>vDg;40LDecDF|pr%t{_eJz09m`uH#~(FvFlMoA;EFtVCJA(kD5 z2E;p)P%PqQQ|vJEyxk8%6it9cIU++TB;XbfQEA-02q;GA9>wDtZEP6S~ zss;&)MFoKtPkcI%P#khVHDay=uqQ-o=T~ZNLBB3SS!`qVBAgH-?pnq%3DguGBoYKG;G+|jz?kpd2(@LGk(+a4&cfwS5ZnV z&dtpc_a9m3@slGyf6o>^^0B*k=cn%iupiiQfUt`Itir7jtnu(8g_xph1bG0g5r(}9 zr4wa>j{-ZA7Rg5jUr0b38d(Zh2oXdBP#iRi>q=Nhcw}bR*kcyE>XtM&YKI9J;ea_D zCMyk+3bf9|bn=CFV!;!>`(pSO24@^T|)#ryV<1rgU28rPh%IwUM8@>!g1FEqCHy zzv)hX`jbZmTn?^XN_4v-$#9GGf&yve=wf9oHb^X)nO2jUBC^mTJB27gf`M{Uxq3{I zhH9NO52+P%#>K9i%XIY^@z-%jMi6rA2%Xa&}RDpcg&EnhLd z)m^emP@pTaR>tC#4W z2b{i@-}#clH~z{u;(5=yih1+nwX{rDc&^^R`4x1UBzpkRQbV=e-*SAz6(m1WO(<#lQk) zLUmX}z1dogVn+bHxx5JID3plusuZhoi$d%om!`W|T$~v&gWMorIM5)CO{j4m(I_u~ z$4MR;QipiIMEr$o%K3#N(FVZJ$`|(uo44YXuiU9O{n`t3)noR5r2mY zsAeWpOH@ZwCY1NWy2zk}$oH998!8}kxEyE;(9goR?}hp8`04-tQvBAhd<%B$Sk0xK zcXfGxzxe;Z@H(FTxvyV;-DUXQ-@Fmec+Li}bq5NLq1ZOiMM-Q0Qx*%bOivY};$JC} z3;@F6=y#YbBQQ_{Uzt-+04wdF5kHpq;sk%}*0PM4YC@A~vHaq97{%!dR)5 zWCc+Hm&jsFT!|{6ipM_8tPTdkNOTcq*#UAx^BJr?Fh;f60S*_M!w8{=NP~<*rBp1! zQGs9r3IsDvu!tOygp)!?u?VP=+9+{=IH+k*U`VDo5)i*kO`^lPQD!HF6Sw2JH$t!f zndix@gS$j>S)6~Vu=7Z-b0_GAXI!EG^>x=_zTnbP+%rfA>=Ohh@^rpl*nw< zGMwh&7xlUWvv_X-AW~`yc*!7mRB|p!HGl+m4)dMo3JG|N6saTF8DzPwq;r5;14JfD z=)eGQ^jKdr!6azmkVc?wgSHON&VuC>teyq52}Z>S_5@38YiNM`Y54ZtxaMga_>I>; z9|sTYiEVCNhLXQ2)O;n^|M0u7#eeg|hk%Vcq2VZCoA9B<=S_6ivoce2pbBLcP(`yu zB3#qapCOf?1@ao_9AGu-9!^wV+e zQw}jh##a<-9?7+5IC||5U(csJtr1)I!*G_Ej}#Rdi-B^F6xB#}h^(d~%Ss?QB3Wi7 zzHXvCLQ|lM0Zckcl{_pUxJ9vUZ8HxO1ImnI??7>}gRCGj6Qg8;M#&9AXHYe{QRoez z354W?w*+O{CbWK3mtS#QzxMO{aP#XA>WNoBAYZ=+@^yhj7A=sE+men0i@Wt-ea}IC z*NdK%i&TGWVdvql1IYvq9^9kX{rI)A*%A0~Ow^WuhA18(6u~-EnMVQXkZ2K(XfB&U zpkNlkA@Xbq9pn{Ikl;gEznJ^Z32D+zZvcu&#p?TcB8p>@b@|?f^y)c&i4o z-5fAWKxpuUd>6!Yjmpb^*}Vapo1%Vp8>056~_Ap_k&)&c}dNp^r0C$L2y zPe9v8=v(*E{TQHAG;R>w09H15?Gx9QTmHspU%{8Zcy~Yw?JS7_(1L1b2s?(?zUm3Q z=%U@sxc^lNI}eu;0iaps5C6j_V0GtdVsVmY1H_Rsr&C~ObQs+QR77T2qQ;NP*5S<~ z_;&>=q~KJddW6xPP>W0uMVRj{u(ANq45C3DBm)?Yi^NJKm?Sn>p{&Fh{#msZ$0dM;dSl;0noSJcoklB(>`JQxW={xMu8=`2i)c!IX5MAlo)x5EGmus zRf<}OiWU}tN(nA_11PZt0y*@A4K8>e4HLRhI)JmtE8%U~d?+pYd}eC5lYg17$GO?>%(IVZMn2iEW9kq3`4TlI90n(^Ciyo9KyiS1Ls z_8HE1E_lP!_J7qv%_F&CnNo&F0fsTMndBHunJ_76 z^yoe7T*H`^k+TS6U&Su z|GUIncJJCL3*y#8AmSH)^ELW!|M9ip?0#+Ccc=d1Be#9k3a&37g5q^+0iN}=J%XK- zHXj6aR?wg}wv3GoNVyBxIqIQ6t37BVK};Ef1VZy{*t_TuJ3tmBC|a=j3a!pN1&8K`3f-K4{Yz}Prm;Bxb(mr-}u}oabmpvO&@xyK!4=>Z{mq#M__d9 z+PU^szu6CWeO^HZD;!D(KSSgZX1l0ODNf5WAZ-elu;}Nq!V4!na|&e z`;UE&FMILRRBN49md;yc54p}&N0NH}v!9CRJ^NbreRp0G^re6Ht8pFSGn(uqabR!9 zKYH(7I(2*w&UTWulRQ?h%w@9ZaTvwsu+D->G!gz>(Is2i} zdSj5m9Ej3r;`LHBS}0sJwm_bvC@Tz#W9~7hMhr@!Je|- z#6SU~yWFPEmn1nfNLDCd0dP|<`i9FipU=?THEr(;naTWZXGB}uBTlamLa71`RxOIG z=nV%aC0dmtU2YDqP#be|F<^Wv23gXKdIM%fD1e)w5vb#;P_~oWos2M3Qudrtb(N$T z4uC2nkwp{~fCFv7o*i|$fW8oC`OoEg%7y^oj=N6c*1NZWG6OqC#dm)2Fz!8Gh_#(b=U6u3!4_q|TEOx$h4{okb=g~~2%b#|ZVnlY z2+3o^%?#YAux@1mn*rzql;}XYyU-N;7BhiTF-uZceBC;Th2p#dHq!@gIi@J-|8opG zd`S0gb7M>Y{vC&bwo91pl+?vOY02raCKSmmh)xbpS_(ly>!ev6>l3)f{dP z+gV}Tn+5Vbglq6sIAcg}EL0&@3@EXUlExX$cNkdaK))An`;RB_;g8>Y4i`FaJO5n` zI}Njm{)elEj7Nnr~}6r^fJWHFRl;3hU(1@~Wp zGsnSK|8KYAvxnF5+V8uL`}gfSho5LnBGI|f#AW03!iAvovz_1l(@*1LpR2?b*8;1T zf&Cg$XP_C3Mhy-XqL`>j??zFcv}ibkE}nGb0ZgsHsw`t0YA;5UE&6GS~Itn35kYebn#&45|T zJ)K|!(S>%b`P8g!L4+y{;l>E6NM&X)IE5xJ2DpetgcAbv$Sz4Ewu_?Gz>NW$L1YbJ`66i^Mfb4W%RY0XsXO--VCdb{rr1)M=m`2ihjEA-wmM;P_3X>D23fA8p)6|>5Fkr zxLvfoKVpksq*580jd{zivr1~R2=LU1q9_0C3ZPejb{UIkmR+0WGfRqH7wBlT2MDwf zi=rUE-)JR?kzFOq3b11jv9^bp?*rBjkUKBo#$pX``SZK^dw=p#`gj)4d&U*aW9>hg z`TR()r`-oQ?>Th_pF4b-+BRY~18B5TS*^fzP9wCWbmm=wmB7UeL{s!innK)B3AAK} zTk51sXvru}K*C{{-CS_}&#jp06=t|hk=_P8TL^k&J08ukfLjBl3qZRjBrAxMQmLbY zzh20$7y1>TTVv^W2;C|)-$~AQ>-1^iKYaMJ9M(_izj)5o51Tc8wXYw0{>8{GafFF0ZK#{2Md8Et&d;ux@CrzmF$0j5WQkNzHAoKO&0s=} z=n@)mi-!V9MVJf|V&jIpgjxeU7ep|`VguI#oA*RFQ*+|a{`@v}I;)#*xaxw2qX~s` z0bN)5&Ck3_m+fhI$A@p{u+hZX8m!LfGzB#$lm-*5$KfK~T=?|Yt&n^L$;;fsRv;d6$|`MHT#%IkQPVjUA}KIOC}ZRMH63y`i4qi_ zHi@le9+<6KA=v}g1KZ@gK6D%Qt!&`gPkYRH43-O18>9$?B=L1mz7&r;Ainbhw_$S= z;A~FR8V(-Cf|^p|ro)sdLY4y-WCoVh;u{%OI0QSJEJ?^>hs|-bsU8I}peS_dYslf|^AH^j{gm4c_ zkb;z{hIHC0VKt=Jq>{7a0U+%xFwC>MDnePwQ@rQY@&t+rX2BZmN_2(5Fh5b6J_PAg zss_wVFo_kRpUQ5URZ3kj^4fMF5-5OmCd_8S$}V8f0Ug`yb;}(OUT}_3z|jwtxPH&K zKTW^%kDsEdBkX1}!^7ldhY9mw;bo6XS0(L?T!#*jHfQ!@3!g zRdK;FqA$d$0N{sS@?^Z=`Z=(E0`A-Jt_AAQq8^K^2EaTEvB`6yi$xvm>4d12l3xSZ zmDGiA3#BgcaDswYqc!XCQlzd_sxo`KJkH7MwuPIX+=Lt7z?fA@V_5f|2Y9qt43^Xau#6BdbT1;mhmvtH~ z)*}g`HzreJc{Y}AfLWhv>KYWfXyQoAUQSK*cgZzUB^jZPa${2ROlIjNL@0_D0w$rS zydk1k3Hd6ElG^8K$L2z7z%b~NeRExYaM#z2DIMe|JVcuoE@drZMnQb8&Qi*%Ww=%` zAxb4k!6df;^%TM{2TS;5GziT*RHB2cA$lxXRG0(3K`k52OwLPHa_s^;3O6V~WwNS? z^j_Y;F|JXP7N0&rDS-+DiJDYvHF#@)7Px%>92f0g{hEZJhr^2iV0#o$Iz;iApIPTb zC-BJ!PmmQ54l|%_5v@3qqXn8L%RHpkHV}2O3TP2Hci0pr6Z>3A7E19^Pyty44WZqz z3UCO(kX>#-keL_5Tbjbv@OYDD1!>u^9s=Mn%Xn#xwFFN8ccnqUzOji9+;$46JBixC z&A@6@%YI33)FK6p1)=8kh6ba}4elwdPO&@+=}KZ08w|k%0_UM?5<_YVlh`9^jA>*s zh4m1pNhbNkC+cz=hDJ*0CS!^qyKok=%`|L@j*m?&7LV|yY|#i`Q>OI!4f=lubrvB;+IB@PB;-|KpoJ53D^7T-^hdKHf7F_p1m#q%CIpof0hs844-u zlA+Onk7_=xvBG7T^ziF6knBYw; z$q<$y3b-*?O45{gB=zxY9Cl8fS;y;s^L_Z0w;v~VJRaC{39MfU`6)Q{tk5E*B+S9y zz!nH*DL)Pvuc8QXazv28rTr#j|%+&R{$H*<`;#)O87s^ zC$W)F4z01J`ml8MrAtvzEfD^9uo9+p5mzi$OATL9Rwe^G8}Y6ny_V$Fr~vA5@3C#1 zIJ5bXMS5Y_(Q*BMy!kKi)^{HTc0V4r^ANbU8(dofSfL?xcXa~d6MGB4Vu%i(46sa4 zr??-pEZU04y)z^^x5B#Zu-SDc${DF__~i6KM^p=)R7#Y?U4RKet3aOCWJPFU;zt$1 z(jijek`)q6Ye0N&oP6n}!?^*gGaflL@W_dEoO5=*FvV9W^BeAXU_o4Th}?TIw6dGt z&xo!AI-|`4=P$mb=)#+`k&KjD6dPG18mKWGBqL)Cpc0d35`ej2g9fm(D5sl;H%_J4 zM`&P?N=IQ-X!|>gkxI%cWnEaS$kKT%+_?mWe_i-r6FvrJf?6W;N$ayXkW*0IG^5)p|Dy;4j=4(*xQg)gWR6A57*Km*zEkh{)C0Kt{u4{->xBwIcRzRr$2KLbtO&KsQ`TiAE!t|d`=X~3 zXgu3gJBAyY*HqSbCab12_Li!oYH)*4LlBR(1q>TQaDCF5e1yUqsLRZT;Sz2=ljq`4 zWl-9wb6)yLLyBHtRhEPR`j*-%EN#G)4qXB8ap}Wj^9t@*!^b~+3UB}L9T$wIIQ{w5 zT_3B( zDvqAoxZpI!&)mNb*b1>S2h1XD($JcM9cKoMjX{h_u9_KzFwIr)l>>Wdfm(_V)MygY z0H0a>ECe=(l|H--&?h@Oe4mBRrINZZ<*_}sfT>-fsz=(mm%w?#!vj)VuC?$iiU_3^ z%{W+R*+t5XE4_CRLI*tpFauAb_m@}XqNFNkQj{;ixf1K$P#S@ zaBreFF}r(d5Db!HCs_q(lGB6LpAJsu4P`;pn0I1ejS(fS1?0-Eqz*tpXL-7Z6+6J? z_H#oBI1qyurq+@g;O^NmibBO}7@qo=owe{$2+_ybAdYY!uxGX4nkz2)iZU5amMo7j zgPKCnEuTAzzrJS^*l{IjJvgg5n}K1~Uj(PXF(Yr6I*F#pj4GDHD`HGb-luH7SUkjt z!zFzY%uwSd$6{>?Ph2swAuvfso^jBORwl!uM6gR{DJ|M?bOls95#%lG-$7@YK)Q~^ z7;j!4tqxQG<4A0t#bx_CTyb#sSCq*tg>L-vB9Zf%7a#u2gE+O_q3qwmHm@-?q=wsh z&N`qufZ71F=-L=zy^-M=5v}nOeHC~v_GJFkBaKzKa7XW}H5eD+cOT^%Wj(>Jgr>XWo11#TweiwXoRp@)=V2OypC4z0K zh>04b3uD$;mau$SK1($WJyi0B)d0|(l7)^y)2J2i45pn0R&phmlwKlNycD7YHE5y9 zj2GTKu?;PaU6ZPn8N<142YO&w)xzwwHMFr!88OtQ(P?v_Z3EiG6A!In*3Z785cG%d zy9K}guilPdeB)cbEUZ2K@B2UTdA#e>CxIRNfI5$DTd~A@@?4A^mE3+#Q=Xd8CVMi5 zzc;#=ZAJnd;$ERE=cK^d%&(QG1v%+wLiFIv(MdFeJPIzWM59<*gpuXoBncQBZ6zzh zmRXasFfgB5c_Cgv$~n^)-DxOaOti`&G7`lvL-O`V`hH^YiD-c%sY@$YBTxhK{U43BZqwa_S(4YLpr}W-ij{z55qHCY{Sk>D7 zjUgz)!H7@Yd0!kzrKK}K%R*9O7f$3}B+X1dbx?BnnatF6=>=4h|1*YY%p+un#o5pV zc$njsF#N0Y0<*52+hz$fSeLz_qMUpOv=)BJ=qEZ@*w$NN6lt!Y#~b11A#SiNw>xD< zn!|o-)Z$_771Qse0a$F}q7~sW2X;NIv*DKuLHC~A1jY)?R&nj)4rRamOaE*r+bdph z!()NrIB@0xl<^p#(~xgLKEmCj(^WCKR-WVibRoECN>6PmhaP3)-W6u9eS|d2nHSzM z8aQ1;*!G3Q66iqD)3G-?J;{rvP2HS%a(L3?MboG~BiR{BItS7cYA&KjMHwt>%jegL z4T&RFQ5=EAIxpF2Jh*4=k-Ht9M_(MBMBf3{IIBw)#+P+U{Gso7HedRj1H?U_K)dTx z^b>c}H;w`u>$EmdXwYDs%6po~ntC~s-bglq&1rOo@SUWUAkukE6;a9XK88or_Qrr( z_s-BZ!j?CL1ToKxWl55e&GRk`3YDai=4en2xfD_l<&825=oMs90q#b6WC0CMdf*}< zYI6|-)Ygg3lX~iMtj_#%|x=dO<2y&H<8oa?7!bm$O`$-5$zB1zTIHlh~ z&y+Dbj0Ai@(1TJ^X`Q38CLgOQnWfqPZP~f%Efn%Y((1a@O?h_FQX7S)Na&OLua*T# zE;ThEWV8X(0?5gEBeZn}IQ0OkPU3rSd_K+zy&pj*E0^@0hmYgqcOM75;yKqG!nKdR z^vh;J(XS5G^ZvcN@S5*_9$xd^j=#L^Fn;}=pTWQRt2?o%j(aFGTLVZ~nbi@`#1$&SsN6B^3 zpNSIToHmNxIfHywG6p*ZWqUH=jJm{0EMUWF;>`WT;oI^2D=NR~>5rX)+M_aDJ#_JI z9@x8^P{X19Ym@l-Zxnhgt;&)SFl8cN_r%Nj>pyxE{)cZlNSr*(wtfm~+f+^URk!4F zfHPwo$>vIb8qk7w5`aVu043+fV3ROJLmdFCFq|2phuK+ldctN)nsA|Ir5p3;fUgBh(R!p133qs|-aC<0;1Q6WaQgi@*C z=;wauV%8eMZ83^XL?&1){8?*5TY7CNX>(F^v1mEQ6`1nk(1_*iUD?v|I2O`00=AxG z7`OANKGrjA-_=0hfKEODoW27;`K=e@=l;R7uw!lQi;OhBY!;L;=-nT?6YJ{@nDtnl z^?0~HkJLvxnR%Gc=XlOzcHzBuZJ}7h7=nwis|QgyO%92IOg+IddoIZ~@o9v{G@g+$ z-Y~`iRMa}_;vR<`7S$WLh^-k@lCsO04KUVaU?xR)2b7*fn|85NC5sf1MnWM{3#hgL z97k$#1~_{kUVGC){^Bd2JN5T?-pzPaSkUgBYs7pGfVlGDKH{M#?^k5v0f6@$T}PCw zPBK^=G3F=EL?g*Du2GW{mEFLlbwQUjy8>Xyp+HvAMu!au2XH1$&_|E4krM=6vX>Iz zQ{X&Pgt3^)5urwcDexZz)a==%rvYA)!q*(W7^Uqqy5?fxCth@If=T*{8u1gLQ2S1p z&4q3iAG_zoWIgz(ZSW_V004aU@Pm5q9VdnPDpaaaOX6dYl?YP+gPah99CEylLzLK4 zoJBD*xiL;BPBgn5#-T2U^q5WWTaYDHkYUl{F@7UD4%oE^s(l`cNl6@u$g+ho8RE3SwwRMNd>X#Zq&yan&|U)m z_tkA!*eb>kG!Nfn7F+6@&@n_7p}HW=LzLHn?8V8xtPKJ3z(8pXeo<$P$<3)KG!Qd@ zGZMA%zEfLR-&~x_Kpvqq^$WFQC(dr-(?_?6mEFYN{Wvl16}9ZD&~}@6ox<1{F+xffFZ)#irn6vWO)N1M19q$tq=SjJYq8*j1bz!4um>=yw5o z4iLNc%Vs;^wWpayi*^953#3K^$Qq(NjUrnE1h@3bWBY1;pU2I~cz`O!TYF-+8&?4?P&moE?uokwq0$g+u zx88k%@BH*(eE-FJr@=j61Q!pB1^@UjZ^yrU`$utfvyo+vGN0jWGk)rXL9@NUzDvlJ zoxrRIFe7RY%=Q8p$s(ZTF4h9$u!VcJ7DOAPM0XLT16DhrTOs-tl=%wOuaKp~a>A?t z>jI*mrc5O?6fwRbv9UC^<+8UD+qaLlWENOMrCQYw@f3f1_!yke#h3@^q*mt>p`9lvvb}O&gGglWH z0d8)Oy7R#^xb?x){L6bz>w||kaCU1(^gD$498gDaCLGuWTU(>LRjJHiwUE{1iw^2n zLiHaM5@KjUTc{&#m7tSmw4oa+K^)* zVe&-^yp8gfQ|K7;B^g65rDm~tiU+xCT#&xT~jDvPU= zv#>P^%>=E_RI-6SG@(m-00#enLQRT1ON$=Pgy$LzlA+i!jG6W_)wfA3Da z>t$E_%D-EG)3(pP&x)YYq_IU)v<4qhi!{$k-!o)eGJ2%S#(UNig}?&K5wI~9oX}!w za8D^;1KI-G*Z{^YV6g=ZL;POL;b!w0*w0{f4p)s)xz(cIPz-d3gRmNk8`q>)PGW0G z9;Z7v3#)}T2A?UGV`$qf?FZb`jk)IM90GS?XV5sM+0kKw>l}Y}>GF^|;Sirh+8rRI zPztf>= z@@F1IEyVYUfD-PiW>DAI5{lE{K@{%O+KV;~Lk@lHj$NR35UnYD&D0=?hB7Ne4SE_q zLqU#PflU$~(9MJW9wksTzAaWUYJpT3>~Eo3BoPUp5Tv|0j1~vJIna^bB8o63BZ*zS z4GpR1n#3j~IK-r3Ma!mi!xPlH@EI(KgkmOk!*ENZzuMO$R*j7EUtPECWn} z)1gID7i;=6TXJqv{v=IJ|MM*OQ~t`OB7JfwOasCpAO`CQSBuA`?0qYYSSOq-SQ>%6 z1|HwSr@!$Ql zH{%apC4Az=+yL-{Px_Nj|DSiBxbo%J>$Mst7n430`?PJf_`{Cbv z-?x49I{*N`y@ox+U_-E3fzJtBv`}vVu-Z_zDu(SbJoQ&P*wzTZ zF&0A|4cH>M(lAKCYK36{&H$_(+F}G2L|t=?sF)XG90qu^R5NzD2}U?AXd{aTPwpk$ zQJP>YfXxdU1z(TZFn)G`D=bhnbJQw$2l%OUZCJ_LaVwBw?;I*KpmX4C1LtgdS$7Hm n@H*MEzTy4;!52P%dC&iUD3UZXIwiy000000NkvXXu0mjflsT7R diff --git a/Source/Android/res/drawable-mdpi/ic_launcher.png b/Source/Android/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..065f08541d724a532665e02642d09e73965dc720 GIT binary patch literal 1665 zcmV-{27dX8P)9u2!OhV zK(~8M6>bfReTFk7EC4+Hyn)4L0c~Q4Rz7s8=VtqlJ-eUHeYya4)Nn!7wS&cGe>8R0 zv>E;pK`=SQA2=R7yLk-5I#Bh>K_MOhl|%;9V?!V?G8nP^%^Ti!u-TCLdo)#PH=qrJ zi51v}0^artYc8%hG00z%4p|gq&(_wyZ2;SfeTBkFH|C}! zg>nV_F@ETD1B*Vy;zHSlcxb06idY+E5yC33fe;Q2@mSds1hyQnQPy^{b_v`rt;%P7 z_^(6uTFv8vunE9pN9n%E)TMj)J_3t)Xe`BNb?4`>Ab%}RF~`?f05~E;{X4}0k)hMA!t_vFc%dqZYI8iiZOf&EaP%Tb z2L?Vt>E@WNhWcgDT6VR;K*LHn@=~9pImQ6sZz&0%w{gW?uE6qv?YvlhMS7>Z5Bu96 zXTC39JuwLfKQywb!S8asm*BMx_v?U5RY1=A2NM;N-b{Enpmq@ku;ai(D_245Zxu~? z8kWJ~HBv`Fi~%rtZ{>So%N8FT?MxT~(w27Mc?)oS^8cLsI937YI{@x6Gz})b5sVrw z=#)dCl_^2pH$WS;+Up3W5Cnp}i3(bDj>MY?6d@5abqWM=Ms(F6^jii8leG3gSOVB| zEG8f_q9Q0E%I@^A7udY78IXg#Qw*|>dm5ugmjhhh0mx0U*@B7XB*16_^Eh2#_Pbkl z}CuciT%wr?-5i;)**%m&36oX)zJ4q@w03_tV=HtUxgOVpi82>;~sR2YPUnd z`a=_eumBK|qa5b@3I$l49tUF)o^HOrxe98=n>ev2Nf4o+5kdHkBryyP!|hY$F^k_y zY11iSAXr|9LI!@Wa})yba_~*UjsQSheu+>myj3( zflMT43#~H*N^0vsc~ATm2tz)A>;&WJTnkD`pw;G$0FD%F%O`vdw&pmM50=gf!PLy>zhXVtUgWnVm+keyg)*jQ}&`?UexEaAbeglYun6bk68tug47%4|F$zhmug zep445hs>e-lFxc;svBwcq;+uQ1>I=7$P*-)F~K=W_4QlIu7wHkGrk6`)>8v85;whw zup3wqhpFNinhEQ_dBab+f598$;g80i?{Dn*Le|pQZ#ueekG0*LLh`;=p*+xY`9dcB zQ|g$b_EQJ&q;2T4w{Et2-~3ivO6BIkS!q-KbY)y?6l7#rsPLZwFcI*XIV4=KR@e1b zoJSSb6_2)c2>|ATLywS;Wi9p3D?gua9?OrG%K!*DOgx7Bdh4Z)RjVOyL&pdLmjPfd zI5?YRJg67V)_wEbr!EPA5JFA*u<2XX{^&Pd5`ejApLc7L)n6vyzZ?&jOSRBH`X+wT z`R}ZsTLEVobk^UkfU^ub>+e>;Sq7c;cPrp5gUye8XZ`;Gwormk-RJ~=00000 LNkvXXu0mjf7}@{A literal 0 HcmV?d00001 diff --git a/Source/Android/res/drawable-mdpi/launcher.png b/Source/Android/res/drawable-mdpi/launcher.png deleted file mode 100644 index 03e5eea949090370c821413cb847a29ac4b6389a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8634 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 M07*qoM6N<$g7H)GPXGV_ diff --git a/Source/Android/res/drawable-xhdpi/ic_launcher.png b/Source/Android/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..06fdfa1d92ab4c998c8115914c6170c225c14f24 GIT binary patch literal 3828 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 literal 0 HcmV?d00001 diff --git a/Source/Android/res/drawable-xxhdpi/launcher.png b/Source/Android/res/drawable-xxhdpi/launcher.png deleted file mode 100644 index 7cb72b57bb1bf87b94d5f327bc055bfc102c65b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82300 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 O0000